Fix build against evolution-data-server-2.32. Drop unneeded la files.

Package-Manager: portage-2.2_rc89/cvs/Linux x86_64

6 files changed, 65 insertions, 185 deletions

diff --git a/app-misc/tracker/ChangeLog b/app-misc/tracker/ChangeLog
index 9d5f68e49782..6300a3917f98 100644
--- a/app-misc/tracker/ChangeLog
+++ b/app-misc/tracker/ChangeLog
@@ -1,6 +1,11 @@
 # 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.80 2010/09/28 04:56:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/ChangeLog,v 1.81 2010/10/20 13:39:45 eva Exp $
+
+  20 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -tracker-0.8.15.ebuild, tracker-0.8.17.ebuild,
+  +files/tracker-0.8.17-build-with-eds232.patch, tracker-9999.ebuild:
+  Fix build against evolution-data-server-2.32. Drop unneeded la files.
 
   28 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> tracker-0.8.15.ebuild,
   tracker-0.8.17.ebuild, tracker-9999.ebuild:
diff --git a/app-misc/tracker/Manifest b/app-misc/tracker/Manifest
index c36c9c8f6895..3c65ebb90313 100644
--- a/app-misc/tracker/Manifest
+++ b/app-misc/tracker/Manifest
@@ -1,8 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX tracker-0.8.0-strigi.patch 1385 RMD160 69d07b6145de6919cc1550e4722737cf5b96051d SHA1 5221ac64d5c21e540bb0bb07bd074b3ad5ce0a27 SHA256 7ae959cd52ac96f6427646089b554e0572727f27d5d4aab1913f795e270a4ccb
-DIST tracker-0.8.15.tar.bz2 5049046 RMD160 0b66b2bbf9000ac11c485d4dff4a94bc64c22530 SHA1 5d4566e75be23263aa33783def939c0358ee032f SHA256 0831b8c11eea2bae71ba334e21d03842be1dafc276061c298f37bbd27ff43779
+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
-EBUILD tracker-0.8.15.ebuild 5329 RMD160 1c4cfbad110687441a3d4672005b7e2bc0344b22 SHA1 2319a0f2fe4ba69697cb578aabe6ff2e368844a6 SHA256 8ddf3f065661e36e64845a879c259824c3584d369e7e1011593f35f149cd0831
-EBUILD tracker-0.8.17.ebuild 5329 RMD160 7937758fbe0fe33b65d0db4cbe7b73dce17cebeb SHA1 5e52296118382fdec959be5cc5bd4efdf91a2e41 SHA256 6c4037c0159577206a7bb44230345b9bf40a897b9ebc24d3f68dbaa2f1c4b4a5
-EBUILD tracker-9999.ebuild 4881 RMD160 d3546a732155793bee755ac8d2608e44cac9cdd1 SHA1 5a68871286508d1d0b7a33ec3886abd9c8172fc8 SHA256 6cb3172c1ab6c3e62ed624b0ec9c2ab5a398999211699feab856de3907a393c3
-MISC ChangeLog 14019 RMD160 afc4000551b5ad0b97995a53758a5ed3f48d39b6 SHA1 35d6238e871a1bd05b8ac710defd748da3e839ec SHA256 30737f8edd79f7fb5cc3ecacfd62c9377862f072cfba90db8931261594e88859
+EBUILD tracker-0.8.17.ebuild 5582 RMD160 3db145867af38fd5c4372602599db33380e77ba3 SHA1 868e9889174d018e0a40e976329a28d893c90422 SHA256 519b14e1ab10b853ffd8885d44613562ab65b3d9d8b8975ce09d260de4756792
+EBUILD tracker-9999.ebuild 5017 RMD160 229d1773c457e9fa2d5d3a4641fd2e0cf79ae7f6 SHA1 3186876a89e2fbaf4ab2974dd7fb95d235534a04 SHA256 909fa6dc6992fa1ed8455398993f7eb54a4d86181a0196ae5cdbea22561555c2
+MISC ChangeLog 14259 RMD160 b2d5b957b9fbf8068fb89cdc276e5f500266281d SHA1 1c193ac1a0654cd9c4b3d61445ca6d5b314fc167 SHA256 553587ff77bbece17da4e2fb9b489b33e336c7218deb2f3aae9386785202a210
 MISC metadata.xml 799 RMD160 00a5ddbd534077dc43e3a1e79c7051c1dbead84c SHA1 234eb3aded9d81757234613e35572e1a82e79f28 SHA256 1369d8e8afeef182dac7762a6905de6c6b0369dd9d7f0ca4c9d64831d2f8f863
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAky+8T8ACgkQ1fmVwcYIWAa/ggCgo7kgy+2yW26hYblFeLVx1zyg
+m94AoLAlh9UvWPlUYbAnzdx5J8xo6jR/
+=q7rZ
+-----END PGP SIGNATURE-----
diff --git a/app-misc/tracker/files/tracker-0.8.17-build-with-eds232.patch b/app-misc/tracker/files/tracker-0.8.17-build-with-eds232.patch
new file mode 100644
index 000000000000..456c64e35908
--- /dev/null
+++ b/app-misc/tracker/files/tracker-0.8.17-build-with-eds232.patch
@@ -0,0 +1,26 @@
+From 8db05ac879dcd7f0e10fb76563ba62512b932bb9 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Wed, 20 Oct 2010 14:32:19 +0200
+Subject: [PATCH] gentoo: fix build with eds-2.32, cherry-picked from master
+
+---
+ src/plugins/evolution/tracker-evolution-plugin.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/plugins/evolution/tracker-evolution-plugin.c b/src/plugins/evolution/tracker-evolution-plugin.c
+index 8e56d8d..991e525 100644
+--- a/src/plugins/evolution/tracker-evolution-plugin.c
++++ b/src/plugins/evolution/tracker-evolution-plugin.c
+@@ -41,7 +41,9 @@
+ #include <sqlite3.h>
+ 
+ #include <camel/camel.h>
++#ifndef HAVE_EDS_2_31_2
+ #include <camel/camel-db.h>
++#endif
+ 
+ #include <mail/mail-config.h>
+ #include <mail/mail-session.h>
+-- 
+1.7.3.1
+
diff --git a/app-misc/tracker/tracker-0.8.15.ebuild b/app-misc/tracker/tracker-0.8.15.ebuild
deleted file mode 100644
index 21d62c1a5cad..000000000000
--- a/app-misc/tracker/tracker-0.8.15.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# 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.8.15.ebuild,v 1.5 2010/09/28 04:56:54 ssuominen Exp $
-
-EAPI="2"
-G2CONF_DEBUG="no"
-
-inherit eutils gnome2 linux-info
-
-DESCRIPTION="A tagging metadata database, search tool and indexer"
-HOMEPAGE="http://www.tracker-project.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-# 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"
-
-# Automagic, gconf, uuid, and probably more
-# TODO: quill support
-RDEPEND="
-	>=app-i18n/enca-1.9
-	>=dev-db/sqlite-3.6.16[threadsafe]
-	>=dev-libs/dbus-glib-0.82-r1
-	>=dev-libs/glib-2.24
-	|| (
-		>=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/libnotify-0.4.3
-		>=x11-libs/gtk+-2.18 )
-	eds? (
-		>=mail-client/evolution-2.25.5
-		>=gnome-extra/evolution-data-server-2.25.5 )
-	exif? ( >=media-libs/libexif-0.6 )
-	flac? ( >=media-libs/flac-1.2.1 )
-	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 ) ) )
-	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 ) )
-	mp3? ( >=media-libs/id3lib-3.8.3 )
-	nautilus? (
-		gnome-base/nautilus
-		>=x11-libs/gtk+-2.18 )
-	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 )
-	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
-			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 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 dk-p are used for AC power detection
-	if use laptop; then
-		G2CONF="${G2CONF} $(use_enable hal) $(use_enable !hal devkit-power)"
-	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"
-	fi
-
-	G2CONF="${G2CONF}
-		--disable-unac
-		--disable-functional-tests
-		--with-enca
-		$(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 kmail miner-kmail)
-		$(use_enable mp3 id3lib)
-		$(use_enable pdf poppler-glib)
-		$(use_enable playlist)
-		$(use_enable rss miner-rss)
-		$(use_enable strigi libstreamanalyzer)
-		$(use_enable test unit-tests)
-		$(use_enable test functional-tests)
-		$(use_enable tiff libtiff)
-		$(use_enable vorbis libvorbis)
-		$(use_enable xml libxml2)
-		$(use_enable xmp exempi)"
-		# FIXME: useless without quill (extract mp3 albumart...)
-		# $(use_enable gtk gdkpixbuf)
-}
-
-src_prepare() {
-	# Fix build failures with USE=strigi
-	epatch "${FILESDIR}/${PN}-0.8.0-strigi.patch"
-
-	# FIXME: report broken 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-db/tracker-db-journal.c || die
-}
-
-src_test() {
-	export XDG_CONFIG_HOME="${T}"
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check || die "tests failed"
-}
diff --git a/app-misc/tracker/tracker-0.8.17.ebuild b/app-misc/tracker/tracker-0.8.17.ebuild
index 9f71c5ab3db1..4a820502fc17 100644
--- a/app-misc/tracker/tracker-0.8.17.ebuild
+++ b/app-misc/tracker/tracker-0.8.17.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-0.8.17.ebuild,v 1.2 2010/09/28 04:56:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-0.8.17.ebuild,v 1.3 2010/10/20 13:39:45 eva Exp $
 
 EAPI="2"
 G2CONF_DEBUG="no"
@@ -157,9 +157,14 @@ pkg_setup() {
 }
 
 src_prepare() {
+	gnome2_src_prepare
+
 	# Fix build failures with USE=strigi
 	epatch "${FILESDIR}/${PN}-0.8.0-strigi.patch"
 
+	# Fix build failures with eds-2.32
+	epatch "${FILESDIR}/${PN}-0.8.17-build-with-eds232.patch"
+
 	# FIXME: report broken tests
 	sed -e '/\/libtracker-common\/tracker-dbus\/request-client-lookup/,+1 s:^\(.*\)$:/*\1*/:' \
 		-i tests/libtracker-common/tracker-dbus-test.c || die
@@ -175,3 +180,9 @@ src_test() {
 	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 63f55092b623..a6ddb0e90a64 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.23 2010/09/28 04:56:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tracker/tracker-9999.ebuild,v 1.24 2010/10/20 13:39:45 eva Exp $
 
 EAPI="2"
 G2CONF_DEBUG="no"
@@ -176,3 +176,9 @@ src_test() {
 	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
+}