Fix automagic dependency on zeitgeist (#466378 by Marinus Schraal and Maciej Piechotka).

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

6 files changed, 147 insertions, 38 deletions

diff --git a/dev-libs/folks/ChangeLog b/dev-libs/folks/ChangeLog
index a502b639eb65..9b4ba691c862 100644
--- a/dev-libs/folks/ChangeLog
+++ b/dev-libs/folks/ChangeLog
@@ -1,6 +1,13 @@
 # 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.27 2013/03/28 23:07:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/folks/ChangeLog,v 1.28 2013/05/18 19:16:46 pacho Exp $
+
+  18 May 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, metadata.xml:
+  Fix automagic dependency on zeitgeist (#466378 by Marinus Schraal and Maciej
+  Piechotka).
 
 *folks-0.9.1 (28 Mar 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
new file mode 100644
index 000000000000..180909367e48
--- /dev/null
+++ b/dev-libs/folks/files/folks-0.9.1-automagic-fix1.patch
@@ -0,0 +1,58 @@
+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
new file mode 100644
index 000000000000..970e05d01dc8
--- /dev/null
+++ b/dev-libs/folks/files/folks-0.9.1-automagic-fix2.patch
@@ -0,0 +1,21 @@
+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
new file mode 100644
index 000000000000..348284e2f1b9
--- /dev/null
+++ b/dev-libs/folks/files/folks-0.9.1-automagic-fix3.patch
@@ -0,0 +1,24 @@
+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
index 6f70c31aaeba..9f286665ed84 100644
--- a/dev-libs/folks/folks-0.9.1.ebuild
+++ b/dev-libs/folks/folks-0.9.1.ebuild
@@ -1,22 +1,22 @@
 # 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.1 2013/03/28 23:07:48 pacho Exp $
+# $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 eutils gnome2 vala virtualx
+inherit autotools eutils gnome2 vala virtualx
 
-DESCRIPTION="libfolks is a library that aggregates people from multiple sources"
-HOMEPAGE="http://telepathy.freedesktop.org/wiki/Folks"
+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"
+IUSE="eds socialweb +telepathy test tracker utils vala zeitgeist"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.32:2
@@ -28,10 +28,9 @@ COMMON_DEPEND="
 
 	eds? ( >=gnome-extra/evolution-data-server-3.7.90:= )
 	socialweb? ( >=net-libs/libsocialweb-0.25.20 )
-	telepathy? (
-		>=dev-libs/libzeitgeist-0.3.14:=
-		>=net-libs/telepathy-glib-0.19 )
+	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.
@@ -57,29 +56,30 @@ DEPEND="${COMMON_DEPEND}
 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})"
+	# Fix automagic dependency on zeitgeist, bug #466378
+	epatch "${FILESDIR}"/${P}-automagic-fix{1,2,3}.patch
 
-	# We don't need vala_src_prepare
+	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() {
-	# 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/metadata.xml b/dev-libs/folks/metadata.xml
index 2e2eb1cc3eb7..1742780aad9f 100644
--- a/dev-libs/folks/metadata.xml
+++ b/dev-libs/folks/metadata.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
-  <use>
-    <flag name="socialweb">Load web service contacts using
-    <pkg>net-libs/libsocialweb</pkg></flag>
-    <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>
-  </use>
+<herd>gnome</herd>
+<use>
+	<flag name="socialweb">Load web service contacts using <pkg>net-libs/libsocialweb</pkg></flag>
+	<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>