Version bump. Enable flickr support.

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

5 files changed, 225 insertions, 18 deletions

diff --git a/app-misc/tracker/ChangeLog b/app-misc/tracker/ChangeLog
index a456f1559eac..4fdbf7007204 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.105 2011/04/16 18:55:17 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.106 2011/04/26 20:59:20 eva Exp $
+
+*tracker-0.10.10 (26 Apr 2011)
+
+  26 Apr 2011; Gilles Dartiguelongue <eva@gentoo.org> +tracker-0.10.10.ebuild,
+  tracker-9999.ebuild, metadata.xml:
+  Version bump. Enable flickr support.
 
   16 Apr 2011; Gilles Dartiguelongue <eva@gentoo.org> tracker-0.10.8.ebuild,
   tracker-0.10.9.ebuild, tracker-9999.ebuild:
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index 7bb44804b0b7..d1319e98c955 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -6,19 +6,21 @@ AUX tracker-0.8.17-build-with-eds232.patch 807 RMD160 7f681d67da66c66c8217155746
 AUX tracker-0.8.17-poppler-0.16.patch 1209 RMD160 6ae54087f8d2b3ea864cfaa035e3b1153a749a67 SHA1 a2f7429149ecfa7e45dd58e0a0d37f9385fbefb1 SHA256 8d1ed288fc14655e36ddda9af6d30b5b00572feca08b643951c1b5ac2d4eba1c
 AUX tracker-0.8.17-tests-fixes.patch 2499 RMD160 fb8b749e2addeaa004fd2e6de585357156e2f092 SHA1 a4f193432edc8f64e3505ac407f05a2de7fd73af SHA256 3c00640648e56c722fcca4b6c1016082df992def8d7a95c5a1618453463d4048
 AUX tracker-0.8.17-use-upower.patch 16884 RMD160 a9545a4aa89b6574ccb58d5b9796386eeb62a1ef SHA1 16ad6730798279f9a09459b50e1380bbf16c8e83 SHA256 542432544663f0c1a9c43c08e816f42a95fa31f828e33f6d470cafc60a33a7a1
+DIST tracker-0.10.10.tar.bz2 7855321 RMD160 61932d76ff223ee77105102d48427c880e41d3fd SHA1 8c51414192fdd583bb58c24a605e7dcf79cd05ff SHA256 6e8b9e297743634369ca8d770debd72962051b52713edebb5d2fba7a3089f84c
 DIST tracker-0.10.8.tar.bz2 7927772 RMD160 a97383f0ce352c644fc1c8cd275b7f3e169e03cd SHA1 106a115640f5dcc642ce297359c4624e6c8d8bb6 SHA256 973801f394fb2dc64f32484370d046c0d5e548e4d29ecfb9e6036e425541f0c7
 DIST tracker-0.10.9.tar.bz2 7946122 RMD160 1948f601ca8b490316c62c3aeb4781ba978fb888 SHA1 8fa83bd2780bbca1f125566c532c283d42fa5238 SHA256 e9cad0948e05f873ae964f06a008755cee171309f5923d6187214242780bdd49
 DIST tracker-0.8.17.tar.bz2 4959334 RMD160 b33abe9ab955e5e392258657ad3a664ff5cb4cc6 SHA1 460f3d56bd0ed24c5d064a398829f4289a6b081f SHA256 56cf09f41fec1afaf7199e0728f4339b567a7893a51fc2affc5069fa26e2e9d8
+EBUILD tracker-0.10.10.ebuild 6009 RMD160 400d00a8911811ce32ce9e0d02e5172de9c99b83 SHA1 8589f1e4d14f8330bbf1ce116216c7439e204a71 SHA256 ec2ad53a0cfd6668b5e5617827960e4e8bda7ef0576159d1b1f0a35ed3d077c8
 EBUILD tracker-0.10.8.ebuild 6081 RMD160 3aa9094e622c1d0a1c97a4e24b28c71178e252bd SHA1 8a0b0627c90274c6bdd4ae964cb93c6b68895c24 SHA256 597ba5dfe7b191ea4a781f224aaec0320218be20822e933142ae81c960b8a0eb
 EBUILD tracker-0.10.9.ebuild 6081 RMD160 30e97ba3f3d0aaf772d816a1be85d5d31dff6f54 SHA1 bf704978ec727e5ff453309aaf6558eff6963fb9 SHA256 2555a0f647d435be14ff0770786e71e8122687bfa8e4c733270cca05f0f49c36
 EBUILD tracker-0.8.17.ebuild 5583 RMD160 ee002a17e8fee1108e0d4cd37f2238359196dfbe SHA1 2e4a2310bbc99619d0892fe1c33adfb5ffa53e08 SHA256 3cedb0359f4c1f59db6289ef12ced259d19d56fe5ce72752b0b33a1706d181a5
-EBUILD tracker-9999.ebuild 5870 RMD160 1108624610c35f34559a7c172c34d8751dc4a2af SHA1 6a34a47da2d36510b09779e2fcbe55f270a951ab SHA256 7221a33c32d188ecc6d8cd1ef1f650e5468d17d7a5dab0613631625c354e25a3
-MISC ChangeLog 19009 RMD160 1f015608de4847f347e8bdb29a82b2816a056295 SHA1 f56933ae27b8fe24069520056beb0797c4ef2f49 SHA256 629f41ad86cb37e7128f49855d54e5c43983ec5127ab850e57e62afb29d66ee2
-MISC metadata.xml 1013 RMD160 b5ac62b6e0da498ee44306ca51669a35db7c5caa SHA1 413f36c0c4f6b4504e18d1bfa524b5b75742c444 SHA256 b97c36f30aa204a790dc87b1b167a55b1dec621f686852b75d35e8dcb2f9cbbd
+EBUILD tracker-9999.ebuild 5795 RMD160 70ef2589f8a61e9ee6a46abd975757c697c01df0 SHA1 a7c42a60314ce17c4404511b6beaf6ab384cedbb SHA256 d44a3da08c9849c1b095b7d7d3cadf338f4774c24d6f0e9d05981ad5790035e0
+MISC ChangeLog 19197 RMD160 6db8c3a81a58c6d9bdf455f4d8f6d611a72b2ac2 SHA1 cd8119bf1a5ba8140659cd7b16d1d557b361da29 SHA256 5c0e1fd177ee9843f964bccd9ae079a5e5adaeea9c28f625b11881a5cbf66555
+MISC metadata.xml 1066 RMD160 24119d615e6088f014c31ba917b46e19aaf945a2 SHA1 d5851dcca2051d1517e3146df784a2d6ece02201 SHA256 f90533e8b19c6bbdfd14d05d472f6a67bb01a66053d3a17f95da9d62e529a63a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2p5kgACgkQ1fmVwcYIWAax1QCfRx5zvSbqsMJS4x/Swc11N3Rw
-9nsAnirPNfW2loN1Cb2E6jcXRaQdBcYI
-=5auX
+iEYEARECAAYFAk23Mi4ACgkQ1fmVwcYIWAZcsQCg4dDM9UAAyEZZ7gVX3WyUf7kR
+9XcAnitotBOXJpd/YK7JonH6WKj4olGo
+=VT8G
 -----END PGP SIGNATURE-----
diff --git a/app-misc/tracker/metadata.xml b/app-misc/tracker/metadata.xml
index 74a0313c501a..14d482a0d9f2 100644
--- a/app-misc/tracker/metadata.xml
+++ b/app-misc/tracker/metadata.xml
@@ -4,6 +4,7 @@
 <herd>freedesktop</herd>
 <use>
   <flag name='applet'>Build tracker monitor applet</flag>
+  <flag name='flickr'>Build flickr data miner</flag>
   <flag name='gsf'>Enable <pkg>gnome-extra/libgsf</pkg> based data extractor and
   for ODT.</flag>
   <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
diff --git a/app-misc/tracker/tracker-0.10.10.ebuild b/app-misc/tracker/tracker-0.10.10.ebuild
new file mode 100644
index 000000000000..cb2461311d3d
--- /dev/null
+++ b/app-misc/tracker/tracker-0.10.10.ebuild
@@ -0,0 +1,202 @@
+# 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.10.10.ebuild,v 1.1 2011/04/26 20:59:20 eva Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+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="~amd64 ~x86"
+# 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"
+
+# Test suite highly disfunctional, loops forever
+# putting aside for now
+RESTRICT="test"
+
+# 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
+	>=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
+	sys-apps/util-linux
+
+	applet? (
+		>=gnome-base/gnome-panel-2.91
+		>=x11-libs/gtk+-3:3 )
+	eds? (
+		>=mail-client/evolution-2.32
+		>=gnome-extra/evolution-data-server-2.32 )
+	exif? ( >=media-libs/libexif-0.6 )
+	flac? ( >=media-libs/flac-1.2.1 )
+	flickr? ( net-libs/rest:0.7 )
+	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.31:0.10 )
+		!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
+	)
+	gtk? (
+		>=dev-libs/libgee-0.3
+		>=x11-libs/gtk+-2.18:2 )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+	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 )
+	networkmanager? ( >=net-misc/networkmanager-0.8 )
+	pdf? (
+		>=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 )
+	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.12:0.12 )
+	gtk? (
+		app-office/dia
+		>=dev-lang/vala-0.12: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
+
+	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)"
+	fi
+
+	# unicode-support: libunistring, libicu or glib ?
+	G2CONF="${G2CONF}
+		--disable-hal
+		--enable-tracker-fts
+		--with-enca
+		--with-unicode-support=libicu
+		--enable-guarantee-metadata
+		$(use_enable applet tracker-search-bar)
+		$(use_enable eds miner-evolution)
+		$(use_enable exif libexif)
+		$(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 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 tiff libtiff)
+		$(use_enable vorbis libvorbis)
+		$(use_enable xml libxml2)
+		$(use_enable xmp exempi)"
+
+	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"
+}
diff --git a/app-misc/tracker/tracker-9999.ebuild b/app-misc/tracker/tracker-9999.ebuild
index 97edb7f0c545..0f5015276fef 100644
--- a/app-misc/tracker/tracker-9999.ebuild
+++ b/app-misc/tracker/tracker-9999.ebuild
@@ -1,9 +1,10 @@
 # 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.40 2011/04/16 18:55:17 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-9999.ebuild,v 1.41 2011/04/26 20:59:20 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2:2.6"
 
 inherit autotools git gnome2 linux-info python virtualx
@@ -17,9 +18,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 # USE="doc" is managed by eclass.
-IUSE="applet doc eds exif flac 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 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"
 
-# TODO: rest -> flickr
 # vala is built with debug by default (see VALAFLAGS)
 RDEPEND="
 	>=app-i18n/enca-1.9
@@ -41,6 +41,7 @@ RDEPEND="
 		>=gnome-extra/evolution-data-server-2.32 )
 	exif? ( >=media-libs/libexif-0.6 )
 	flac? ( >=media-libs/flac-1.2.1 )
+	flickr? ( net-libs/rest:0.7 )
 	gif? ( media-libs/giflib )
 	gnome-keyring? ( >=gnome-base/gnome-keyring-2.26 )
 	gsf? (
@@ -85,10 +86,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.4:0.12 )
+	applet? ( >=dev-lang/vala-0.12:0.12 )
 	gtk? (
 		app-office/dia
-		>=dev-lang/vala-0.11.4:0.12
+		>=dev-lang/vala-0.12:0.12
 		>=dev-libs/libgee-0.3 )
 	doc? (
 		media-gfx/graphviz )
@@ -147,6 +148,7 @@ pkg_setup() {
 		$(use_enable eds miner-evolution)
 		$(use_enable exif libexif)
 		$(use_enable flac libflac)
+		$(use_enable flickr miner-flickr)
 		$(use_enable gnome-keyring)
 		$(use_enable gsf libgsf)
 		$(use_enable gtk tracker-explorer)
@@ -199,9 +201,3 @@ 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
-}