Fix build without zeitgeist support, #403345

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

5 files changed, 37 insertions, 26 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() {
diff --git a/gnome-extra/zeitgeist/Manifest b/gnome-extra/zeitgeist/Manifest
index 5ef5e2a14fb2..9368c0898dd2 100644
--- a/gnome-extra/zeitgeist/Manifest
+++ b/gnome-extra/zeitgeist/Manifest
@@ -6,20 +6,19 @@ AUX zeitgeist-0.7.1-no-rdfpipe.patch 458 RMD160 7738c462c8df2a8d4c82c015628a04dd
 DIST zeitgeist-0.7.1.tar.gz 336349 RMD160 64ebbeddf26fee33e1b12baa1ac5b7c1095050f5 SHA1 04609887358906112ab5eb8e5770209b724ebcd1 SHA256 3bd454d950bf5a174b2f67d9425aa5e781e9fed759c4ea2a9a94e07ce11859a8
 DIST zeitgeist-0.7.tar.gz 337909 RMD160 bbdee7ff27520af88c465b54050dd809d39f3ce0 SHA1 31ab2b08e27ccc0846f051b87b37b7981176f9e6 SHA256 cc1f3626fdb7f1c4a8c4f08ede98c4414954ff048326c4b3e8584c32135d902a
 DIST zeitgeist-0.8.2.tar.gz 358781 RMD160 2277456ecb9c6947772064abf872de6c1e428c1f SHA1 bfeff11029673d235e4f6e2e9be00dff8f434a50 SHA256 6155611ee182f642cc1fe9f8aadc25c7e2942fdef2565b1f29e8388bc4643703
-DIST zeitgeist-extensions-0.0.13.tar.gz 30700 RMD160 d6b03b7a8fc9cae81831b3e4c2e4b21d45dbcbcf SHA1 01cb6a4b0b3e46cbd8630ec340ce35bd605dac3c SHA256 c8a93b419c7f81fad2dcda2aa40ae4a610432b971d7deca20bcd1451bd841d65
 DIST zeitgeist-extensions-0.0.6.tar.gz 27628 RMD160 9c624094f274765ba95c1bc715d7f79a1c86adff SHA1 f39d17c848d0aa12e2ab1ea920e78a33b629f54e SHA256 6b9a2414daa27114f4bff29d54685c49cb49cb46feac50af1f8f4d0598968bd5
 DIST zeitgeist-extensions-0.0.7.tar.gz 28273 RMD160 5522894a3afc49261818bd8ee0bf0fc9311ee538 SHA1 57c2282315c6ed20b8a4fbc4aef3ebc549493c6c SHA256 097c62331822950818241cfd7a5ae4aa2c9f5ce51874f38cd16c8f06b1198fad
 EBUILD zeitgeist-0.7.1-r1.ebuild 1232 RMD160 54cee0662ed96a2ce16862372fd0b2e8a37f550a SHA1 e706e85dfb1a943e2117c208fc85c4489d9cb300 SHA256 e1a422d3aa8d0c4c157b867fc3c2776c6b3a6a55dab7b3f81f9dddac19b69da6
 EBUILD zeitgeist-0.7.1-r2.ebuild 1270 RMD160 a771138adfc42019ee345a781fe91ebbe735b2e1 SHA1 477115f2741c11e73aef864f8d0de08d64f83128 SHA256 3cf6388642884c2762b10ab259a5d7e758db4ece9043adbec41583c8e60b66ec
 EBUILD zeitgeist-0.7.1.ebuild 1229 RMD160 4f4041d2f8bfe6dd23f2c6645206176267703f0f SHA1 acb3d11bfa4395d39121efcdbfe6ddf7d267169f SHA256 e29c497e71bee8294ed05ff675b85c0c465c225e19e7da283a431fee2b828d9d
 EBUILD zeitgeist-0.7.ebuild 1168 RMD160 f75b8288e89c8fe70a8cbabc951eac23f12bb57b SHA1 b5379aa081ecbf73fbca87307dd5993d5d252c44 SHA256 17f1c75d7b7bf29ac7ec1870f2ca178fd770aece2166727b0732ecd36da93ea2
-EBUILD zeitgeist-0.8.2.ebuild 1284 RMD160 a360f876db757be0410c64157ea8bec367184b52 SHA1 0715d7775056d94711e2e8729b0f7bc8a5b9235a SHA256 2f156677a63c117f7ecb35dd1a6aca1e6e0921650852a541de18a473572b5bd3
-MISC ChangeLog 1436 RMD160 456ffb3fca8a8e5738b771648d47d369377aba8a SHA1 5900786ef4e53feb980733bc87804b0cc4680380 SHA256 563a5dec54abc27143974ed96db5946a5e6a4d4fb9235b50c19b2eba8ff5706a
-MISC metadata.xml 307 RMD160 d2aca905d3c4da21a23fa2484509d7fd904dcaeb SHA1 8f159a63da423d6d46180464fa146e2d43af5476 SHA256 72f0f76e80a4c08896741c65d9bde2bd75439fbf3e35d8ff843aadbebf07aba4
+EBUILD zeitgeist-0.8.2.ebuild 1311 RMD160 4ea1cce6044640b7b7e77239ed4c0a39855cca62 SHA1 d632bc4cf28826f1412ba454bc2efa6dac50bb85 SHA256 41454ba374feece58018ca9a367a80cd87a33e1c21a2b0e3e55438268218473a
+MISC ChangeLog 1616 RMD160 0808b059e0281b6c0f89cad6e180329cf0c0c5ce SHA1 e48d85481ac1a09e81215994ccafbc255b5107b5 SHA256 5b2e7270c88059e254a08ebd550c3ec4d47da40499a276fcc670654d8618a33e
+MISC metadata.xml 872 RMD160 d1a3926544e9398f7188b0b0cc81a4441be8fb1a SHA1 e1f6c41aa87f62cbc51d3a609775f17c89247ee1 SHA256 bb7e0a30bcc9a6c7ab2d189ea638e2e8aa50d6821730961a4ec16bacf83fbdd1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk8oHhcACgkQgAnW8HDreRbyIwCgqZXB8AFNiiYS3krDUpWAAPX0
-JycAn0U8S3DSkK+OLkvkdKRrxwlRKY5P
-=3YF2
+iEYEAREKAAYFAk87/ssACgkQgAnW8HDreRbkxgCeL/gVERP0dXtZx/oBJ2FeX4oB
+BWMAnjyPiD+SRSjwZ2hJQZNt1W8CITHB
+=SyNf
 -----END PGP SIGNATURE-----