Fix vala/zeitgeist compilation problems (#471368 by Peter Alfredsen, #479600 by Juergen Rose and Marien Zwart, #479758 by Fabio Coatti), drop old.

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

8 files changed, 25 insertions, 295 deletions

diff --git a/dev-libs/folks/ChangeLog b/dev-libs/folks/ChangeLog
index 8cc1ca5c126d..1d45e9754227 100644
--- a/dev-libs/folks/ChangeLog
+++ b/dev-libs/folks/ChangeLog
@@ -1,6 +1,14 @@
 # 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.33 2013/08/02 20:39:16 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/folks/ChangeLog,v 1.34 2013/08/09 08:31:45 pacho Exp $
+
+  09 Aug 2013; Pacho Ramos <pacho@gentoo.org>
+  -files/folks-0.9.1-automagic-fix1.patch,
+  -files/folks-0.9.1-automagic-fix2.patch,
+  -files/folks-0.9.1-automagic-fix3.patch, -folks-0.9.1.ebuild,
+  -folks-0.9.2.ebuild, folks-0.9.3.ebuild:
+  Fix vala/zeitgeist compilation problems (#471368 by Peter Alfredsen, #479600
+  by Juergen Rose and Marien Zwart, #479758 by Fabio Coatti), drop old.
 
 *folks-0.9.3 (02 Aug 2013)
 
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index 8e0e023c0f32..b9b44c91975f 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,25 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX folks-0.9.1-automagic-fix1.patch 2147 SHA256 f1c13448e0f2a63df61c1fb1efaa938c5b769a05d3051cfe20a70d7163429e1f SHA512 ad1c388c3626646a439bb6e19c7017a2fa357d8c9d88ea40ca6bd0b5c91575a6202bf14eadbaebd3f6b51da2073d37ffb0f1e6e877a4abd34133cfe22e580e1e WHIRLPOOL 2aa8bef8ad6d1fb371c64b6c549154056b9b8e725c9539be7d51ec471dd4496b9894759d2c207c8f44391cc9d8a7bac320dbad8369b5541d7cd4bff1c2febfbe
-AUX folks-0.9.1-automagic-fix2.patch 743 SHA256 ec459fb4a2dd8d8950069fc21d02f0575a5d6fc4a4f11f87d434f14b460dfb70 SHA512 96e8dcd847eb3615b88327747224286ec5f5f01a520638b5c79bbeb09b5152553180724a6c2f562709a0d277fb0c0c50e7eb76fa934abfdf1d32882b4131c9f9 WHIRLPOOL aafe0727d4e4057738d6ead11a2da4e936383946f830f25e3e830a01e5cc80c4f06e76f9d446de48f645b41728867fb0f84e49a4729a6e266b5a204c01d45bba
-AUX folks-0.9.1-automagic-fix3.patch 908 SHA256 7da9fa6e7c5cb5a5019b51557738fef994cd558bc7a57a9771672093ee587260 SHA512 0588119b4057fe7d203aca6fa5a7e6fe3febedc3ec432837318088488f8f6670655596a720a26a4376dcf53f2d15d44790dbffa7b0119d664403ccf3d6967286 WHIRLPOOL 84ff740bfd87131aa56c0de94a3131e2a73bb19810740c0c7241e45bae8e21c9e17908d9f196db0644c3caae9896550b030ec19aa6bee3c4c45662af524c54b4
 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.1.tar.xz 1570912 SHA256 102b1867355d16e73a837871a058dda13c74fa385908ddda1623893ab0baee4a SHA512 1c883090e268936c53049805ec9c95b38f323417d0840d7fcf1b20658d3002df7d88e9cc691b024b5c6b6bec1564143233e5a833f5d5309413bd7462b58f60fb WHIRLPOOL 9219eebdd4ec6426432187219fdc5da2d67b1f90a1eba4a35d9ab1e1af1178dc86041a5bc38d9df4ed739c48485950e6f6192d694e623be2afc17d548e731ed9
-DIST folks-0.9.2.tar.xz 1642932 SHA256 4b034ffe83928acd8a7d607edab60f36eb13801a9d3fcc34ccc7c34a16747818 SHA512 b36f54cac18d0c798df285559ca83d11de56b962e858af6d3de87738c5cd1e72cf23c81c86ce4d5b717c927ac680890719f7626305fdc6bf9eec8560f66bb073 WHIRLPOOL 08a2019138b6ee0f38e3f93217ea087c7d34005719c4aced098b0043bb0d0f52edc263c9b6a8c600d723d7b2a0216f127201e1b4a70ac36f867bf116f8c1d5c7
 DIST folks-0.9.3.tar.xz 1650964 SHA256 3a806f2009005c920cacd0c6415d86a52e3fbf3ad554d662cf6b4bd9209c17c5 SHA512 d338d6c026b97c3af365eca1ba85f7cc24faeb48309274d4a707813369c285eee0dd6105513f623edc98b3a762df0b1b3c092e04f27d8c04b172bcf78c3fd8cd WHIRLPOOL 7319728bd7bb25a2f2dfcaf2df48fe2c9d953342a086507dca485e651a5de7f62d696a441e03edcd648a4605a5d0e90d8a796cacd0bc0f7b90e8612f9a376598
 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.1.ebuild 2513 SHA256 2eb3d36d7e763cd34a56d8a69fcd96be222ffcad16db49ccd5636e988a3d1597 SHA512 5ed56bcc73ef403849b335fb799a57a66de26ff76224f76e832743aeb88e7bf5814b8f2656108a3dd7da4ad3effb29ec2984ca44f7e69728b0b87576e5b08e03 WHIRLPOOL 9033a78fbd167baf8caa7997e4b1eabc5bec359388f9a1e21c962d23d63a99be3d0560bfd465e2416cd3d20454c56f9ed5c804231da152e404b11ddc010784f5
-EBUILD folks-0.9.2.ebuild 2420 SHA256 e8412f833dc37dd89c0e8a0700d116f369bc26eaf60c35bd60f3710189dca599 SHA512 7b0e50ba0ffdb3ebd99996aaacc6a9eac86dc35a86dd9d00b206d6e042313b3ac193b4e7835c8bfc5b77c70b2974d0e3b03b2eb91683a090a460e5f5bfdb997d WHIRLPOOL a1e363bd0394f465f4298ba7ac874e54c528650aacdb150015a8346d239a59fe80c6f3b715be16a7101a19557a93f07f2d6822fcbb68274cf6b66a0b4c76c0e1
-EBUILD folks-0.9.3.ebuild 2418 SHA256 df62574ebb14d5084073df5be7257afa812c9a9f9c224387f17878512fe5c343 SHA512 315f53d23fdcaf1f33dde9ab6a1daab6475ddadc5a849603993ab4868c21c24890bcaa6b4df612d5e72ca63a9a6b22a15d139129bfab02668843a2f0c13acfe1 WHIRLPOOL 46aae5a33591e3b98c44f6f9ad812539013ec0c6ce62bc83c9e006d6d6b4c9d2e90eb9d2dd37b6718d9089e00441f414b3aeaeede3e658de3b28ed7063a913f3
-MISC ChangeLog 5019 SHA256 712dbb76c0009c2e057f155e39c5cb2158e03d1861a8854df4224894b0f781bf SHA512 a80887529c86a8ab68532fde12b8e60070b5aab5efc174ec58b9f148e7fabb8c5e9e9cbf16ab5b0705986b442a035dd1747bf541a146b84c6ae4f5de27d09b26 WHIRLPOOL 16210f22caf9ba0979a9d6ad06b1d645b38d82ed0a7d3b577400b64e07fdd25960d3503df220971da72daef2086a1e97a191607a0540fe0aa7c6381b08f97d24
+EBUILD folks-0.9.3.ebuild 2413 SHA256 f09491473d69d8b2f895581b2a316cad4a7f634a37dec50ec4eb16229b8d22b0 SHA512 3bd696efcd534872f6c10a460d60771fc1c6d1bcf70bac4bfcac04b10ccac164e63c25e3056e4cea9d29214e1af09530f6ae39ff5b95f21521091fb85beef000 WHIRLPOOL d29ab757820c5d606c15a763b550c03950274f5b6ad40a8aff86eb59deb0fac528593133ba66f1e11a8ebc19a31f85f88625b20c8821c6b4e73221388a81dfed
+MISC ChangeLog 5412 SHA256 0d27df827106afa297b8eb7c948923c817e5aae439cb604ca490ab26588939fe SHA512 3d61bc55ddcbf2c16670f5a14162edb4519553268a6e7bfe7bbe0e7c464549eef3436ff82b4199f0006a76725bcbbbb032619a71a0658ecf5ce4e398b1009556 WHIRLPOOL e71fa3ae3c9f62d5a75e43fd062f01e879341b3c3281c789e44c2d164fb2438626d4c735c9e821366df3b08663cddf941405d21d72e35531268b34955e5ad319
 MISC metadata.xml 636 SHA256 20d8ab0e35f35e6d91d1b8cdc1b3c3d47a1f150cf5ea54512ce88d035604e6d4 SHA512 589e36d5ff423f04e561762f7c3ff240c5953b777ceab6f51ce0f3b6f130f172c687c538dca90575b22e71174ef4634338afd6a2ba9e71dd5ff1503775a828d9 WHIRLPOOL 1186c45e28c71076fd2faf927d4cade2d6d828486eef1791f366fcb7ed87f76bee2384028126c0ca1c493c7396cf526652e19e7e5d584dd08bff66c1ab62ecd6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlH8GOQACgkQ1fmVwcYIWAaO/QCgqMp5CVD7dLegA7xMsiIiTEsC
-mR0AoKDNEk2UHYzWSMcvk+i1j3HmAlbH
-=7XOY
+iEYEAREIAAYFAlIEqPIACgkQCaWpQKGI+9QXpwCfYWLDwwr9RVRu2hvggB+foP0g
+cIYAn3GTBCud7H/YAi7Aq6ionZdJ7VFF
+=sKXM
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/folks/files/folks-0.9.1-automagic-fix1.patch b/dev-libs/folks/files/folks-0.9.1-automagic-fix1.patch
deleted file mode 100644
index 180909367e48..000000000000
--- a/dev-libs/folks/files/folks-0.9.1-automagic-fix1.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From d9ae3100a70f89ace7c6a853dfbc1ebd22d5802f Mon Sep 17 00:00:00 2001
-From: Maciej Piechotka <uzytkownik2@gmail.com>
-Date: Sat, 20 Apr 2013 11:32:19 +0000
-Subject: Remove autodependency on zeitgeist
-
----
-diff --git a/configure.ac b/configure.ac
-index 69dc010..2798c25 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -128,6 +128,12 @@ AS_IF([test "x$enable_telepathy_backend" = "xyes"], [
- 
- AM_CONDITIONAL([ENABLE_TELEPATHY], [test "x$enable_telepathy_backend" = "xyes"])
- 
-+AC_ARG_ENABLE(zeitgeist,
-+        AC_HELP_STRING([--enable-zeitgeist],
-+                       [ build Zeitgeist support in the Telepathy backend]),
-+        enable_zeitgeist=$enableval,
-+        enable_zeitgeist=auto)
-+
- # Automatically check the dependencies for the libsocialweb backend
- SW_CLIENT_REQUIRED=0.25.20
- AC_ARG_ENABLE(libsocialweb-backend,
-@@ -195,10 +201,29 @@ PKG_CHECK_MODULES([DBUS_GLIB], [dbus-glib-1 dbus-1])
- PKG_CHECK_MODULES([GEE], [gee-0.8 >= $GEE_REQUIRED])
- 
- TP_GLIB_REQUIRED=0.19.0
-+
- AS_IF([test x$enable_telepathy_backend = xyes], [
--        PKG_CHECK_MODULES([TP_GLIB], [telepathy-glib >= $TP_GLIB_REQUIRED])
--        PKG_CHECK_MODULES([ZEITGEIST], [zeitgeist-1.0 >= $ZEITGEIST_REQUIRED],
--	                   have_zeitgeist="yes",have_zeitgeist="no")])
-+        PKG_CHECK_MODULES([TP_GLIB], [telepathy-glib >= $TP_GLIB_REQUIRED])])
-+case "x$enable_zeitgeist" in
-+  xyes)
-+    AS_IF([test x$enable_telepathy_backend = xyes],
-+          [PKG_CHECK_MODULES([ZEITGEIST], [zeitgeist-1.0 >= $ZEITGEIST_REQUIRED])]
-+          [AC_MSG_ERROR([Zeitgeist backend requires telepathy])])
-+    have_zeitgeist=yes
-+    ;;
-+  xauto)
-+    AS_IF([test x$enable_telepathy_backend = xyes],
-+          [PKG_CHECK_MODULES([ZEITGEIST], [zeitgeist-1.0 >= $ZEITGEIST_REQUIRED],
-+                             have_zeitgeist="yes",have_zeitgeist="no")],
-+          [have_zeitgeist=no])
-+    ;;
-+  xno)
-+    have_zeitgeist=no
-+    ;;
-+  x*)
-+    AC_MSG_ERROR([Unknown --enable-zeitgeist argument: $enable_zeitgeist])
-+esac
-+
- AS_IF([test "x$have_zeitgeist" == "xyes"], [
-    ZEITGEIST_VALAFLAGS="-D HAVE_ZEITGEIST"
-    AC_SUBST([ZEITGEIST_VALAFLAGS])
---
-cgit v0.9.1
diff --git a/dev-libs/folks/files/folks-0.9.1-automagic-fix2.patch b/dev-libs/folks/files/folks-0.9.1-automagic-fix2.patch
deleted file mode 100644
index 970e05d01dc8..000000000000
--- a/dev-libs/folks/files/folks-0.9.1-automagic-fix2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 204c5394a7120b4ad6f4e90efb4d1b03daa08cf4 Mon Sep 17 00:00:00 2001
-From: Travis Reitter <travis.reitter@collabora.co.uk>
-Date: Wed, 24 Apr 2013 18:22:15 +0000
-Subject: Correct the terminology in Zeitgeist check failure
-
----
-diff --git a/configure.ac b/configure.ac
-index 2798c25..117ff4a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -208,7 +208,7 @@ case "x$enable_zeitgeist" in
-   xyes)
-     AS_IF([test x$enable_telepathy_backend = xyes],
-           [PKG_CHECK_MODULES([ZEITGEIST], [zeitgeist-1.0 >= $ZEITGEIST_REQUIRED])]
--          [AC_MSG_ERROR([Zeitgeist backend requires telepathy])])
-+          [AC_MSG_ERROR([Zeitgeist support requires Zeitgeist development package])])
-     have_zeitgeist=yes
-     ;;
-   xauto)
---
-cgit v0.9.1
diff --git a/dev-libs/folks/files/folks-0.9.1-automagic-fix3.patch b/dev-libs/folks/files/folks-0.9.1-automagic-fix3.patch
deleted file mode 100644
index 348284e2f1b9..000000000000
--- a/dev-libs/folks/files/folks-0.9.1-automagic-fix3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From a24ec72eecd68cda328cd93f8896e3c1d9952452 Mon Sep 17 00:00:00 2001
-From: Travis Reitter <travis.reitter@collabora.co.uk>
-Date: Fri, 26 Apr 2013 00:45:42 +0000
-Subject: Correctly check for existence of Zeitgeist.
-
----
-diff --git a/configure.ac b/configure.ac
-index 117ff4a..de10a95 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -207,8 +207,9 @@ AS_IF([test x$enable_telepathy_backend = xyes], [
- case "x$enable_zeitgeist" in
-   xyes)
-     AS_IF([test x$enable_telepathy_backend = xyes],
--          [PKG_CHECK_MODULES([ZEITGEIST], [zeitgeist-1.0 >= $ZEITGEIST_REQUIRED])]
--          [AC_MSG_ERROR([Zeitgeist support requires Zeitgeist development package])])
-+          [PKG_CHECK_MODULES([ZEITGEIST], [zeitgeist-1.0 >= $ZEITGEIST_REQUIRED], 
-+           ,
-+           [AC_MSG_ERROR([Zeitgeist support requires Zeitgeist development package])])])
-     have_zeitgeist=yes
-     ;;
-   xauto)
---
-cgit v0.9.1
diff --git a/dev-libs/folks/folks-0.9.1.ebuild b/dev-libs/folks/folks-0.9.1.ebuild
deleted file mode 100644
index 9f286665ed84..000000000000
--- a/dev-libs/folks/folks-0.9.1.ebuild
+++ /dev/null
@@ -1,85 +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.9.1.ebuild,v 1.2 2013/05/18 19:16:46 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools eutils 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
-IUSE="eds socialweb +telepathy test tracker utils vala zeitgeist"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32:2
-	dev-libs/dbus-glib
-	>=dev-libs/libgee-0.10:0.8[introspection]
-	dev-libs/libxml2
-	sys-libs/ncurses:=
-	sys-libs/readline:=
-
-	eds? ( >=gnome-extra/evolution-data-server-3.7.90:= )
-	socialweb? ( >=net-libs/libsocialweb-0.25.20 )
-	telepathy? ( >=net-libs/telepathy-glib-0.19 )
-	tracker? ( >=app-misc/tracker-0.16:= )
-	zeitgeist? ( >=dev-libs/libzeitgeist-0.3.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() {
-	# Fix automagic dependency on zeitgeist, bug #466378
-	epatch "${FILESDIR}"/${P}-automagic-fix{1,2,3}.patch
-
-	eautoreconf
-	gnome2_src_prepare
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	# Rebuilding docs needs valadoc, which has no release
-	gnome2_src_configure \
-		$(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) \
-		$(use_enable zeitgeist) \
-		--enable-import-tool \
-		--disable-docs \
-		--disable-fatal-warnings
-}
-
-src_test() {
-	dbus-launch Xemake check
-}
diff --git a/dev-libs/folks/folks-0.9.2.ebuild b/dev-libs/folks/folks-0.9.2.ebuild
deleted file mode 100644
index 71147bc4944d..000000000000
--- a/dev-libs/folks/folks-0.9.2.ebuild
+++ /dev/null
@@ -1,82 +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.9.2.ebuild,v 1.3 2013/07/24 22:16:48 eva Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-VALA_MIN_API_VERSION="0.18"
-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
-IUSE="eds socialweb +telepathy test tracker utils vala zeitgeist"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32:2
-	dev-libs/dbus-glib
-	>=dev-libs/libgee-0.10:0.8[introspection]
-	dev-libs/libxml2
-	sys-libs/ncurses:=
-	sys-libs/readline:=
-
-	eds? ( >=gnome-extra/evolution-data-server-3.8.1:= )
-	socialweb? ( >=net-libs/libsocialweb-0.25.20 )
-	telepathy? ( >=net-libs/telepathy-glib-0.19 )
-	tracker? ( >=app-misc/tracker-0.16:= )
-	zeitgeist? ( >=dev-libs/libzeitgeist-0.3.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)
-		eds? ( >=gnome-extra/evolution-data-server-3.8.1:=[vala] )
-		telepathy? ( >=net-libs/telepathy-glib-0.19[vala] ) )
-"
-# the inspect tool requires --enable-vala
-REQUIRED_USE="utils? ( vala )"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Rebuilding docs needs valadoc, which has no release
-	gnome2_src_configure \
-		$(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 vala) \
-		$(use_enable test tests) \
-		$(use_enable zeitgeist) \
-		--enable-import-tool \
-		--disable-docs \
-		--disable-fatal-warnings
-}
-
-src_test() {
-	dbus-launch Xemake check
-}
diff --git a/dev-libs/folks/folks-0.9.3.ebuild b/dev-libs/folks/folks-0.9.3.ebuild
index f8c223a8f53c..f4a3d01465e6 100644
--- a/dev-libs/folks/folks-0.9.3.ebuild
+++ b/dev-libs/folks/folks-0.9.3.ebuild
@@ -1,6 +1,6 @@
 # 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.3.ebuild,v 1.1 2013/08/02 20:39:16 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/folks/folks-0.9.3.ebuild,v 1.2 2013/08/09 08:31:45 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -16,11 +16,11 @@ 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 zeitgeist"
-# the inspect tool requires --enable-vala
-REQUIRED_USE="utils? ( vala )"
+# Vala isn't really optional, https://bugzilla.gnome.org/show_bug.cgi?id=701099
+IUSE="eds socialweb +telepathy test tracker utils zeitgeist"
 
 COMMON_DEPEND="
+	$(vala_depend)
 	>=dev-libs/glib-2.32:2
 	dev-libs/dbus-glib
 	>=dev-libs/libgee-0.10:0.8[introspection]
@@ -28,9 +28,9 @@ COMMON_DEPEND="
 	sys-libs/ncurses:=
 	sys-libs/readline:=
 
-	eds? ( >=gnome-extra/evolution-data-server-3.8.1:= )
+	eds? ( >=gnome-extra/evolution-data-server-3.8.1:=[vala] )
 	socialweb? ( >=net-libs/libsocialweb-0.25.20 )
-	telepathy? ( >=net-libs/telepathy-glib-0.19 )
+	telepathy? ( >=net-libs/telepathy-glib-0.19[vala] )
 	tracker? ( >=app-misc/tracker-0.16:= )
 	zeitgeist? ( >=gnome-extra/zeitgeist-0.9.14 )
 "
@@ -49,14 +49,13 @@ DEPEND="${COMMON_DEPEND}
 
 	socialweb? ( >=net-libs/libsocialweb-0.25.15[vala] )
 	test? ( sys-apps/dbus )
-	vala? (
-		$(vala_depend)
-		eds? ( >=gnome-extra/evolution-data-server-3.8.1:=[vala] )
-		telepathy? ( >=net-libs/telepathy-glib-0.19[vala] ) )
 "
 
 src_prepare() {
-	use vala && vala_src_prepare
+	# Regenerate C files until folks-0.9.4 lands the tree, bug #479600
+	touch backends/telepathy/lib/tpf-persona.vala || die
+
+	vala_src_prepare
 	gnome2_src_prepare
 }
 
@@ -69,9 +68,9 @@ src_configure() {
 		$(use_enable telepathy telepathy-backend) \
 		$(use_enable tracker tracker-backend) \
 		$(use_enable utils inspect-tool) \
-		$(use_enable vala) \
 		$(use_enable test tests) \
 		$(use_enable zeitgeist) \
+		--enable-vala \
 		--enable-import-tool \
 		--disable-docs \
 		--disable-fatal-warnings