Apply upstream patch for tracker detection (#464244 by Andreas Mielke).

(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 85 insertions, 20 deletions

diff --git a/app-cdr/brasero/ChangeLog b/app-cdr/brasero/ChangeLog
index f8baae35385e..b57109ed2884 100644
--- a/app-cdr/brasero/ChangeLog
+++ b/app-cdr/brasero/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/brasero
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/ChangeLog,v 1.152 2013/03/28 16:14:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/ChangeLog,v 1.153 2013/05/18 14:45:20 pacho Exp $
+
+  18 May 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/brasero-3.8.0-tracker-detection.patch, brasero-3.8.0.ebuild:
+  Apply upstream patch for tracker detection (#464244 by Andreas Mielke).
 
 *brasero-3.8.0 (28 Mar 2013)
 
diff --git a/app-cdr/brasero/brasero-3.8.0.ebuild b/app-cdr/brasero/brasero-3.8.0.ebuild
index 28fece654578..89b7c56809ce 100644
--- a/app-cdr/brasero/brasero-3.8.0.ebuild
+++ b/app-cdr/brasero/brasero-3.8.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-3.8.0.ebuild,v 1.1 2013/03/28 16:14:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-3.8.0.ebuild,v 1.2 2013/05/18 14:45:20 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="CD/DVD burning application for the GNOME desktop"
 HOMEPAGE="http://projects.gnome.org/brasero/"
@@ -34,7 +34,8 @@ COMMON_DEPEND="
 		>=dev-libs/libisofs-0.6.4:= )
 	nautilus? ( >=gnome-base/nautilus-2.91.90 )
 	playlist? ( >=dev-libs/totem-pl-parser-2.29.1:= )
-	tracker? ( >=app-misc/tracker-0.12:= )"
+	tracker? ( >=app-misc/tracker-0.12:= )
+"
 RDEPEND="${COMMON_DEPEND}
 	media-libs/gst-plugins-good:1.0
 	media-plugins/gst-plugins-meta:1.0
@@ -47,33 +48,43 @@ RDEPEND="${COMMON_DEPEND}
 	mp3? (
 		media-libs/gst-plugins-ugly:1.0
 		media-plugins/gst-plugins-mad:1.0 )
-	packagekit? ( app-admin/packagekit-base )"
+	packagekit? ( app-admin/packagekit-base )
+"
 DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
 	dev-util/intltool
 	>=dev-util/gtk-doc-am-1.12
 	gnome-base/gnome-common:3
 	sys-devel/gettext
 	virtual/pkgconfig
-	test? ( app-text/docbook-xml-dtd:4.3 )"
+	test? ( app-text/docbook-xml-dtd:4.3 )
+"
 # eautoreconf deps
 #	app-text/yelp-tools
 #	gnome-base/gnome-common
+
 PDEPEND="gnome-base/gvfs"
 
+src_prepare() {
+	# Simplify tracker version searching and support 0.16 API (from 'master')
+	epatch "${FILESDIR}/${P}-tracker-detection.patch"
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
 src_configure() {
 	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-	G2CONF="${G2CONF}
-		--disable-caches
-		$(use_enable !libburn cdrtools)
-		$(use_enable !libburn cdrkit)
-		$(use_enable !libburn cdrdao)
-		$(use_enable !libburn growisofs)
-		$(use_enable introspection)
-		$(use_enable libburn libburnia)
-		$(use_enable nautilus)
-		$(use_enable playlist)
-		$(use_enable tracker search)
-		ITSTOOL=$(type -P true)"
-
-	gnome2_src_configure
+	gnome2_src_configure \
+		--disable-caches \
+		$(use_enable !libburn cdrtools) \
+		$(use_enable !libburn cdrkit) \
+		$(use_enable !libburn cdrdao) \
+		$(use_enable !libburn growisofs) \
+		$(use_enable introspection) \
+		$(use_enable libburn libburnia) \
+		$(use_enable nautilus) \
+		$(use_enable playlist) \
+		$(use_enable tracker search) \
+		ITSTOOL=$(type -P true)
 }
diff --git a/app-cdr/brasero/files/brasero-3.8.0-tracker-detection.patch b/app-cdr/brasero/files/brasero-3.8.0-tracker-detection.patch
new file mode 100644
index 000000000000..a77c04c82dfa
--- /dev/null
+++ b/app-cdr/brasero/files/brasero-3.8.0-tracker-detection.patch
@@ -0,0 +1,50 @@
+From 45cecda00ae84b4aaa872430ff3e8ad40bd98df6 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalevlember@gmail.com>
+Date: Sun, 27 Jan 2013 22:25:54 +0000
+Subject: build: Simplify tracker version searching and support 0.16 API
+
+Use an iterator instead of a deep dependency tree. This should simplify
+adding support for new tracker versions in the future.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=692664
+---
+diff --git a/configure.ac b/configure.ac
+index ce79401..d77bffe 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -382,21 +382,22 @@ AC_ARG_ENABLE(search,
+ 			esac],
+ 			[enable_search="auto"])
+ 
++if test x"$enable_search" != "xno"; then
++        # Try to figure out the tracker API version to use
++        tracker_api="0.10"
++        m4_foreach([VERSION], [[0.10], [0.12], [0.14], [0.16]],
++                              [PKG_CHECK_EXISTS([tracker-sparql-VERSION >= $TRACKER_REQUIRED],
++                                                [tracker_api="VERSION"])
++                              ])
++fi
++
+ if test x"$enable_search" = "xauto"; then
+-        PKG_CHECK_EXISTS([tracker-sparql-0.14 >= $TRACKER_REQUIRED],
+-                          [enable_search=yes],
+-                          [PKG_CHECK_EXISTS([tracker-sparql-0.12 >= $TRACKER_REQUIRED],
+-                                            [enable_search=yes],
+-                                            [PKG_CHECK_EXISTS([tracker-sparql-0.10 >= $TRACKER_REQUIRED],
+-                                                              [enable_search=yes],
+-                                                              [enable_search=no])])])
++        PKG_CHECK_EXISTS([tracker-sparql-$tracker_api >= $TRACKER_REQUIRED],
++                         [enable_search=yes],
++                         [enable_search=no])
+ fi
+ 
+ if test x"$enable_search" = "xyes"; then
+-        PKG_CHECK_EXISTS([tracker-sparql-0.14 >= $TRACKER_REQUIRED],
+-                         [tracker_api=0.14],
+-                         [PKG_CHECK_EXISTS([tracker-sparql-0.12 >= $TRACKER_REQUIRED],
+-                                           [tracker_api=0.12], [tracker_api=0.10])])
+ 	PKG_CHECK_MODULES(BRASERO_SEARCH, tracker-sparql-$tracker_api >= $TRACKER_REQUIRED)
+ 	AC_DEFINE(BUILD_SEARCH, 1, [define if you  want to use search pane])
+ 	AC_DEFINE(BUILD_TRACKER, 1, [define if you  want to use search pane])
+--
+cgit v0.9.1