[gentoo-commits] proj/gnome:master commit in: dev-libs/folks/

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     091e5a070bbcd734340b51d2828d0d323ad62318
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 20 20:00:30 2014 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr 20 22:55:12 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=091e5a07

dev-libs/folks: 0.9.6 → 0.9.6-r1

Add compatibility for tracker-1

---
 .../folks/{folks-9999.ebuild => folks-0.9.6-r1.ebuild}  | 17 +++++++----------
 dev-libs/folks/folks-9999.ebuild                        |  6 +++++-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/dev-libs/folks/folks-9999.ebuild b/dev-libs/folks/folks-0.9.6-r1.ebuild
similarity index 89%
copy from dev-libs/folks/folks-9999.ebuild
copy to dev-libs/folks/folks-0.9.6-r1.ebuild
index bf7b2e3..3ca23fd 100644
--- a/dev-libs/folks/folks-9999.ebuild
+++ b/dev-libs/folks/folks-0.9.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -8,20 +8,13 @@ VALA_MIN_API_VERSION="0.22"
 VALA_USE_DEPEND="vapigen"
 
 inherit gnome2 vala virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="Library for aggregating people from multiple sources"
 HOMEPAGE="https://live.gnome.org/Folks"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/25" # subslot = libfolks soname version
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
 # TODO: --enable-profiling
 # Vala isn't really optional, https://bugzilla.gnome.org/show_bug.cgi?id=701099
 IUSE="bluetooth eds socialweb +telepathy test tracker utils zeitgeist"
@@ -40,7 +33,7 @@ COMMON_DEPEND="
 	eds? ( >=gnome-extra/evolution-data-server-3.9.1:=[vala] )
 	socialweb? ( >=net-libs/libsocialweb-0.25.20 )
 	telepathy? ( >=net-libs/telepathy-glib-0.19[vala] )
-	tracker? ( >=app-misc/tracker-0.16:= )
+	tracker? ( >=app-misc/tracker-1:0= )
 	zeitgeist? ( >=gnome-extra/zeitgeist-0.9.14 )
 "
 # telepathy-mission-control needed at runtime; it is used by the telepathy
@@ -62,6 +55,10 @@ DEPEND="${COMMON_DEPEND}
 "
 
 src_prepare() {
+	# Allow building against tracker-1.0
+	sed -e 's/\(TRACKER_SPARQL_MAJOR\)=0.16/\1=1.0/' \
+		-i configure{.ac,} || die
+
 	vala_src_prepare
 	gnome2_src_prepare
 }

diff --git a/dev-libs/folks/folks-9999.ebuild b/dev-libs/folks/folks-9999.ebuild
index bf7b2e3..e6b3e4e 100644
--- a/dev-libs/folks/folks-9999.ebuild
+++ b/dev-libs/folks/folks-9999.ebuild
@@ -40,7 +40,7 @@ COMMON_DEPEND="
 	eds? ( >=gnome-extra/evolution-data-server-3.9.1:=[vala] )
 	socialweb? ( >=net-libs/libsocialweb-0.25.20 )
 	telepathy? ( >=net-libs/telepathy-glib-0.19[vala] )
-	tracker? ( >=app-misc/tracker-0.16:= )
+	tracker? ( >=app-misc/tracker-1:0= )
 	zeitgeist? ( >=gnome-extra/zeitgeist-0.9.14 )
 "
 # telepathy-mission-control needed at runtime; it is used by the telepathy
@@ -62,6 +62,10 @@ DEPEND="${COMMON_DEPEND}
 "
 
 src_prepare() {
+	# Allow building against tracker-1.0
+	sed -e 's/\(TRACKER_SPARQL_MAJOR\)=0.16/\1=1.0/' \
+		-i configure{.ac,} || die
+
 	vala_src_prepare
 	gnome2_src_prepare
 }