Fix build without zeitgeist support, #403345

Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64

4 files changed, 31 insertions, 19 deletions

diff --git a/gnome-extra/synapse/ChangeLog b/gnome-extra/synapse/ChangeLog
index 2a152878a68a..55442c793e6a 100644
--- a/gnome-extra/synapse/ChangeLog
+++ b/gnome-extra/synapse/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/synapse
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/synapse/ChangeLog,v 1.12 2012/02/14 19:35:20 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/synapse/ChangeLog,v 1.13 2012/02/15 18:47:58 jlec Exp $
+
+  15 Feb 2012; Justin Lecher <jlec@gentoo.org> synapse-0.2.8.2.ebuild,
+  +files/synapse-0.2.8.2-zeitgeist.patch:
+  Fix build without zeitgeist support, #403345
 
   14 Feb 2012; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   ayatana is now global per http://archives.gentoo.org/gentoo-
diff --git a/gnome-extra/synapse/Manifest b/gnome-extra/synapse/Manifest
index 05ef30381de8..d9e69afb4412 100644
--- a/gnome-extra/synapse/Manifest
+++ b/gnome-extra/synapse/Manifest
@@ -2,28 +2,19 @@
 Hash: SHA512
 
 AUX synapse-0.2.8.2-underlinking.patch 500 RMD160 3ecc6f9930380ff9c5ddfa3543cca5190c212bd9 SHA1 a34f0137e37393cbb644c0397c9cd31d392a3b66 SHA256 c3fb265de9f640800165626045acf7b261f9b03c35e3244a0b1126c19b96411e
+AUX synapse-0.2.8.2-zeitgeist.patch 403 RMD160 b7eed120ae9db74642240a6ed56f77bfe5347223 SHA1 6e504cb39c9e62ea2787a1a0f2c7307c7de072a2 SHA256 b8be4e98e68cd50b92420a082c9288163db69a05dc33b44a7340bef6d75d1643
 DIST synapse-0.2.4.tar.gz 882201 RMD160 966bfe4e79e9b30a3dcf503b34ff30eebeb874e4 SHA1 a48466f8f14a7e3c4b588db1313972dd14f22c2e SHA256 55cf2c2c27404d6cbc72a658dff7c7ee90412033778dcc7d9c5713a175c4b93f
 DIST synapse-0.2.6.tar.gz 550501 RMD160 0a8e6c33a1265e3af53de31311fd39ad9a326936 SHA1 a503276579e73945ab59d8f4c2e42a1916e5fcaf SHA256 3af33207a559c6ce34a51f89e964da5aad6170bf3c5193d4aa0d78e874ee3ab1
 DIST synapse-0.2.8.2.tar.gz 613741 RMD160 3685a4d284df21131e08f3beb79e244c9ba26887 SHA1 3d3f6329f8da1c9e787771844e7aa3d5a3fd5f02 SHA256 3a3d77fdbe15db85fd0589fff916f65bd67f8e2c33c74b5862dc6a71c720b92d
 EBUILD synapse-0.2.4.ebuild 1154 RMD160 76facae7a3f3bc66525cb6861b0fe290a0ffe3b8 SHA1 d023e5af2837e35372600f029bd0d6bf5f36c6b8 SHA256 ca90472c88861ba2b45a49b3ba17beee964bbecdf1adb7194063158ea94a3e86
 EBUILD synapse-0.2.6.ebuild 1154 RMD160 bf84ec6dfa56dc87fb6ca49edbb738dff7b08c35 SHA1 65bd1a291330b0f086b96b0b5eadaee41c5ee136 SHA256 7296f1d391fa04e4b44ddff4e1a4b6696a65ac0ac797f06772f417b8eac7211b
-EBUILD synapse-0.2.8.2.ebuild 1590 RMD160 c1f9848fa7d845243346700653270267f69196bc SHA1 7ca2de0a4daf7f8c9493a236c61a1f177f5b391b SHA256 3e2ad8bfde6da95f75f457bf9a5cf6189ad45f6b7099a98cc98b151562972bcb
-MISC ChangeLog 2044 RMD160 0ae9c62df6889a1874668e861224abf5af5def4b SHA1 12352ac58a6cb0680362e14d119184c9beebf69a SHA256 88c8c0b5ca215f1591fa8dbf0319c950a593542aa9fd3be9fab6631df2e5cefd
+EBUILD synapse-0.2.8.2.ebuild 1650 RMD160 2cbe17c5e358bde0d3bd81f2af17edd57b91651b SHA1 7eeef64aae85a70f5f7f4e6cc852564b01c470b3 SHA256 0b975e647f631111c2829326b70d6f9757cf3196ea288ba2230a52971cbc7a76
+MISC ChangeLog 2201 RMD160 ac01ea63ef22137bc930a81f1499bb03d7ede62b SHA1 ebe6fef5324f7e03fdcdb1ce09e2ee7909eefafa SHA256 22c3f524d5e7eb476adba17e172a9ae4f8d2d75ec7c42227884083086249f52a
 MISC metadata.xml 393 RMD160 3b18c20c1097db6a8006a4150faeea12a525a658 SHA1 8d7a0407b7941f88ebcc48060b0c8437d14b2202 SHA256 b8bc88473e1d462a9eaf90e9aa912107be00501b1919bb5d0382b6d8690e2e8c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPOrd4AAoJEPqDWhW0r/LCLPQP/37ff7NNncdznq6ZkzDLPtSl
-pKJYs4FCBNrgX0wOgPLpJoV78l4YbOX3tynOLnKRzNr4tHg5hKLQWCvYY9SEmCAn
-vV6lXDxFNCIDo6roJzIYm/kw5LWiENmnofccHrT+jkEt76MwYqUPKo4swm18NLZT
-tJB0k6nZnflzgDHez+Yb7dBdvNwjtiJasNXftOoNhnh38PWm6EPOQfujQ0qtM2iv
-ErBBaueQVLoiV79k8ZkF6+Azck3r/k9fSUL6LiCXgiyfGvYizoOAladgoPDbyyxF
-6L9cUW+BwVOOcMdB6RscNE4x6amzbPXE4cuBrQWu3S2tXcnZm+wrbFC105w71V9A
-jKytt/TveJBu+Cn9KE+tl5pfwX8iCJO3/wvhf5XTYAtSD8tCdbkMrMPGQ7iGkdC3
-svPES6NXGHVVwW87cNyyL47Xr45i2znJcO42OOz6Z305TFbxL+SshRxRiVIZAHIH
-rE5cnZw1LEsF4DvdHIfEYZTZfydS6deFR8BMeQt55hgkRsHERbpq1cVbeconaMJT
-V2DeANXUBSq363ArVU9TlwFcefUbLgNupACzb+Z42fXDlKY6RemID54DCGnbBw/W
-lIu/vXyXF2B5gfvHLeuPc9t2flr6ZXAACwxHaQ2cril5aCeSfRqtk9CsCYj/QBAP
-xLZD/FlySyMziCXQEElq
-=cAbO
+iEYEAREKAAYFAk87/eMACgkQgAnW8HDreRZiTACgnGZkHy68w7+ahRkA99/hKiop
+YSsAn2F5b/orX238xVFEwmsblwjtegMD
+=bD14
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/synapse/files/synapse-0.2.8.2-zeitgeist.patch b/gnome-extra/synapse/files/synapse-0.2.8.2-zeitgeist.patch
new file mode 100644
index 000000000000..d2ccfca58a61
--- /dev/null
+++ b/gnome-extra/synapse/files/synapse-0.2.8.2-zeitgeist.patch
@@ -0,0 +1,15 @@
+ src/ui/Makefile.am |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
+index 3790ed2..c9df5a2 100644
+--- a/src/ui/Makefile.am
++++ b/src/ui/Makefile.am
+@@ -11,7 +11,6 @@ synapse_VALAFLAGS = \
+ 	--pkg gdk-x11-2.0 \
+ 	--pkg gio-2.0 \
+ 	--pkg gio-unix-2.0 \
+-	--pkg zeitgeist-1.0 \
+ 	--pkg gee-1.0 \
+ 	--pkg json-glib-1.0 \
+ 	--pkg unique-1.0 \
diff --git a/gnome-extra/synapse/synapse-0.2.8.2.ebuild b/gnome-extra/synapse/synapse-0.2.8.2.ebuild
index ec9a3f2fbda1..ff28200c62a8 100644
--- a/gnome-extra/synapse/synapse-0.2.8.2.ebuild
+++ b/gnome-extra/synapse/synapse-0.2.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/synapse/synapse-0.2.8.2.ebuild,v 1.4 2012/02/12 18:18:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/synapse/synapse-0.2.8.2.ebuild,v 1.5 2012/02/15 18:47:58 jlec Exp $
 
 EAPI=4
 
@@ -36,14 +36,16 @@ RDEPEND="
 	plugins? ( net-libs/rest )
 	zeitgeist? (
 		dev-libs/libzeitgeist
-		gnome-extra/zeitgeist[fts]
+		gnome-extra/zeitgeist
+		gnome-extra/zeitgeist-extensions[fts]
 		)"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	dev-util/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/synapse-0.2.8.2-underlinking.patch
+	"${FILESDIR}"/${P}-underlinking.patch
+	"${FILESDIR}"/${P}-zeitgeist.patch
 	)
 
 pkg_preinst() {