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

(Portage version: 2.1.13.6/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

7 files changed, 20 insertions, 283 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/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