gnome-extra/zeitgeist: Fix buildsystem to correctly handle --enable-downloads-monitor, thanks evgenn for the patch; correct REQUIRED_USE logic

(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 8009D6F070EB7916)

3 files changed, 22 insertions, 4 deletions

diff --git a/gnome-extra/zeitgeist/ChangeLog b/gnome-extra/zeitgeist/ChangeLog
index b4db6c93cc7f..6eacb768355b 100644
--- a/gnome-extra/zeitgeist/ChangeLog
+++ b/gnome-extra/zeitgeist/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/zeitgeist
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist/ChangeLog,v 1.28 2013/04/23 05:57:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist/ChangeLog,v 1.29 2013/04/23 08:53:25 jlec Exp $
+
+  23 Apr 2013; Justin Lecher <jlec@gentoo.org> zeitgeist-0.9.12.ebuild,
+  +files/zeitgeist-0.9.12-download_monitor.patch:
+  Fix buildsystem to correctly handle --enable-downloads-monitor, thanks evgenn
+  for the patch; correct REQUIRED_USE logic
 
   23 Apr 2013; Justin Lecher <jlec@gentoo.org> zeitgeist-0.9.12.ebuild:
   Fix typo, #466704
diff --git a/gnome-extra/zeitgeist/files/zeitgeist-0.9.12-download_monitor.patch b/gnome-extra/zeitgeist/files/zeitgeist-0.9.12-download_monitor.patch
new file mode 100644
index 000000000000..6eea705c1414
--- /dev/null
+++ b/gnome-extra/zeitgeist/files/zeitgeist-0.9.12-download_monitor.patch
@@ -0,0 +1,11 @@
+--- zeitgeist-0.9.12/configure.ac	2013-04-13 10:09:15.000000000 +0200
++++ zeitgeist-0.9.12_mod/configure.ac	2013-04-22 21:14:47.604406313 +0200
+@@ -189,6 +189,8 @@
+ 
+ if test "x$enable_downloads_monitor" = "xyes" -a "x$enable_datahub" = "xyes"; then
+     AC_DEFINE([DOWNLOADS_MONITOR_ENABLED], [1], [Is the XDG_DOWNLOAD_DIRECTORY file monitor enabled?])
++else
++    AC_DEFINE([DOWNLOADS_MONITOR_ENABLED], [0], [Is the XDG_DOWNLOAD_DIRECTORY file monitor enabled?])
+ fi
+ AM_CONDITIONAL(DOWNLOADS_MONITOR_ENABLED, test "x$enable_downloads_monitor" = "xyes" -a "x$enable_datahub" = "xyes")
+ 
diff --git a/gnome-extra/zeitgeist/zeitgeist-0.9.12.ebuild b/gnome-extra/zeitgeist/zeitgeist-0.9.12.ebuild
index b56d931fbc8c..78b3fb6984a7 100644
--- a/gnome-extra/zeitgeist/zeitgeist-0.9.12.ebuild
+++ b/gnome-extra/zeitgeist/zeitgeist-0.9.12.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist/zeitgeist-0.9.12.ebuild,v 1.2 2013/04/23 05:57:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist/zeitgeist-0.9.12.ebuild,v 1.3 2013/04/23 08:53:25 jlec Exp $
 
 EAPI=5
 
 PYTHON_COMPAT=( python{2_6,2_7} )
-
+AUTOTOOLS_AUTORECONF=true
 VALA_MIN_API_VERSION=0.18
 
 inherit autotools-utils eutils python-r1 versionator vala
@@ -22,7 +22,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+datahub +dbus downloads-monitor extensions +fts icu introspection nls plugins sql-debug telepathy"
 
-REQUIRED_USE="datahub? ( downloads-monitor )"
+REQUIRED_USE="downloads-monitor? ( datahub )"
 
 RDEPEND="
 	!gnome-extra/zeitgeist-datahub
@@ -44,6 +44,8 @@ DEPEND="${RDEPEND}
 	${vala_depend}
 	virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/${P}-download_monitor.patch )
+
 src_prepare() {
 	vala_src_prepare
 	autotools-utils_src_prepare