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

It rels bug #483988.

(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key F0134531E1DBFAB5)

8 files changed, 27 insertions, 20 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/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 )