Block >=xapian-1.3 for notmuch, because half of tests fail with new xapian.

It rels bug #483988.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xF0134531E1DBFAB5

9 files changed, 43 insertions, 36 deletions

diff --git a/net-mail/notmuch/ChangeLog b/net-mail/notmuch/ChangeLog
index 65128a983423..6bf616bee5e6 100644
--- a/net-mail/notmuch/ChangeLog
+++ b/net-mail/notmuch/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/notmuch
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.75 2013/08/03 20:41:16 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.76 2013/09/06 13:06:27 aidecoe Exp $
+
+  06 Sep 2013; Amadeusz Żołnowski <aidecoe@gentoo.org>
+  notmuch-0.10.2-r3.ebuild, notmuch-0.11.1-r3.ebuild, notmuch-0.12.ebuild,
+  notmuch-0.13.1.ebuild, notmuch-0.14-r1.ebuild, notmuch-0.15.2.ebuild,
+  notmuch-0.16.ebuild:
+  Block >=xapian-1.3 for notmuch, because half of tests fail with new xapian.
+  It rels bug #483988.
 
 *notmuch-0.16 (03 Aug 2013)
 
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index c4800433ff15..6802d836e04e 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -18,23 +18,23 @@ DIST notmuch-0.13.1.tar.gz 483776 SHA256 cf909876551e3345941e1ed40f5ef851f34b78f
 DIST notmuch-0.14.tar.gz 488310 SHA256 095e191dc0f3125c4fd98440fdf55050cba01b8e9f68245ffe0190a7f39ca753 SHA512 64f277906c085cc391e9ae3283e38905d95a931b0223cc986ca213d2191aa810b5b0f3abdf5fed84f5d6c4e6baacca8ca02574e29cd13537be01ac00e2501ed0 WHIRLPOOL b924cc3a922c209c52ae18446b363b29e81e77cdde3e37c47a99647f1a66dc55daf77db57dc9c9acd0d9953a5456ba1e82014585205bcca869f9fc4d0bd99eb3
 DIST notmuch-0.15.2.tar.gz 560411 SHA256 a6e8af6382ab6df4a944bbffda9eb22639612c047b94632168b4270f2af59c0d SHA512 c31d147f7a3e464562c720f7884b51b14cee6d482e76a9d413be22493b62609301b50977d8727984f5c41ebf4f893d2607c03f4c51608a65aa843ef18e9e0fa6 WHIRLPOOL 827f94eb2eacc9d2b40effcb17e52a76a4716656b2a67ac7a3b8bc7ac924c421aa421541a45e3485851f3736a5e04a99965e32e267c856483d1af9bffb459b78
 DIST notmuch-0.16.tar.gz 588739 SHA256 e7792dec15be845c55ad265d06339325f03b9c886ab3836b7e80a6eb6841f344 SHA512 0b00abb32a340d25a6566b453ae086e13bd4f7f3c64a9dd827f0665733a1dc343c7df562282c4d9feb9ce7dff59f9c379daf599d6641156ace33c37f73974143 WHIRLPOOL 065452ead0bdc1f63b46419d7045fd798734e9d34a12e5673362f8302ae8b2d3eada3ca157eb55bcf9c0ec5f5fb3cf37b2ecdf5c9ab15e3a4590808fa0866213
-EBUILD notmuch-0.10.2-r3.ebuild 3237 SHA256 eb4a9abdce9e53171f02f3afdcfa7316cb695d36622391287893e7803b8829ce SHA512 c4c7b52147a1bf9b92ed58c44f343c34cf36f0d34d68c4fa87602c0cfefa4603e3ab8a099e5f3255ca43fbac9504d2b66655176bdf647ec30f3ee7a6faedd225 WHIRLPOOL 5784cee87ff9df214963f4e17d4de1634085e9be6357059708dc0a501a2a049f5708d7c34d711334d9632efc0355464df8d7196a34fa4acd2d3ed1f3d5fe06d1
-EBUILD notmuch-0.11.1-r3.ebuild 3021 SHA256 76528ebaaf30fe6abc773a2cce75203f48a4f88e297f90dcaa14b6b3db420041 SHA512 833565272c99a264a88a423e8efe305983141afa567aea2af50939f3addbfa5011d216f0741e37147644eb674ba47b36d308e13ae590f9967eae0dc338e8cbde WHIRLPOOL 9c5162ea6d8b086d09c2fdbf4ccc842c7d61ffc58665af894999c0e90d7e841c74f64660deda43a941360dfdda34dd5e9a7562b00432d7112a0db3e56229b405
-EBUILD notmuch-0.12.ebuild 2893 SHA256 ad73bd3f908e679351973923fc6005d2aeffb0cdc7866bf653d591a8d1ad271e SHA512 c594618b5a1673a872d0e865dcc4d694410ac244e580afbc1bef120c70ea7d4d1dd009d65be7a020704ad8888fd7571aa2d9b3cfac0a119f2442f7e36b950804 WHIRLPOOL d1a6290c2c64a9b39a10c0eb240a903de35a2bdad10a3031e643f71085380d2d5395f25ea8a1799aaa20a096e25e1210fd2f843053c7cfb59824b9df66be2095
-EBUILD notmuch-0.13.1.ebuild 3706 SHA256 0b61b587569fed19ef272083704737011ebde43df4ffe18bb69fc177a48e8b53 SHA512 dfbe04156255919d764f9e6a0bba07bfa53fe960791cec8ed20ad09300409aa9cb763a15914d3ee8a70749369a275a9365b197af06e178ac46fbc6f7c1af935e WHIRLPOOL 7d68ffff43a8af80a24db4ba179afba5388e6023ceca1639322b60441e2dfc5b5d3820a938a3a2f6135c3e04882de81d3927cc353f09f137ebe02cb6e56cd90f
-EBUILD notmuch-0.14-r1.ebuild 3756 SHA256 bc8b08b7a5718e08918dfba316c4ceb54841246ade4dde94ba64d756a19cd18a SHA512 c8fee7c5d8df3186343fa81c9513579fa40731c80dba3c45bf1e17161820eb151d5c4ab8c9f7df3c28f1b434a8b82d82087d195a49a9b9571daab974ced1bd05 WHIRLPOOL 10da69987400fafba84eafdba18f62cf08d407af7c879cb3ee9f6b19def40f984005469c967ef30558deb6d610c5941c4a1aaed5939bee6c7b0f1f0fdd70c4f3
-EBUILD notmuch-0.15.2.ebuild 4353 SHA256 74e534e1f773bc1792ee12bbac3fbd00f55342bbcba8be14c47b56c0f5696ee2 SHA512 017b5e4acf82652a09a9d3def92022a1a81e9a92434961a5170a8cdfbe0473d935b9da59fb32a5d04d095f61f2f3a5127ddea4dd7bb9ac29465ad35ae0e363ae WHIRLPOOL f21c7bce4ce58ce527598b04d79a578bb09d97290b2452456f0ffda95bb414bc0a72822c6e5b2713523472e901b77799c44a41981f8a3e007f074f9627522cf0
-EBUILD notmuch-0.16.ebuild 4065 SHA256 5e97df41352d4590d1297c2051c62d67cda16fda969fab07221654e75c42e039 SHA512 2858ae522c2651d60280e31aca9ba86e62a598f37bf99faed65095dfd76a4a7f29a52ebdd0b3e51ab839f460ccf3a3784983bd7c4df2d2f7073fc44190ef927f WHIRLPOOL 8d1bacc3d628cf250b801ef259bcf745f194818326b34d29910f45a3864899bd4819b9232baaad5f08837a1594435c9ef0b2fefe610af2cf8de97d4aecfbb4ba
-MISC ChangeLog 21216 SHA256 8e1d4c8779ca0e76603590a30c6fdc11a097830b5c6b7ac8391f8a8cbfaba059 SHA512 c7d518abedc2a677a2c0d043a5ebee4a10d9eaaf4adc4a85194aff3b5b8419fd5ee9151638cf09844128e4f8fbe8ab61dd5146e5d090c57331670a2bbb7ab524 WHIRLPOOL 477f3e5fb616761165d1aa9cb375539af9980f3189828c2ed7292449fd133f813e1bc737011f3f8986c542a1f045ecf73bc8cacbf3405b6ee3710f3c2b1e1cda
+EBUILD notmuch-0.10.2-r3.ebuild 3242 SHA256 0e42ef4102ae887f93734d2e79d22fe4e9c9b44ce83321a0447837f522375f56 SHA512 6f3e3798b07b85d4240afaff6df8e36a228e8f2a84b137752e6efc8ce2a200a1a05c0f9b510f26c3104ae38ce372fcf8e8885dd21f370a1c11594c8396e6ca97 WHIRLPOOL 3f84a896ce1386c8a9178a335429417d9b1a8c7cd4f687ab4228301b8a86b9f322a21a8438644dc8b1761f321f3e57ea01b5e7cd9a72b43a7790484a4f91acf0
+EBUILD notmuch-0.11.1-r3.ebuild 3026 SHA256 419ffc1d4048e8df3c0254ba52b23fed38e68f76c660717f5e022017bfc142f5 SHA512 a01afaa07072e96a634bbf53bdfb592c57d310321ed215ae5a97f127231822d8614194cc4b462b10f37ff43410d696a32f381e5b3608ee303807282e2cdf6ca6 WHIRLPOOL 471fb3ff36c95796ef9f9ad43a1c31afa1be03672bb23a92516ad98c9195b5bbafa0a82f87fc712a27eee2fb0a800f5e4797d3244dfb84a7a12ddc8a2ffff930
+EBUILD notmuch-0.12.ebuild 2898 SHA256 1feec7831846faa05c1887ff34ec426c65eb28e32f5a4e6c350f944f2b9e3b11 SHA512 96b9324635fb057d182820a4148586b84462ae1dab926db3cddf3f6227084e61fc5889c90dac35a6a5e7d42e500b7ab15aa4118ef414643fc173cb83d3b0e8a3 WHIRLPOOL c6a4843550a43ad4a9152f1354a08cc6d2d2987f55b06a795bb1d33df956609043914a9f89cf6d6bd77ac78094485de66dd7fc5e864a76688fbf8b46032f3086
+EBUILD notmuch-0.13.1.ebuild 3712 SHA256 c1502f70345569a769c721ea65c24a5534e59deb24573f0975da1a2665023410 SHA512 4df346e4c59d118ad1772c7967ba265af37b87c0c6bb94fc31d92945a2e0d9c16810c047a4e49bdf8e571477358abf7fedb89794fbe45e3585fd828e99a25285 WHIRLPOOL 183d9c8f61bd12fddd03789294e9802b3ca87abb986d3d1adf49e709ba1c4560aaaaa56207cb111b6a74d49efd6bdaff940f3ea491c9386e7d8527695750f7e3
+EBUILD notmuch-0.14-r1.ebuild 3765 SHA256 dfa92fc4d19a1707e8104d49d7858e62721a339cf7a3ef23449f819fde5d6133 SHA512 f6cd354513d6d3d8fa65ec6f153a90ecacf0ced19d39027b96d9972139cb39a80bffe72d8bef27623ae269fc56577c357a8a89ab70e6cfec5254716cd560174a WHIRLPOOL 490a8d8759f2bfbb839e401140c5a60ee32beeeada4b6755d76a95dff48eff0ed74d3caa115f06b491de194d362f854ed9230b8b17b4705bd38f33d35f340f56
+EBUILD notmuch-0.15.2.ebuild 4362 SHA256 7e7268d146a39f97c28b157281a3202fd4f8ad62b2ce674876545e00506b053b SHA512 88812049d08abc6d945cb4c7104d44e5bdec0b1856ef240a15d0f97043319419413690286adabac852f0625b344b6ea135c353cc7c13778d19c21e6e0b2162c4 WHIRLPOOL 4a3c27949811390adf60a234e6fad13295dc90cd28df7c072693d766300352815b0bf417c4518ceca4f2fc425d384bbe574540ed4ff74a10fe87ffca38c87e6d
+EBUILD notmuch-0.16.ebuild 4070 SHA256 b40c7407086cf65b0ca4a36f9843f671790e18549d2335e35270e3db9ecd44e0 SHA512 3ab821f80cebd03926af7446989f5086ac7e2b1a4eff90b6a2a4e0a26a3f597e6b108ee3e50c40089b8447322a6a8226ae1238383958b558d07c0c09a4eeea96 WHIRLPOOL 6506589cc6baa5892c9d3294ddf8a102fa23daa1001ff486e84b3af121b0b8981e8bfba412109aeb717a38fdc665617cdbce5c627bba74d390d87a73c7c56127
+MISC ChangeLog 21545 SHA256 edf983665fb9dff44b9b78c8a26174ea9d7bfc6aa12c0d3c7884ee933fcde999 SHA512 3122b73e25975a744f45337f63a60e69736648659c1dc3db09caeabd021ea9fd25e6f47a4ae8880b5898bc05689bc8bfe81efe82daaee33ba340a9321835c6b1 WHIRLPOOL 8df60a8702aa3914155c291de5d0c79200a4606240c9f6b1ea5e5483597072ab95ad1d0436fcefdd0703e53cfdf220d56af79253e98c4b691320c2c764c70e0d
 MISC metadata.xml 1130 SHA256 bef417ea1ad1a12a2639eb9644e7b8fda664f2c19047e2357aa56c3964bafb7b SHA512 e58811e997cdf258f70a9c2baa526d8c3acb76dfc208b43bc8bff3a4d1433ed08231956f9fbe098fd9ee26d4002bdb35617fbb0e578510489c9671d969b84eef WHIRLPOOL e72970d425eda43b1f635406f2ad04c725373662716ed4e4c1e88366da0d80bc2cb9b90da264a3cbd71d474881984b187fcfff15e78ffda7fdf161663e27b5d4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR/WrtAAoJEPATRTHh2/q1JOsH/3FqdK1qrd/kgJSUb4jAHI5r
-kEnIFbHG/H7eL0BijEe6RP8KSMf4IPTkwj7r2KVgp7/u79wAy4lg1wmx1n00/XFJ
-kzySqJK8rzftM/hNWdJLcUtBWpcIwRcwLfFCuIegsIzrDPl05N02P7nWkV4giSWZ
-6gBIPBLx9mhiXdH19W0ugFnFJs6ydWRDXMUGxwp4ZJfQav856PLwKRvqlJeR9ErY
-Abxkdsgft+pjE9LxN7svJ2snw0Elj2am1UBMlgbpFr4GuYQ5tDKUtHyQ9w0Rwygc
-elvU76APwzJOsLD6n/HTAMakAchxL0K2SzM3LUeVcO9w+/HLsGfWydCM+fC/pAE=
-=npuw
+iQEcBAEBCAAGBQJSKdNVAAoJEPATRTHh2/q1aVcIAI522WIYAZjXm/rWQcmOqfXu
+qDoa9PdKYqqDTAmgCAl6lYR7L901PtKm72Qy7lc2xeIET4f6sZxvY4h/hCeejaMq
+2fGmeUOYDE9TWIiZ3xoEoJTbnnx4hn7JAjkInvQJv16f+Jy1JWbenG9iP9QGFW/5
+/gY0g0vNdseTg5VgHc+63a5UaXXp/hbmMoKOB2BcZJB5ejt4dZzER4urIcuNKvQr
++v4MR0JAXGJN1wxxZTVdY3v14kwjFUG54c/Yz1NfgXjtz2OOXEJvelmgWu7jFRXq
+BUxbqx8qkveTrhHb0eJnNz5fhvnZ5VGahnimWu18lFzs5S6d351n2Bvc06krD7Q=
+=GHtK
 -----END PGP SIGNATURE-----
diff --git a/net-mail/notmuch/notmuch-0.10.2-r3.ebuild b/net-mail/notmuch/notmuch-0.10.2-r3.ebuild
index 298858bbc6b0..5bccb0920afb 100644
--- a/net-mail/notmuch/notmuch-0.10.2-r3.ebuild
+++ b/net-mail/notmuch/notmuch-0.10.2-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.10.2-r3.ebuild,v 1.7 2012/05/19 07:50:41 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.10.2-r3.ebuild,v 1.8 2013/09/06 13:06:27 aidecoe Exp $
 
 EAPI=4
 
@@ -24,7 +24,7 @@ IUSE="bash-completion crypt debug doc emacs nmbug python test vim
 CDEPEND="
 	>=dev-libs/glib-2.22
 	dev-libs/gmime:2.4
-	dev-libs/xapian
+	<dev-libs/xapian-1.3
 	sys-libs/talloc
 	debug? ( dev-util/valgrind )
 	emacs? ( >=virtual/emacs-23 )
diff --git a/net-mail/notmuch/notmuch-0.11.1-r3.ebuild b/net-mail/notmuch/notmuch-0.11.1-r3.ebuild
index adb537b6bd73..4f4eccb33381 100644
--- a/net-mail/notmuch/notmuch-0.11.1-r3.ebuild
+++ b/net-mail/notmuch/notmuch-0.11.1-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.11.1-r3.ebuild,v 1.7 2012/05/19 07:50:41 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.11.1-r3.ebuild,v 1.8 2013/09/06 13:06:27 aidecoe Exp $
 
 EAPI=4
 
@@ -24,7 +24,7 @@ IUSE="bash-completion crypt debug doc emacs nmbug python test vim
 CDEPEND="
 	>=dev-libs/glib-2.22
 	dev-libs/gmime:2.4
-	dev-libs/xapian
+	<dev-libs/xapian-1.3
 	sys-libs/talloc
 	debug? ( dev-util/valgrind )
 	emacs? ( >=virtual/emacs-23 )
diff --git a/net-mail/notmuch/notmuch-0.12.ebuild b/net-mail/notmuch/notmuch-0.12.ebuild
index ccd560ac74f5..4f625b0b085a 100644
--- a/net-mail/notmuch/notmuch-0.12.ebuild
+++ b/net-mail/notmuch/notmuch-0.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.12.ebuild,v 1.10 2012/05/19 07:50:41 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.12.ebuild,v 1.11 2013/09/06 13:06:27 aidecoe Exp $
 
 EAPI=4
 
@@ -24,7 +24,7 @@ IUSE="bash-completion crypt debug doc emacs nmbug python test vim
 CDEPEND="
 	>=dev-libs/glib-2.22
 	>=dev-libs/gmime-2.6.7
-	dev-libs/xapian
+	<dev-libs/xapian-1.3
 	sys-libs/talloc
 	debug? ( dev-util/valgrind )
 	emacs? ( >=virtual/emacs-23 )
diff --git a/net-mail/notmuch/notmuch-0.13.1.ebuild b/net-mail/notmuch/notmuch-0.13.1.ebuild
index e4aad9af482e..3280d02d0b29 100644
--- a/net-mail/notmuch/notmuch-0.13.1.ebuild
+++ b/net-mail/notmuch/notmuch-0.13.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.13.1.ebuild,v 1.3 2012/07/04 06:00:48 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.13.1.ebuild,v 1.4 2013/09/06 13:06:27 aidecoe Exp $
 
 EAPI=4
 
@@ -24,7 +24,7 @@ IUSE="bash-completion crypt debug doc emacs nmbug mutt python test vim
 CDEPEND="
 	>=dev-libs/glib-2.22
 	>=dev-libs/gmime-2.6.7
-	dev-libs/xapian
+	<dev-libs/xapian-1.3
 	sys-libs/talloc
 	debug? ( dev-util/valgrind )
 	emacs? ( >=virtual/emacs-23 )
diff --git a/net-mail/notmuch/notmuch-0.14-r1.ebuild b/net-mail/notmuch/notmuch-0.14-r1.ebuild
index e3d96a8afbd4..9dc7e6975291 100644
--- a/net-mail/notmuch/notmuch-0.14-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.14-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.14-r1.ebuild,v 1.3 2012/11/20 20:36:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.14-r1.ebuild,v 1.4 2013/09/06 13:06:27 aidecoe Exp $
 
 EAPI=4
 
@@ -24,7 +24,7 @@ IUSE="bash-completion crypt debug doc emacs nmbug mutt python test vim
 CDEPEND="
 	>=dev-libs/glib-2.22
 	>=dev-libs/gmime-2.6.7
-	dev-libs/xapian
+	<dev-libs/xapian-1.3
 	sys-libs/talloc
 	debug? ( dev-util/valgrind )
 	emacs? ( >=virtual/emacs-23 )
diff --git a/net-mail/notmuch/notmuch-0.15.2.ebuild b/net-mail/notmuch/notmuch-0.15.2.ebuild
index e20661ce95ef..fe81ac5d6b3a 100644
--- a/net-mail/notmuch/notmuch-0.15.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.15.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.15.2.ebuild,v 1.3 2013/03/09 17:36:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.15.2.ebuild,v 1.4 2013/09/06 13:06:27 aidecoe Exp $
 
 EAPI=4
 
@@ -27,7 +27,7 @@ IUSE="bash-completion crypt debug doc emacs mutt nmbug pick python test vim
 CDEPEND="
 	>=dev-libs/glib-2.22
 	>=dev-libs/gmime-2.6.7
-	dev-libs/xapian
+	<dev-libs/xapian-1.3
 	sys-libs/talloc
 	debug? ( dev-util/valgrind )
 	emacs? ( >=virtual/emacs-23 )
diff --git a/net-mail/notmuch/notmuch-0.16.ebuild b/net-mail/notmuch/notmuch-0.16.ebuild
index 09afc9d41d92..97f091b9fdc8 100644
--- a/net-mail/notmuch/notmuch-0.16.ebuild
+++ b/net-mail/notmuch/notmuch-0.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.16.ebuild,v 1.1 2013/08/03 20:40:03 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.16.ebuild,v 1.2 2013/09/06 13:06:27 aidecoe Exp $
 
 EAPI=5
 
@@ -27,7 +27,7 @@ IUSE="bash-completion crypt debug doc emacs mutt nmbug pick python test
 CDEPEND="
 	>=dev-libs/glib-2.22
 	>=dev-libs/gmime-2.6.7
-	dev-libs/xapian
+	<dev-libs/xapian-1.3
 	sys-libs/talloc
 	debug? ( dev-util/valgrind )
 	emacs? ( >=virtual/emacs-23 )