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

Package-Manager: portage-2.1.11.63/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 91 insertions, 25 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/Manifest b/app-cdr/brasero/Manifest
index 5606ae0252ad..f86c95dc28e2 100644
--- a/app-cdr/brasero/Manifest
+++ b/app-cdr/brasero/Manifest
@@ -7,18 +7,19 @@ AUX brasero-2.32.1-underlinking.patch 1144 SHA256 72ed1ac03ebd454e895ec1f1275595
 AUX brasero-2.32.1-useless-dialog.patch 2498 SHA256 0be1c75fea2e0d9b72130c26687338f33061a96202c99fcf85c06e2749560912 SHA512 83364ed4aced2c7a72ea40dbd32f4e7aaa9ccd7541b232977dde19c8b331c23d1cf088ce8954b5213fc9d5646e1604ec3cd7e5a749aebe7351dcc68a7455d358 WHIRLPOOL 7b7b41e4732e951e47ce1d1bd785c7b5af14b29d1d74e35a5eb117181b355505e32ea009a84c4d8426989fb4854e0b047db597d75bfd9af91905527c68c41182
 AUX brasero-2.32.1-warning-silenced.patch 690 SHA256 899ca8171a751332957ec21c3028ebc4a4d303bda30699d57cf0f6607bd2ae58 SHA512 b5eaa2983d429f5a3859380630671e939e663a272e2ba4c53e1a564125a1d4e0deeae4bf87a4ac3c9499d5c2dd6fbe2e9ee55f468f39720e3dbbf467046d184f WHIRLPOOL 25350037165df534a3ee34fbd2852deb736c3e55fead219eff0dc1280bf397d864a8e6c6b0ab0392c9d45a4dea5f03f65ead6d7947164085232d794ed8ac682f
 AUX brasero-2.32.1-warning-silenced2.patch 616 SHA256 cb435ec18ba02e445ebbf55c5cee16ce078d0e6e762e5821222e911a13ce5f5d SHA512 4369db4c27e5756be36a2be036428a25c6d73c7427aaebd8bc830f1308ca778fb46f4cfeaeb0e2efcfc62488542fa458a9a39f07e349e86594a4d41494ce2189 WHIRLPOOL aaae12f221af00cdc47072706ad98fc761452d833e53505e8f1a1ec6b8f797d18f2e1deaa3821847bdd71c6334c44ffe405659341923b88aa63ad5cc70e371f2
+AUX brasero-3.8.0-tracker-detection.patch 2353 SHA256 55a6e6f9282b447b166872e614a30d81f6e567b8ecf9ae8518d933ca963c002f SHA512 281797076026a94e0ad7e4c9697a81f6899558e1daeb72e7eff0f69842880bdac64f68939e4337cf80f4a2660ec3e7ca8797b546ede1f9d859a77e3e2cf32add WHIRLPOOL fc23d37d447800effec3ee29583702668c7ab3794acc0b40becc0982982f5a22e6d69b202ef4a6f8c82910e93de12f438cfdc853268582a74154dc7e1539d474
 DIST brasero-2.32.1.tar.bz2 4530933 SHA256 7b1056b6f19398912d51e3e583bc1b4d2a75ce2a8e15a96e1514fe6edb79df3b SHA512 ebd08f5ff21685a853c9b339b19b51ffe62e6050a6373883dee1266b45b490308ea5a25a1167a1ea48b89ff64625114a95c6a9f5f42d0d6defc2edd9c0295f25 WHIRLPOOL b01b935ac042bfa129c2245b0fb351ef4ed7c18e5e230cdf8a058073aa4fc28e78137f2bbae173784dc48b440153dcf21def3757dcd8f52065b3065bb42aa103
 DIST brasero-3.6.1.tar.xz 3224840 SHA256 d293eb28dc45af3535f09cf91aa6ccc523f3f3d8b7ad3339b5e79b4acc19b932 SHA512 2504b0b3127c1d5a8bcce6b9c95e25e317cc2d95f32e31e048522594366354cca1cc551b61e38ae56000eeadfedb3950ce7f99bfcf8e3b6aba0a96371b69606e WHIRLPOOL f951e7db0e6c2d5c265caa12037cbffcea1ac6489fc5af645628b51162d1a7284c0d81393f3e487963426bd15197f434accbc4746f3f6ac909e6b086b2e71087
 DIST brasero-3.8.0.tar.xz 3298072 SHA256 d98a368a6129e50681e8243c5e0833c32cca699bd50b839c6a551d52b396bce4 SHA512 655fd5db9a893579d91178d7ab83e51b4e12dfd30b95cb0584b87e149d297f543e8c675452fc12e1f1347c80b97c6aac113fe04eb5be20d9749b42e28db788e1 WHIRLPOOL 3340b332bb53aaa9b8e54d4dadf280246e7cd99dacb1c5e434425e588eceb84f4b85d13a32352822a7be0ec38b0346590e386b9b1d9aa673246f2daec0edc931
 EBUILD brasero-2.32.1-r1.ebuild 3547 SHA256 cff1cead00536c2310eb337d602700690bde16fb5f7c3cb28eabf61588fa5fe7 SHA512 f9dd5669825d2a63466f79ecfeae1ebc1ad44e26192969b1bf5fdfff07792efb566dadc317c26fc6787efff8d70bd1c52a9f8a35e726f63600cc30eeecfa0f9d WHIRLPOOL e2a346c9b84e3f56f70b0dde77999817e2c09445a1d86e8eb978b5411c82137fe1050901283d9646c3f5df056446b4ea2976642aeae83e7b2849abc611518df5
 EBUILD brasero-3.6.1.ebuild 2362 SHA256 999d30e1d767cbbe3bac5c1e9eb9798385e1c4c504c1944c439965587cadcb57 SHA512 8d2892c149081920a9ad65087cc4af51c58ba2271dd3f640c37d76afd749da87c944c3f3b88a8b7f02216c28aaf327191716c7c710020d66fdb90429e38223a4 WHIRLPOOL 144e9e680147a5a6cb361c5acc5f681d3a0e958b3b29225f7e8f7e4a70e1b5bf28b8f60e1908e7b9aa8707434f786e2f3233362a0a4c2dd4bb70300433d7c560
-EBUILD brasero-3.8.0.ebuild 2218 SHA256 b7799cf2e29c7f9a0b899fb9bcf10124e691a1c3cf94095c53d2a8c452b7bf73 SHA512 47b03ec4289944b02cc2fe8a2cc34501900e8590df918eec02634a1edad754d40bb0e55eeb438e2942bae9e4a8d18cf2405ece1ceca763dbc6d47edb2248aa12 WHIRLPOOL bdd32a512e43aa34079905fc3459be732296fbc5011ee8b6679d14cf7e1d10d843a00b2c4439acb0e3ca8aba8862baf2fdcefe8aa743193163aeaa308181a5f3
-MISC ChangeLog 24697 SHA256 11829dcc799e6dbd9863fb50e753d211e56b923e38fe596d20726a51794a9b92 SHA512 5f9944487dbe81ff03990b422431a1d7bfaf4ccfc973b1bcbf19eccb38877183b78434af306a21ddf7e9532be4fd2356be4621a4ff05d6734d0d6ddf8550d965 WHIRLPOOL fafcb7f61307e5ccd50452acc08d08e320314da4e0ef43b3a7a3d3e6e24b787bedec81ed4f2ba2b91c5986878fbbf5e4468c89b822325bce720be0c5d370844a
+EBUILD brasero-3.8.0.ebuild 2440 SHA256 f0db4153c746cf26f1c019e5c8713b198cdf0592eefd7d1a92539de8ef7f7720 SHA512 41b9d5eedf694f88a2f46e27d7812dc79c5bdac8edd9a7513bf4d5619dff6297539d33edb1cab87cfab2cb654b14250b424a3e2d8337779459c91c24fd254401 WHIRLPOOL 93c1d2376eef6312a9fe789799824f12dfe1d3794cb66f8a97fcf24c0301d33e5e9cffde4535a5ab5afd6726cc87e5c4f874a52482762e0fac022cc07f78e641
+MISC ChangeLog 24888 SHA256 2461cea340457fc4145fab672b6a1d34dfa29402122bece276a6c8a789ac3412 SHA512 5a81dad041c05356de68288ea37b39d4434a6d0ef75ba6633611d83cc87b27f1268ca2516faa48dd6233b438ffa85777145595c43129d3c6a60f8db0722e27c9 WHIRLPOOL cac97fb803a8be45bfe159581ab7de476b1f68ccd4e256e3fdef99e7f38c22b80a06de30cf9b2ae3c384162b3a192c05ee9c2f65c3d244aa36856da6f0926c5a
 MISC metadata.xml 701 SHA256 88db77e1d687f115e349955d16b87668900d105e5f8cf0baa99d04b32ff5da87 SHA512 ecd5c3323ab98e14ba515497af76b7a8c898a75cd0df05053557289b436b1f3fd8719828572ca849bd188d3e74082322c6441968f0b9d37a9983e677a5fb5a6b WHIRLPOOL 2e41f36a1cfe25ab7b0a99cf85e1f6e983f257cb04017d53f33e7899ce077db261b7978aae5b45ebde74951e70b81a2680ef6df859b4a2acf6fab0897b9ea1af
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFUbIQACgkQCaWpQKGI+9QEYgCbBAmNuRd0zQuyf0gCTuWSMMfw
-RPEAn34RSm/wAZlpO/ZCl9nozwuNlvAw
-=NKwl
+iEYEAREIAAYFAlGXlAEACgkQCaWpQKGI+9SbVgCePuIHZvglDR4cEUKx8eJMBwwe
+3X8An3PedPXVjgwUQ3o8upjf6b3rtYYn
+=5ZUS
 -----END PGP SIGNATURE-----
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