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

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

7 files changed, 156 insertions, 44 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/Manifest b/dev-libs/folks/Manifest
index 7481fdd25ddc..86fcd8d6bb70 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,6 +1,9 @@
 -----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.6.9.tar.xz 1432864 SHA256 cb14657f581e3d4b50884ac099ab13c7f9949c99f95806d1b8ad865345d26540 SHA512 b7d45d2a989c545540076daafbe0d87ffc1f9faba3336df838d11f1323ba1505f5b715fee949e99cff4a21ed69673e3e43e0093ddf990ac51ed6a51b3e72918d WHIRLPOOL bfe39900859710b6f54ee676bd406bc9bb4aaa1438d92a079fe1286d680d35f90ebf61f4e994dae86c36bbdc7e3e179aef59e37c2ed38050363d709dcde784dd
 DIST folks-0.8.0.tar.xz 1477836 SHA256 8c56c7594dd502ef5877e93181136e41f4ea03de4971372a7a04e7f1492eed9d SHA512 0e6c1adb84ff248a0a5e93ab631ba791b493fbcc60d9f34acc6f96132fa23c8a81a84a322ae8fc8168f3dd2769f8dc944979ba03b6ec529d2ed9d12c520e89ba WHIRLPOOL 379c1a4c202bcf3550c46c67eb3b6af3171e0e58ce9639dce13b5f52154d8f002e603a23a11a7cfe601f0ea82cbb7fa8702db467be2d159c3d3694c39261ed4c
@@ -8,13 +11,13 @@ DIST folks-0.9.1.tar.xz 1570912 SHA256 102b1867355d16e73a837871a058dda13c74fa385
 EBUILD folks-0.4.3.ebuild 1288 SHA256 02aadbe51e26787affc20d3cf75c638f92be6e83b10ab11cca23e1a067b9346b SHA512 6bd5ab2ba271e077c15da693b29289b60011b947c4f8237901fe3171228066bda61a375fba7b08d9c24c14ef5190dcec6095e3731c7dd828af92437bfd7beeb3 WHIRLPOOL c11b44ab4c9bf5817b5cdc72a0e9a25133091e86139351f5ff017e4b0c0c3b2007b07810092222d117bc73f201dccc51bd27d05efe56554a0d8ae5aa55c06e94
 EBUILD folks-0.6.9.ebuild 2310 SHA256 e9e27473c5061fc941d987c87e2ed67b705f66a07b764324d575b4f3bd734f3d SHA512 a88de07d1f9d93175e8e3560a73b915de125d8e2f2f0d49b2057632f1efd061208f03c9e0485e8ce748d2051a11862a3838478f2f607021ee4a547dc255419d8 WHIRLPOOL 49dd441768139a1b12b1d8059f79efdb5cccd0d2f6ae39a06a2483adb23856484f532b7101ca3cd67ca500d831fafa5fa4d1a38067dcc998ad79a4a691a301a5
 EBUILD folks-0.8.0.ebuild 2597 SHA256 7f7b1cf6cca236a9a087d5e65e7f32e979b6144c6e2c92703a4cc0faa2d31695 SHA512 4ce9920dc68cbf4e9cae754ebff8c678573493eae1201474f968b3027402891d22d31e59d7261129def9594e559b70f492e62346751450b0f543ad491872809e WHIRLPOOL 7585456d73537d78e4b16c7ea36cc0b96212a8dac398d9bdf8b35b5004196d773e9a5153ff6e1b49fbd5855412b6068dfeffbe937ed85f56773240fe75eda271
-EBUILD folks-0.9.1.ebuild 2583 SHA256 02f4f08e7a37e04a37823323c14d22b05721cb48524d953de8f864c056f85573 SHA512 06a08bdbc888632c672d9cdfd3454e8025a2ff2fce58e5b1399e36b8e981c576b25aa946cae1b4119cb26d8de8d8bdf6a25285a241cc48f4ab6974c719c27d2f WHIRLPOOL 3c5baad2b1e093f87e3c971ecb2261aad6e091618c8261c904c86d27323b35f724326fe99f697281c67927a1e1c6ff9ae672968dd480efbd3192a6e85d2e0289
-MISC ChangeLog 3926 SHA256 b586af7da196ac791305f027fe809377dfff5a761912490e31987fefb96f6e69 SHA512 d299c1df08c47d2ddd65a527082a8f8203adf25949b8f39786537ab59bf9c61ad84c5633677e134bbb5f20cca39f812158c6d1abd38c95a4ec332a6e325aafaf WHIRLPOOL bf182ad992ea5f0cfdad1e585a7fbf4fe411344860d58a855d4d269ded1250d5e3f3eff8c99c2d2057e9481a326019d9706e689af48c142c37fa0e093aaf7443
-MISC metadata.xml 585 SHA256 ab846163d5ffe32822652670ca9ef266fb519037c32a94219427b4113d53e45f SHA512 6c8c66cc9b996b56c9f2a57ab69126b21eafb1cf098d8bb075335694106dc02ef72bb2c664494368324ca67eb6cb1e32f64986e842876ae309739caf3bb08a5a WHIRLPOOL 0b99db070f6a4348b196628995c46ccd62b3322a417675268e0afaf9af87de7caef5350f9a557f01fd6a0dcf16af73a40e7a6603bbc6b50e8f18c9ac5d2909b7
+EBUILD folks-0.9.1.ebuild 2513 SHA256 2eb3d36d7e763cd34a56d8a69fcd96be222ffcad16db49ccd5636e988a3d1597 SHA512 5ed56bcc73ef403849b335fb799a57a66de26ff76224f76e832743aeb88e7bf5814b8f2656108a3dd7da4ad3effb29ec2984ca44f7e69728b0b87576e5b08e03 WHIRLPOOL 9033a78fbd167baf8caa7997e4b1eabc5bec359388f9a1e21c962d23d63a99be3d0560bfd465e2416cd3d20454c56f9ed5c804231da152e404b11ddc010784f5
+MISC ChangeLog 4229 SHA256 0e8e4da8954892494bb209a9c9466720acfa6d5e504496d37f3d7671fb304abe SHA512 c3aedee3e60024892bcf691776e9197712a591df54ddc269adae6a90d2399aa48b3683fc762a696fdaf389e9d5f6fd97db961cf2560cadddfc5de3fb3129e8a5 WHIRLPOOL 18e0b790bdb015256d60056295b56ba87215cf5ad854f63294a4f55e41319be8671ece01d17a94f26c20e6f5b63bec10551ac226dd06a533a7216d902dd85d41
+MISC metadata.xml 636 SHA256 20d8ab0e35f35e6d91d1b8cdc1b3c3d47a1f150cf5ea54512ce88d035604e6d4 SHA512 589e36d5ff423f04e561762f7c3ff240c5953b777ceab6f51ce0f3b6f130f172c687c538dca90575b22e71174ef4634338afd6a2ba9e71dd5ff1503775a828d9 WHIRLPOOL 1186c45e28c71076fd2faf927d4cade2d6d828486eef1791f366fcb7ed87f76bee2384028126c0ca1c493c7396cf526652e19e7e5d584dd08bff66c1ab62ecd6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFUzUUACgkQCaWpQKGI+9TUdACeLD41UHTgE212jeX2oJveMoZk
-ajYAn3sQSXdw0EsurCSMrMYQ+dik1HQd
-=cZze
+iEYEAREIAAYFAlGX058ACgkQCaWpQKGI+9RNvQCfV5gJBBJ8yMQpsO361dyx3W0E
+vVYAnRuDwQzlhYsDWuQnE6imvaa+tNqv
+=rgWS
 -----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
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>