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

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x8009D6F070EB7916

4 files changed, 28 insertions, 9 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/Manifest b/gnome-extra/zeitgeist/Manifest
index 1277f9aae7c8..88d41ac02449 100644
--- a/gnome-extra/zeitgeist/Manifest
+++ b/gnome-extra/zeitgeist/Manifest
@@ -2,16 +2,17 @@
 Hash: SHA512
 
 AUX zeitgeist-0.9.0-doc.patch 345 SHA256 5658e76e9219c41d74b3dcf68dcad6b7eb4b5629a37ef1690fc10fe208796fb5 SHA512 3d24a3b53d4bb91bc4ee7cbbeede1de0814cc7ea5841db509c3af30ebd3952631e0b450b3e93d8fcf4272a64f91df24459e14e66fce27b4e19dccaf4b882ca58 WHIRLPOOL b13ef59620dfbce1bb25b66998304e7aa37f2e9095ec64046f3a8273b1a4e3e5ea5832bd19bda83209598f40b0ab43705023172af825f581b695a47ddd071ac1
+AUX zeitgeist-0.9.12-download_monitor.patch 588 SHA256 a594bc4ff7714c951d05d9cfadb6e0dc553f64460ff0e9d6172c0362f0e2488b SHA512 ff2dc1c7938b09156a763d453f60b4dba0b571982b4233ca56dabbdddb68b004eacb3ff7e071aeb5f868e45de51011ff35970a9550a701d4572b47c9af997b4f WHIRLPOOL f8d2f0ac7411f6b824e20264d5136de2c17f581e2c4070201287585009a843dd79794ff984fb291df04ae167ccb02ede707eed59adcd8c472865890e2ac95b52
 DIST zeitgeist-0.9.12.tar.xz 780456 SHA256 f9b1b656dcd4da57438289316d44f8960ce0ee4773ea2fbab4bce165330f41cd SHA512 cb68a1e9bf87ea84b90e8a4593e054c977d138ead796b4e8f1801a14efbe499e0e6bc3fea841c35630961194c2db71b89271ab4807da26296dcff612a78151e4 WHIRLPOOL bb9484393766ece5bbf42e8c1a9ad52b78a7084c791dd6b219c52ae7e824518ab987a9e47450f6d3ec41ee57b86ae04826b8465bd459dc26d6eef8c8fc4c682d
 DIST zeitgeist-0.9.5.tar.bz2 856757 SHA256 e5ccb75ff705bfb382750c520c29653b6e0f40aeacd30adf233162132114be55 SHA512 26fc041721a9ba99875db7f5bd3cdf91555a3006d0f82186a95b269462334e53f58284d988f0fb9ae39b11679ba08a2992625d3646f697762005803069f1b7ab WHIRLPOOL a5d28119e88eb4d7b93eeb6cf7232c5dc1402560702016d45d3b4587d8224b0bc21e767d89ea2ed6847c0971c97a6db29d20afe640be50d1407fcce8ad3e5568
-EBUILD zeitgeist-0.9.12.ebuild 2080 SHA256 8ec0c9c6ee0d3003490fe15e43292db8e41cbf6e4efc6b241bd0f78ab70fa13b SHA512 82486cc7d1bd73bd4e20daa817f54008925243ae42bb6f47059da200b3e897ea53d2ca3071a5e8abe592f5a8defafd7316fcb5a8d58edbe179f1a992c795a5e1 WHIRLPOOL 6bf8969513f3163cda76f2afc396fa6db3f8ba818d2e641bc6bf2763a3987aaebccd261c2bba95745749205f144948d82e0e5c88dcb1bd939b82d5bcf3673b37
+EBUILD zeitgeist-0.9.12.ebuild 2160 SHA256 8e965f3abe4d522f9ca77e0b4fe7fec77165adc5160fa62ff05bd25091d711e6 SHA512 34255d20582a5ca254ab48b505467c861dec46723778c4d2b4f303c878295c8d241a1e677ef041c98bd49a4cf9c5e74357909ce80aaaa375beb84d974c59b2ac WHIRLPOOL 9225e864ce06d109dacd1446618ff06f6b034482350bae276f92c5f51001df391d491efc0af5b4e0df7b30a1eb074179c2532195440806224f9b52df5a2d1131
 EBUILD zeitgeist-0.9.5-r1.ebuild 1877 SHA256 1a5e5a022ada0aac4448fa1bd049e35385824a69f9e83e1efb7d0cbd4bafc07a SHA512 f0d3e067e7776e07a6221b155fdaf28551d3281d9ef95b2ab569bdc57fc56f27c9e95c616b91157641787bf86c8e6a9011488553752d4b1b4cfc4c153734ef41 WHIRLPOOL ba684984c5f7ae3aea9c82bb6d5d5734de6946fee1a75b98166b98e9b1033c8389cf9fb7a60f9370462a860c2f70d88025fc3c62d88121191d66736acb0256d4
-MISC ChangeLog 4631 SHA256 b1fd2b2d15406a309e96de15cae81b3ee148757077d41f92862fc59f4b42a025 SHA512 a9db6024cf41752d395303c30bb72ac0bd5c56991e839b8216a17a5aa3b535ecd71ab1667734ddea81762cf5741c6139a795fb6a6b76f9a589b6210a6d763313 WHIRLPOOL 577fb59d262046ef74ee7666672cfea907e79b91ecb4a1d7c50549057d655fed12550a4d6d2e8071d8c774c6840af8111839cb96abb3b54213e7edd4ee0f5274
+MISC ChangeLog 4878 SHA256 c63178d3488e2fabff573a432ab89b793436078fdb0555a186c23400d94ca2bb SHA512 e170f7ac9eb6800301049b9abddd33a2b29f4fc94fd7625ba48bf73193d14fca23bfda2dbda636acfb3193bfb4c25be030f9d49adbca83956ce35ccab8a993a9 WHIRLPOOL 0db7b6910608fd01ff75b1d3d2e19245900c36f202616335d5cb6f00de0b9e5860a2643c959be250d2750cfa59a0823b38ce4312214cd1c314efb556f573ea39
 MISC metadata.xml 1174 SHA256 6af9e5c28e714e9a190a5f9ee2d23a1f8c8b4c41ef478e87e9628b05ff9870f9 SHA512 71e83f27c95d09e0e19417197af76e4a3eccf8fec318bfc85e98ecdc4ca07ec657fc63e9f64bae87cdcb3627644aaf261a0bda5bacc789a518ee6ba13f333fae WHIRLPOOL 61bf7888dacffdaf68064b57f045dfe11934a8461a989c05d3e03629256a21299d14bb782aa1fca460f3618dbfac041fc283e5894071ca5198424ef1785eeb92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAlF2Ir4ACgkQgAnW8HDreRa/bACg0sv0wQf7GmlKItRlnLwg6dih
-O0YAoJOfG1jktzRfFGWchaz7V62mMGDa
-=2BFU
+iEYEAREKAAYFAlF2TAYACgkQgAnW8HDreRa7HwCfV8wJmb1otI6xWOoX6NJaQ+IQ
+/x0An16odkIbKM0ajvm5YKCxpmwBrCte
+=IMSO
 -----END PGP SIGNATURE-----
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