Resync live ebuild to make current dev status. Add development release for testing purpose.

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

4 files changed, 263 insertions, 35 deletions

diff --git a/app-misc/tracker/ChangeLog b/app-misc/tracker/ChangeLog
index 6300a3917f98..f9074bb3b084 100644
--- a/app-misc/tracker/ChangeLog
+++ b/app-misc/tracker/ChangeLog
@@ -1,6 +1,13 @@
 # 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.81 2010/10/20 13:39:45 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.82 2010/10/28 21:32:05 eva Exp $
+
+*tracker-0.9.27 (28 Oct 2010)
+
+  28 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  +tracker-0.9.27.ebuild, tracker-9999.ebuild, metadata.xml:
+  Resync live ebuild to make current dev status. Add development release for
+  testing purpose.
 
   20 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org>
   -tracker-0.8.15.ebuild, tracker-0.8.17.ebuild,
diff --git a/app-misc/tracker/metadata.xml b/app-misc/tracker/metadata.xml
index bb46d5031980..e7bd2e8f727f 100644
--- a/app-misc/tracker/metadata.xml
+++ b/app-misc/tracker/metadata.xml
@@ -15,5 +15,6 @@
   <flag name="playlist">Add support for playlists</flag>
   <flag name="strigi">Add support for <pkg>app-misc/strigi</pkg> search
   engine.</flag>
+  <flag name="upnp">Add support for video extraction via <pkg>media-libs/gupnp-dlna</pkg>.</flag>
 </use>
 </pkgmetadata>
diff --git a/app-misc/tracker/tracker-0.9.27.ebuild b/app-misc/tracker/tracker-0.9.27.ebuild
new file mode 100644
index 000000000000..c0b4f891e36e
--- /dev/null
+++ b/app-misc/tracker/tracker-0.9.27.ebuild
@@ -0,0 +1,207 @@
+# 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.27.ebuild,v 1.1 2010/10/28 21:32:05 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
+RDEPEND="
+	>=app-i18n/enca-1.9
+	>=dev-db/sqlite-3.7[threadsafe]
+	>=dev-libs/dbus-glib-0.82-r1
+	>=sys-apps/dbus-1.3.1
+	>=dev-libs/glib-2.20: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? ( >=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? ( media-libs/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 )
+	gtk? (
+		dev-lang/vala
+		>=dev-libs/libgee-0.3 )
+	doc? (
+		>=dev-util/gtk-doc-1.8
+		media-gfx/graphviz )"
+
+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
+
+	# 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 a6ddb0e90a64..e0d025f45b48 100644
--- a/app-misc/tracker/tracker-9999.ebuild
+++ b/app-misc/tracker/tracker-9999.ebuild
@@ -1,11 +1,12 @@
 # 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.24 2010/10/20 13:39:45 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-9999.ebuild,v 1.25 2010/10/28 21:32:05 eva Exp $
 
 EAPI="2"
 G2CONF_DEBUG="no"
+PYTHON_DEPEND="2"
 
-inherit autotools git gnome2 linux-info
+inherit autotools git gnome2 linux-info python
 
 DESCRIPTION="A tagging metadata database, search tool and indexer"
 HOMEPAGE="http://www.tracker-project.org/"
@@ -16,15 +17,15 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 # USE="doc" is managed by eclass.
-IUSE="applet doc eds exif flac gnome-keyring gsf gstreamer gtk hal iptc +jpeg kmail laptop mp3 nautilus pdf playlist rss strigi test +tiff +vorbis xine +xml xmp"
+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"
 
-# Automagic, gconf, uuid, and probably more
-# TODO: quill support
+# TODO: rest -> flickr, qt vs. gdk
 RDEPEND="
 	>=app-i18n/enca-1.9
-	>=dev-db/sqlite-3.6.16[threadsafe]
+	>=dev-db/sqlite-3.7[threadsafe]
 	>=dev-libs/dbus-glib-0.82-r1
-	>=dev-libs/glib-2.24
+	>=sys-apps/dbus-1.3.1
+	>=dev-libs/glib-2.24:2
 	|| (
 		>=media-gfx/imagemagick-5.2.1[png,jpeg=]
 		media-gfx/graphicsmagick[imagemagick,png,jpeg=] )
@@ -34,17 +35,20 @@ RDEPEND="
 
 	applet? (
 		gnome-base/gnome-panel
-		>=x11-libs/libnotify-0.4.3
-		>=x11-libs/gtk+-2.18 )
+		>=x11-libs/gtk+-2.18:2 )
 	eds? (
-		>=mail-client/evolution-2.25.5
-		>=gnome-extra/evolution-data-server-2.25.5 )
+		>=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? ( >=gnome-extra/libgsf-1.13 )
-	gstreamer? ( >=media-libs/gstreamer-0.10.12 )
-	!gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) )
+	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 )
@@ -52,11 +56,12 @@ RDEPEND="
 	jpeg? ( media-libs/jpeg:0 )
 	laptop? (
 		hal? ( >=sys-apps/hal-0.5 )
-		!hal? ( sys-power/upower ) )
-	mp3? ( >=media-libs/id3lib-3.8.3 )
+		!hal? ( >=sys-power/upower-0.9 ) )
+	mp3? ( >=media-libs/taglib-1.6 )
 	nautilus? (
 		gnome-base/nautilus
-		>=x11-libs/gtk+-2.18 )
+		>=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]
@@ -83,8 +88,6 @@ DEPEND="${RDEPEND}
 		media-gfx/graphviz )
 	test? ( sys-apps/dbus[X] )"
 
-DOCS="AUTHORS ChangeLog NEWS README"
-
 function inotify_enabled() {
 	if linux_config_exists; then
 		if ! linux_chkconfig_present INOTIFY_USER; then
@@ -103,7 +106,9 @@ pkg_setup() {
 
 	inotify_enabled
 
-	if use gstreamer ; then
+	if use upnp ; then
+		G2CONF="${G2CONF} --enable-video-extractor=gupnp-dlna"
+	elif use gstreamer ; then
 		G2CONF="${G2CONF}
 			--enable-video-extractor=gstreamer
 			--enable-gstreamer-tagreadbin"
@@ -114,23 +119,18 @@ pkg_setup() {
 		G2CONF="${G2CONF} --enable-video-extractor=external"
 	fi
 
-	# hal and dk-p are used for AC power detection
+	# hal and upower are used for AC power detection
 	if use laptop; then
-		G2CONF="${G2CONF} $(use_enable hal) $(use_enable !hal devkit-power)"
+		G2CONF="${G2CONF} $(use_enable hal) $(use_enable !hal upower)"
 	else
-		G2CONF="${G2CONF} --disable-hal --disable-devkit-power"
-	fi
-
-	if use nautilus; then
-		G2CONF="${G2CONF} --enable-nautilus-extension=yes"
-	else
-		G2CONF="${G2CONF} --enable-nautilus-extension=no"
+		G2CONF="${G2CONF} --disable-hal --disable-upower"
 	fi
 
+	# unicode-support: libunistring, libicu or glib ?
 	G2CONF="${G2CONF}
-		--disable-unac
-		--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)
@@ -143,9 +143,10 @@ pkg_setup() {
 		$(use_enable gtk tracker-search-tool)
 		$(use_enable iptc libiptcdata)
 		$(use_enable jpeg libjpeg)
-		$(use_enable kmail miner-kmail)
-		$(use_enable mp3 id3lib)
-		$(use_enable pdf poppler-glib)
+		$(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)
@@ -155,8 +156,12 @@ pkg_setup() {
 		$(use_enable vorbis libvorbis)
 		$(use_enable xml libxml2)
 		$(use_enable xmp exempi)"
-		# FIXME: useless without quill (extract mp3 albumart...)
+		# FIXME: handle gdk vs qt for mp3 thumbnail extract
 		# $(use_enable gtk gdkpixbuf)
+
+	DOCS="AUTHORS ChangeLog NEWS README"
+
+	python_set_active_version 2
 }
 
 src_unpack() {
@@ -166,6 +171,14 @@ 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
+
 	gtkdocize || die "gtkdocize failed"
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf