commit: 6ccf29e190163b459cb7ea4d38d63ef27973175f
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue May 12 22:30:34 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue May 12 22:30:34 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=6ccf29e1
dev-libs/folks: 0.10.1-r1 → 0.11.0
.../{folks-9999.ebuild => folks-0.11.0.ebuild} | 34 +++++++++-------------
dev-libs/folks/folks-9999.ebuild | 24 +++++++--------
2 files changed, 26 insertions(+), 32 deletions(-)
diff --git a/dev-libs/folks/folks-9999.ebuild
b/dev-libs/folks/folks-0.11.0.ebuild
similarity index 73%
copy from dev-libs/folks/folks-9999.ebuild
copy to dev-libs/folks/folks-0.11.0.ebuild
index d542405..5ac2afc 100644
--- a/dev-libs/folks/folks-9999.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} = 9999 ]]; 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} = 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"
+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-9999.ebuild b/dev-libs/folks/folks-9999.ebuild
index d542405..edb1816 100644
--- a/dev-libs/folks/folks-9999.ebuild
+++ b/dev-libs/folks/folks-9999.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? ( >=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 +59,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 +78,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() {
