Version bump for Gnome 3.10, drop old

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

5 files changed, 96 insertions, 95 deletions

diff --git a/dev-libs/folks/ChangeLog b/dev-libs/folks/ChangeLog
index c3dd61b1ba21..71cc1261c13f 100644
--- a/dev-libs/folks/ChangeLog
+++ b/dev-libs/folks/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/folks
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/folks/ChangeLog,v 1.36 2013/12/08 17:55:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/folks/ChangeLog,v 1.37 2013/12/24 15:47:09 pacho Exp $
+
+*folks-0.9.6 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +folks-0.9.6.ebuild,
+  -folks-0.8.0.ebuild, metadata.xml:
+  Version bump for Gnome 3.10, drop old
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> folks-0.9.3.ebuild:
   x86 stable, bug #478252
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index 8cbd0d97038f..1d520a6439af 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA256
 
 DIST folks-0.4.3.tar.bz2 635168 SHA256 e5a5bbe1524130ff5b6400726db3e12299b12ffefa108bc89169509f343d925e SHA512 dfd7cb055aba691e7b8e7daa3e887e20f021d230617641c0dcf91787b53b576601fabeeba654e98009b47ecff39969ea1b560822d4452ee497c7eeedc16c423b WHIRLPOOL 49cee01e55e9223b6566d76c21f8de68a15c6a2534ce4b4d6ed752e9cf8dadd256b5343a46c26e0236155901864e34b6677764aa70c43c8e18df692c40d8c85d
-DIST folks-0.8.0.tar.xz 1477836 SHA256 8c56c7594dd502ef5877e93181136e41f4ea03de4971372a7a04e7f1492eed9d SHA512 0e6c1adb84ff248a0a5e93ab631ba791b493fbcc60d9f34acc6f96132fa23c8a81a84a322ae8fc8168f3dd2769f8dc944979ba03b6ec529d2ed9d12c520e89ba WHIRLPOOL 379c1a4c202bcf3550c46c67eb3b6af3171e0e58ce9639dce13b5f52154d8f002e603a23a11a7cfe601f0ea82cbb7fa8702db467be2d159c3d3694c39261ed4c
 DIST folks-0.9.3.tar.xz 1650964 SHA256 3a806f2009005c920cacd0c6415d86a52e3fbf3ad554d662cf6b4bd9209c17c5 SHA512 d338d6c026b97c3af365eca1ba85f7cc24faeb48309274d4a707813369c285eee0dd6105513f623edc98b3a762df0b1b3c092e04f27d8c04b172bcf78c3fd8cd WHIRLPOOL 7319728bd7bb25a2f2dfcaf2df48fe2c9d953342a086507dca485e651a5de7f62d696a441e03edcd648a4605a5d0e90d8a796cacd0bc0f7b90e8612f9a376598
+DIST folks-0.9.6.tar.xz 1694012 SHA256 a67e055b5a2724a34a80946e2940c4c0ad708cb1f4e0a09407c6b69a5e40267f SHA512 613d4cfb84f4ce9656994950f66d974c99c074317c5f1c92f4501760261021e8e86d85e56c7720fa0f6a20db818a1e813d6cd40e67d4157fd3005a3770a86127 WHIRLPOOL ae564d02ec3bea7efca04bd9a0f77732fdc03217538d1cb410bf7c467cca606adcf8bc395d7f8f4ed386eb07e687203889b75c930a8103dc104ce2ce1afb0d94
 EBUILD folks-0.4.3.ebuild 1262 SHA256 e685df940a335fa5620fde997158a10ab4b33163d85b84c29d8f1aabb9d5004b SHA512 f3306604f1e852af4739ddaa8cfe3b0f30c7920ca018aa7c9e334f608a5a4d7c4a32e589e4082a0fbf8f6275b26e2351bc62555960e507dfd00f0e97f60ee5c2 WHIRLPOOL 13ed9ea89d2be87005884ecad979d4e0a242b9cf8619bfb1638d4b5f25b7bfc3246d8d08ba48bbd3add6c07e11dd31ce2d08be6cd6945f9695507ef5d6ce413e
-EBUILD folks-0.8.0.ebuild 2597 SHA256 7f7b1cf6cca236a9a087d5e65e7f32e979b6144c6e2c92703a4cc0faa2d31695 SHA512 4ce9920dc68cbf4e9cae754ebff8c678573493eae1201474f968b3027402891d22d31e59d7261129def9594e559b70f492e62346751450b0f543ad491872809e WHIRLPOOL 7585456d73537d78e4b16c7ea36cc0b96212a8dac398d9bdf8b35b5004196d773e9a5153ff6e1b49fbd5855412b6068dfeffbe937ed85f56773240fe75eda271
 EBUILD folks-0.9.3.ebuild 2411 SHA256 2a272c856df29c5220ee02389e686a4c56cdc94e68c6d3f9f6e04ab90880d638 SHA512 b5f951d66a88a7ff522e2128a584b8608bee036c22f439927470e5b8dbc24dfb6c8dd23591c97fabd13fc1dad1f76b996a3a63258cde1e5df353ad44afcf2a96 WHIRLPOOL cb9b5ff26ee4a5a48c737b6479dd832c56ce6eaf10d8c762da6a9e3afd1cd28329c18f71a0f55f4edf9d1714738d9437a5730de0471cf1e04c9294b8fc4e22af
-MISC ChangeLog 5600 SHA256 2fc73d8f44b9a05e9720cff48034e79312adef30231a3b2c2524c7e80523c493 SHA512 d689cada4d6eed4773bc378b5b5807c31cfa70e4cd7100a800e1061306ea92461e84be1789fb14929655baa7230af03029b2e0f5d82809331e2ff7ccba09780c WHIRLPOOL ec2e81780b1b5315f2dde3c591107cb28eafe7f159dacbe392d8abb9c8bebc6f2a97fa00832abfcd8bcf6d0a7bbeecae9203cf68bbd61b78a5a7db4f0195c851
-MISC metadata.xml 636 SHA256 20d8ab0e35f35e6d91d1b8cdc1b3c3d47a1f150cf5ea54512ce88d035604e6d4 SHA512 589e36d5ff423f04e561762f7c3ff240c5953b777ceab6f51ce0f3b6f130f172c687c538dca90575b22e71174ef4634338afd6a2ba9e71dd5ff1503775a828d9 WHIRLPOOL 1186c45e28c71076fd2faf927d4cade2d6d828486eef1791f366fcb7ed87f76bee2384028126c0ca1c493c7396cf526652e19e7e5d584dd08bff66c1ab62ecd6
+EBUILD folks-0.9.6.ebuild 2446 SHA256 1ff3d0d79e2d35bb375b7321e7301bbd87c58f01c97a198409a7fec435e4daa4 SHA512 9324bc46a6e18bc3c73baeae0916c8859eba6318f0559abb50b725a0da173e8266703a7df79952e2862c27cac22b9a6969f85bc9d730a2687d2af986d231ff60 WHIRLPOOL 2bbbe3fc83632c607050463121f192197943df9509990c5fe5e563baf1de0c065b4a54e6839138007179fa009786ea548b177cd86df29363b5f2047299e8b8f1
+MISC ChangeLog 5773 SHA256 715189977d849b7133400ebefaced59da1f3c2e05072b3e28f77764e908950bb SHA512 140cfa861f0942dc1a901a68b42b6c684d491e07e3c6c56baebe536486721dce4d8176b936e1b76ae9286af93a6fafc08d8edc2962bdc6c52dde1382aa3f8580 WHIRLPOOL ddea36b7aaad686205079fd8a6184d23724e0b7038072d0c51319ee48b3ab56c0f8e2b3688850867ff6b43f8f306b107650753f8417987d144473969d1598112
+MISC metadata.xml 561 SHA256 c39078a098dc01eb77baa80485700f14a684a9379f256efa7143f79144b189bc SHA512 a2b01fd5035b0f290b1e066d2b1577ebcd604f1cdb318958c5684ca38ea5ad73b0384141b7ed7ff9ed86779b26a1d9d09365586cc21166a03e5c5406ecdc8d89 WHIRLPOOL 8e1eebfa1ed4e915886bd472203f48ab78f2f7d6eab9ee6ce29cb0f8f600013699beb38970eab2f64b8660b8005c2c48b81d00592c73ab1c81e550c6bf2f899a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKksqYACgkQCaWpQKGI+9TS4QCghByjf75QGJOBnvki+HmoQFY4
-VIsAn3+basvX3sD4e7Sd66C7qDcZCyN0
-=REOM
+iEYEAREIAAYFAlK5rH4ACgkQCaWpQKGI+9SaSgCghE5Y4vpOZaCDRj63Jw9tP2BE
+ZFAAnRyGCusuQ7hETD7bBAxPO3vzegVH
+=ttYr
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/folks/folks-0.8.0.ebuild b/dev-libs/folks/folks-0.8.0.ebuild
deleted file mode 100644
index 81692c6fc900..000000000000
--- a/dev-libs/folks/folks-0.8.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/folks/folks-0.8.0.ebuild,v 1.5 2013/02/02 22:24:49 ago Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-
-inherit eutils gnome2 vala virtualx
-
-DESCRIPTION="libfolks is a library that aggregates people from multiple sources"
-HOMEPAGE="http://telepathy.freedesktop.org/wiki/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
-IUSE="eds socialweb +telepathy test tracker utils vala"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32:2
-	dev-libs/dbus-glib
-	<dev-libs/libgee-0.7:0[introspection]
-	dev-libs/libxml2
-	sys-libs/ncurses:=
-	sys-libs/readline:=
-
-	eds? ( >=gnome-extra/evolution-data-server-3.5.4:= )
-	socialweb? ( >=net-libs/libsocialweb-0.25.20 )
-	telepathy? (
-		>=dev-libs/libzeitgeist-0.3.14:=
-		>=net-libs/telepathy-glib-0.19 )
-	tracker? ( >=app-misc/tracker-0.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.
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/gobject-introspection-1.30
-	>=dev-util/intltool-0.50.0
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	socialweb? ( >=net-libs/libsocialweb-0.25.15[vala] )
-	test? ( sys-apps/dbus )
-	vala? (
-		$(vala_depend)
-		>=net-libs/telepathy-glib-0.13.1[vala]
-		eds? ( >=gnome-extra/evolution-data-server-3.5.4:=[vala] ) )
-"
-# the inspect tool requires --enable-vala
-REQUIRED_USE="utils? ( vala )"
-
-src_prepare() {
-	local vala_version=$(vala_best_api_version)
-	# Rebuilding docs needs valadoc, which has no release
-	G2CONF="${G2CONF}
-		$(use_enable eds eds-backend)
-		$(use_enable socialweb libsocialweb-backend)
-		$(use_enable telepathy telepathy-backend)
-		$(use_enable tracker tracker-backend)
-		$(use_enable utils inspect-tool)
-		$(use_enable vala)
-		$(use_enable test tests)
-		--enable-import-tool
-		--disable-docs
-		--disable-fatal-warnings
-		VALAC=$(type -p valac-${vala_version})
-		VAPIGEN=$(type -p vapigen-${vala_version})"
-
-	# We don't need vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_test() {
-	# FIXME: eds tests often fails for no good reason
-	#sed -e 's/check: .*/check: /' \
-	#	-i tests/eds/Makefile || die "sed failed"
-	dbus-launch Xemake check
-}
diff --git a/dev-libs/folks/folks-0.9.6.ebuild b/dev-libs/folks/folks-0.9.6.ebuild
new file mode 100644
index 000000000000..f4845cfda613
--- /dev/null
+++ b/dev-libs/folks/folks-0.9.6.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/folks/folks-0.9.6.ebuild,v 1.1 2013/12/24 15:47:09 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="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://live.gnome.org/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 socialweb +telepathy test tracker utils zeitgeist"
+REQUIRED_USE="bluetooth? ( eds )"
+
+COMMON_DEPEND="
+	$(vala_depend)
+	>=dev-libs/glib-2.38.2: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.9.1:=[vala] )
+	socialweb? ( >=net-libs/libsocialweb-0.25.20 )
+	telepathy? ( >=net-libs/telepathy-glib-0.19[vala] )
+	tracker? ( >=app-misc/tracker-0.16:= )
+	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.
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/gobject-introspection-1.30
+	>=dev-util/intltool-0.50.0
+	sys-devel/gettext
+	virtual/pkgconfig
+
+	socialweb? ( >=net-libs/libsocialweb-0.25.15[vala] )
+	test? ( sys-apps/dbus )
+	!<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 socialweb libsocialweb-backend) \
+		$(use_enable telepathy telepathy-backend) \
+		$(use_enable tracker tracker-backend) \
+		$(use_enable utils inspect-tool) \
+		$(use_enable test tests) \
+		$(use_enable zeitgeist) \
+		--enable-vala \
+		--enable-import-tool \
+		--disable-docs \
+		--disable-fatal-warnings
+}
+
+src_test() {
+	dbus-launch Xemake check
+}
diff --git a/dev-libs/folks/metadata.xml b/dev-libs/folks/metadata.xml
index 1742780aad9f..5a4e0a796e42 100644
--- a/dev-libs/folks/metadata.xml
+++ b/dev-libs/folks/metadata.xml
@@ -7,7 +7,6 @@
 	<flag name="tracker">Load contacts from <pkg>app-misc/tracker</pkg> index</flag>
 	<flag name="telepathy">Load contacts from the Telepathy framework</flag>
 	<flag name="utils">Build the folks-inspect utility</flag>
-	<flag name="vala">Regenerate pre-generated C code from Vala source</flag>
 	<flag name="zeitgeist">Add support for Zeitgeist event tracking system</flag>
 </use>
 </pkgmetadata>