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

2018-12-11 Thread Gilles Dartiguelongue
commit: 15e6f72e733c9ff601bf8cba635b42e722d598db
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Tue Dec 11 13:20:51 2018 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Tue Dec 11 13:23:40 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=15e6f72e

dev-libs/folks: moved 0.11.4-r1 to ::gentoo

Pro-actively moving this change to avoid forgetting it when the tracker
move happens.

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Manifest-Sign-Key: 0x5A56C8CD0C13248A
Signed-off-by: Gilles Dartiguelongue  gentoo.org>

 dev-libs/folks/folks-0.11.4-r1.ebuild | 87 ---
 1 file changed, 87 deletions(-)

diff --git a/dev-libs/folks/folks-0.11.4-r1.ebuild 
b/dev-libs/folks/folks-0.11.4-r1.ebuild
deleted file mode 100644
index 98c7bafb..
--- a/dev-libs/folks/folks-0.11.4-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala virtualx
-
-DESCRIPTION="Library for aggregating people from multiple sources"
-HOMEPAGE="https://wiki.gnome.org/Projects/Folks;
-
-LICENSE="LGPL-2.1+"
-SLOT="0/25" # subslot = libfolks soname version
-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 debug eds +telepathy test tracker utils"
-REQUIRED_USE="bluetooth? ( eds )"
-
-COMMON_DEPEND="
-   $(vala_depend)
-   >=dev-libs/glib-2.40:2
-   dev-libs/dbus-glib
-   >=dev-libs/gobject-introspection-1.30:=
-   >=dev-libs/libgee-0.10:0.8[introspection]
-   dev-libs/libxml2
-   sys-libs/ncurses:0=
-   sys-libs/readline:0=
-
-   bluetooth? ( >=net-wireless/bluez-5 )
-   eds? ( >=gnome-extra/evolution-data-server-3.13.90:=[vala] )
-   telepathy? ( >=net-libs/telepathy-glib-0.19.9[vala] )
-   tracker? ( >=app-misc/tracker-1:0= )
-"
-# telepathy-mission-control needed at runtime; it is used by the telepathy
-# backend via telepathy-glib's AccountManager binding.
-RDEPEND="${COMMON_DEPEND}
-   net-im/telepathy-mission-control
-"
-# folks socialweb backend requires that libsocialweb be built with USE=vala,
-# even when building folks with --disable-vala.
-#
-# FIXME:
-# test? ( bluetooth? ( dbusmock is missing in the tree ) )
-DEPEND="${COMMON_DEPEND}
-   >=dev-util/intltool-0.50.0
-   sys-devel/gettext
-   virtual/pkgconfig
-
-   test? (
-   sys-apps/dbus
-   bluetooth? (
-   >=gnome-extra/evolution-data-server-3.9.1
-   >=dev-libs/glib-2.40:2 ) )
-"
-
-src_prepare() {
-   # Force re-generation of introspection files, otherwise it does not 
match installed libs
-   find -name "*.vala" -exec touch {} \; || die
-
-   vala_src_prepare
-   gnome2_src_prepare
-}
-
-src_configure() {
-   # Rebuilding docs needs valadoc, which has no release
-   gnome2_src_configure \
-   $(use_enable bluetooth bluez-backend) \
-   $(use_enable debug) \
-   $(use_enable eds eds-backend) \
-   $(use_enable eds ofono-backend) \
-   $(use_enable telepathy telepathy-backend) \
-   $(use_enable tracker tracker-backend) \
-   $(use_enable utils inspect-tool) \
-   $(use_enable test modular-tests) \
-   --enable-vala \
-   --enable-import-tool \
-   --disable-docs \
-   --disable-fatal-warnings \
-   --disable-libsocialweb-backend
-}
-
-src_test() {
-   dbus-launch virtx emake check
-}



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

2018-12-11 Thread Gilles Dartiguelongue
commit: 0fb477d4d1ea3f4f84895f9c8c65ff2fe752ffe1
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Tue Dec 11 13:23:27 2018 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Tue Dec 11 13:23:40 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=0fb477d4

dev-libs/folks: sync live ebuild with ::gentoo

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Manifest-Sign-Key: 0x5A56C8CD0C13248A
Signed-off-by: Gilles Dartiguelongue  gentoo.org>

 dev-libs/folks/folks-.ebuild | 26 --
 dev-libs/folks/metadata.xml  |  1 -
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/dev-libs/folks/folks-.ebuild b/dev-libs/folks/folks-.ebuild
index 12226e5e..41f153a7 100644
--- a/dev-libs/folks/folks-.ebuild
+++ b/dev-libs/folks/folks-.ebuild
@@ -1,11 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
-EAPI="5"
-GCONF_DEBUG="yes"
+EAPI=6
 GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.22"
 VALA_USE_DEPEND="vapigen"
 
 inherit gnome2 vala virtualx
@@ -25,23 +22,23 @@ else
 fi
 # TODO: --enable-profiling
 # Vala isn't really optional, https://bugzilla.gnome.org/show_bug.cgi?id=701099
-IUSE="bluetooth eds +telepathy test tracker utils zeitgeist"
+IUSE="bluetooth debug eds +telepathy test tracker utils"
 REQUIRED_USE="bluetooth? ( eds )"
 
 COMMON_DEPEND="
$(vala_depend)
>=dev-libs/glib-2.40:2
dev-libs/dbus-glib
+   >=dev-libs/gobject-introspection-1.30:=
>=dev-libs/libgee-0.10:0.8[introspection]
dev-libs/libxml2
-   sys-libs/ncurses:=
-   sys-libs/readline:=
+   sys-libs/ncurses:0=
+   sys-libs/readline:0=
 
bluetooth? ( >=net-wireless/bluez-5 )
eds? ( >=gnome-extra/evolution-data-server-3.13.90:=[vala] )
telepathy? ( >=net-libs/telepathy-glib-0.19.9[vala] )
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
 # backend via telepathy-glib's AccountManager binding.
@@ -54,7 +51,6 @@ RDEPEND="${COMMON_DEPEND}
 # FIXME:
 # test? ( bluetooth? ( dbusmock is missing in the tree ) )
 DEPEND="${COMMON_DEPEND}
-   >=dev-libs/gobject-introspection-1.30
>=dev-util/intltool-0.50.0
sys-devel/gettext
virtual/pkgconfig
@@ -63,11 +59,13 @@ DEPEND="${COMMON_DEPEND}
sys-apps/dbus
bluetooth? (
>=gnome-extra/evolution-data-server-3.9.1
-   >=dev-libs/glib-2.40 ) )
-   !=dev-libs/glib-2.40:2 ) )
 "
 
 src_prepare() {
+   # Force re-generation of introspection files, otherwise it does not 
match installed libs
+   find -name "*.vala" -exec touch {} \; || die
+
vala_src_prepare
gnome2_src_prepare
 }
@@ -76,13 +74,13 @@ src_configure() {
# Rebuilding docs needs valadoc, which has no release
gnome2_src_configure \
$(use_enable bluetooth bluez-backend) \
+   $(use_enable debug) \
$(use_enable eds eds-backend) \
$(use_enable eds ofono-backend) \
$(use_enable telepathy telepathy-backend) \
$(use_enable tracker tracker-backend) \
$(use_enable utils inspect-tool) \
$(use_enable test modular-tests) \
-   $(use_enable zeitgeist) \
--enable-vala \
--enable-import-tool \
--disable-docs \
@@ -91,5 +89,5 @@ src_configure() {
 }
 
 src_test() {
-   dbus-launch Xemake check
+   dbus-launch virtx emake check
 }

diff --git a/dev-libs/folks/metadata.xml b/dev-libs/folks/metadata.xml
index b7d68733..a89e8dce 100644
--- a/dev-libs/folks/metadata.xml
+++ b/dev-libs/folks/metadata.xml
@@ -9,6 +9,5 @@
Load contacts from app-misc/tracker 
index
Load contacts from the Telepathy framework
Build the folks-inspect utility
-   Add support for Zeitgeist event tracking 
system
 
 



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

2015-06-09 Thread Gilles Dartiguelongue
commit: b21e1e16ca9efdf46c81140bbf2d6b35116e303c
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Tue Jun  9 10:43:20 2015 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Tue Jun  9 13:48:42 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=b21e1e16

dev-libs/folks: moved to gentoo-x86

 dev-libs/folks/folks-0.11.1.ebuild | 89 --
 1 file changed, 89 deletions(-)

diff --git a/dev-libs/folks/folks-0.11.1.ebuild 
b/dev-libs/folks/folks-0.11.1.ebuild
deleted file mode 100644
index 5ac2afc..000
--- a/dev-libs/folks/folks-0.11.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-GCONF_DEBUG=yes
-GNOME2_LA_PUNT=yes
-VALA_MIN_API_VERSION=0.22
-VALA_USE_DEPEND=vapigen
-
-inherit gnome2 vala virtualx
-
-DESCRIPTION=Library for aggregating people from multiple sources
-HOMEPAGE=https://wiki.gnome.org/Projects/Folks;
-
-LICENSE=LGPL-2.1+
-SLOT=0/25 # subslot = libfolks soname version
-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 +telepathy test tracker utils zeitgeist
-REQUIRED_USE=bluetooth? ( eds )
-
-COMMON_DEPEND=
-   $(vala_depend)
-   =dev-libs/glib-2.40:2
-   dev-libs/dbus-glib
-   =dev-libs/libgee-0.10:0.8[introspection]
-   dev-libs/libxml2
-   sys-libs/ncurses:=
-   sys-libs/readline:=
-
-   bluetooth? ( =net-wireless/bluez-5 )
-   eds? ( =gnome-extra/evolution-data-server-3.13.90:=[vala] )
-   telepathy? ( =net-libs/telepathy-glib-0.19.9[vala] )
-   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
-# backend via telepathy-glib's AccountManager binding.
-RDEPEND=${COMMON_DEPEND}
-   net-im/telepathy-mission-control
-
-# folks socialweb backend requires that libsocialweb be built with USE=vala,
-# even when building folks with --disable-vala.
-#
-# FIXME:
-# test? ( bluetooth? ( dbusmock is missing in the tree ) )
-DEPEND=${COMMON_DEPEND}
-   =dev-libs/gobject-introspection-1.30
-   =dev-util/intltool-0.50.0
-   sys-devel/gettext
-   virtual/pkgconfig
-
-   test? (
-   sys-apps/dbus
-   bluetooth? (
-   =gnome-extra/evolution-data-server-3.9.1
-   =dev-libs/glib-2.40 ) )
-   !dev-lang/vala-0.22.1:0.22
-
-
-src_prepare() {
-   vala_src_prepare
-   gnome2_src_prepare
-}
-
-src_configure() {
-   # Rebuilding docs needs valadoc, which has no release
-   gnome2_src_configure \
-   $(use_enable bluetooth bluez-backend) \
-   $(use_enable eds eds-backend) \
-   $(use_enable eds ofono-backend) \
-   $(use_enable telepathy telepathy-backend) \
-   $(use_enable tracker tracker-backend) \
-   $(use_enable utils inspect-tool) \
-   $(use_enable test modular-tests) \
-   $(use_enable zeitgeist) \
-   --enable-vala \
-   --enable-import-tool \
-   --disable-docs \
-   --disable-fatal-warnings \
-   --disable-libsocialweb-backend
-}
-
-src_test() {
-   dbus-launch Xemake check
-}



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

2015-05-28 Thread Gilles Dartiguelongue
commit: a50f5633f2ed6059611a75ab8a3dccf6963bba51
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Thu May 28 21:27:01 2015 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Thu May 28 21:27:01 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=a50f5633

dev-libs/folks: 0.11.0 → 0.11.1

 dev-libs/folks/{folks-0.11.0.ebuild = folks-0.11.1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-libs/folks/folks-0.11.0.ebuild 
b/dev-libs/folks/folks-0.11.1.ebuild
similarity index 100%
rename from dev-libs/folks/folks-0.11.0.ebuild
rename to dev-libs/folks/folks-0.11.1.ebuild



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

2015-05-17 Thread Gilles Dartiguelongue
commit: 121237fa5c0dbe1e185b16e2caae0fc9da9c57e9
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Sun May 17 15:37:58 2015 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Sun May 17 15:37:58 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=121237fa

dev-libs/folks: socialweb is phased out

 dev-libs/folks/metadata.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dev-libs/folks/metadata.xml b/dev-libs/folks/metadata.xml
index 9a57dc1..a4dbc68 100644
--- a/dev-libs/folks/metadata.xml
+++ b/dev-libs/folks/metadata.xml
@@ -3,11 +3,9 @@
 pkgmetadata
   herdgnome/herd
   use
-flag name=socialwebLoad web service contacts using
-  pkgnet-libs/libsocialweb/pkg/flag
+flag name=telepathyLoad contacts from the Telepathy framework/flag
 flag name=trackerLoad contacts from pkgapp-misc/tracker/pkg
  index/flag
-flag name=telepathyLoad contacts from the Telepathy framework/flag
 flag name=utilsBuild the folks-inspect utility/flag
 flag name=zeitgeistAdd support for Zeitgeist event tracking 
system/flag
   /use



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

2015-05-12 Thread Gilles Dartiguelongue
commit: 6ccf29e190163b459cb7ea4d38d63ef27973175f
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Tue May 12 22:30:34 2015 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Tue May 12 22:30:34 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=6ccf29e1

dev-libs/folks: 0.10.1-r1 → 0.11.0

 .../{folks-.ebuild = folks-0.11.0.ebuild} | 34 +-
 dev-libs/folks/folks-.ebuild   | 24 +++
 2 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/dev-libs/folks/folks-.ebuild 
b/dev-libs/folks/folks-0.11.0.ebuild
similarity index 73%
copy from dev-libs/folks/folks-.ebuild
copy to dev-libs/folks/folks-0.11.0.ebuild
index d542405..5ac2afc 100644
--- a/dev-libs/folks/folks-.ebuild
+++ b/dev-libs/folks/folks-0.11.0.ebuild
@@ -1,35 +1,30 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=5
 GCONF_DEBUG=yes
+GNOME2_LA_PUNT=yes
 VALA_MIN_API_VERSION=0.22
 VALA_USE_DEPEND=vapigen
 
 inherit gnome2 vala virtualx
-if [[ ${PV} =  ]]; then
-   inherit gnome2-live
-fi
 
 DESCRIPTION=Library for aggregating people from multiple sources
 HOMEPAGE=https://wiki.gnome.org/Projects/Folks;
 
 LICENSE=LGPL-2.1+
 SLOT=0/25 # subslot = libfolks soname version
-if [[ ${PV} =  ]]; 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
+IUSE=bluetooth eds +telepathy test tracker utils zeitgeist
 REQUIRED_USE=bluetooth? ( eds )
 
 COMMON_DEPEND=
$(vala_depend)
-   =dev-libs/glib-2.38.2:2
+   =dev-libs/glib-2.40:2
dev-libs/dbus-glib
=dev-libs/libgee-0.10:0.8[introspection]
dev-libs/libxml2
@@ -37,9 +32,8 @@ COMMON_DEPEND=
sys-libs/readline:=
 
bluetooth? ( =net-wireless/bluez-5 )
-   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] )
+   eds? ( =gnome-extra/evolution-data-server-3.13.90:=[vala] )
+   telepathy? ( =net-libs/telepathy-glib-0.19.9[vala] )
tracker? ( =app-misc/tracker-1:0= )
zeitgeist? ( =gnome-extra/zeitgeist-0.9.14 )
 
@@ -59,11 +53,11 @@ DEPEND=${COMMON_DEPEND}
sys-devel/gettext
virtual/pkgconfig
 
-   socialweb? ( =net-libs/libsocialweb-0.25.15[vala] )
-   test? ( sys-apps/dbus
+   test? (
+   sys-apps/dbus
bluetooth? (
=gnome-extra/evolution-data-server-3.9.1
-   =dev-libs/glib-2.39.2 ) )
+   =dev-libs/glib-2.40 ) )
!dev-lang/vala-0.22.1:0.22
 
 
@@ -78,16 +72,16 @@ src_configure() {
$(use_enable bluetooth bluez-backend) \
$(use_enable eds eds-backend) \
$(use_enable eds ofono-backend) \
-   $(use_enable socialweb libsocialweb-backend) \
$(use_enable telepathy telepathy-backend) \
$(use_enable tracker tracker-backend) \
$(use_enable utils inspect-tool) \
-   $(use_enable test tests) \
+   $(use_enable test modular-tests) \
$(use_enable zeitgeist) \
--enable-vala \
--enable-import-tool \
--disable-docs \
-   --disable-fatal-warnings
+   --disable-fatal-warnings \
+   --disable-libsocialweb-backend
 }
 
 src_test() {

diff --git a/dev-libs/folks/folks-.ebuild b/dev-libs/folks/folks-.ebuild
index d542405..edb1816 100644
--- a/dev-libs/folks/folks-.ebuild
+++ b/dev-libs/folks/folks-.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=5
 GCONF_DEBUG=yes
+GNOME2_LA_PUNT=yes
 VALA_MIN_API_VERSION=0.22
 VALA_USE_DEPEND=vapigen
 
@@ -24,12 +25,12 @@ else
 fi
 # 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
+IUSE=bluetooth eds +telepathy test tracker utils zeitgeist
 REQUIRED_USE=bluetooth? ( eds )
 
 COMMON_DEPEND=
$(vala_depend)
-   =dev-libs/glib-2.38.2:2
+   =dev-libs/glib-2.40:2
dev-libs/dbus-glib
=dev-libs/libgee-0.10:0.8[introspection]
dev-libs/libxml2
@@ -37,9 +38,8 @@ COMMON_DEPEND=
sys-libs/readline:=
 
bluetooth? ( =net-wireless/bluez-5 )
-   eds? 

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

2014-04-20 Thread Gilles Dartiguelongue
commit: 091e5a070bbcd734340b51d2828d0d323ad62318
Author: Gilles Dartiguelongue eva AT gentoo DOT org
AuthorDate: Sun Apr 20 20:00:30 2014 +
Commit: Gilles Dartiguelongue eva AT gentoo DOT org
CommitDate: Sun Apr 20 22:55:12 2014 +
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-.ebuild = folks-0.9.6-r1.ebuild}  | 17 +++--
 dev-libs/folks/folks-.ebuild|  6 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/dev-libs/folks/folks-.ebuild 
b/dev-libs/folks/folks-0.9.6-r1.ebuild
similarity index 89%
copy from dev-libs/folks/folks-.ebuild
copy to dev-libs/folks/folks-0.9.6-r1.ebuild
index bf7b2e3..3ca23fd 100644
--- a/dev-libs/folks/folks-.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} =  ]]; 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} =  ]]; 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-.ebuild b/dev-libs/folks/folks-.ebuild
index bf7b2e3..e6b3e4e 100644
--- a/dev-libs/folks/folks-.ebuild
+++ b/dev-libs/folks/folks-.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
 }