net-mail/notmuch-0.9: ~x86 keyword

Notmuch works fine in terminal, Vim and Emacs.  For x86
>=dev-libs/xapian-1.2.7-r2 is required.

(Portage version: 2.1.10.31/cvs/Linux x86_64)

4 files changed, 29 insertions, 22 deletions

diff --git a/net-mail/notmuch/ChangeLog b/net-mail/notmuch/ChangeLog
index 2c3e63cefb14..9461cea13594 100644
--- a/net-mail/notmuch/ChangeLog
+++ b/net-mail/notmuch/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/notmuch
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.1 2011/11/02 15:30:50 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.2 2011/11/02 16:48:13 aidecoe Exp $
+
+  02 Nov 2011; Amadeusz Żołnowski <aidecoe@gentoo.org>
+  files/0.9-emacsetcdir.patch, files/0.9-fix-lib-makefile-local.patch,
+  notmuch-0.9.ebuild:
+  ~x86 keyword. Notmuch works fine in terminal, Vim and Emacs.
+
+  For x86 >=dev-libs/xapian-1.2.7-r2 is required.
 
   02 Nov 2011; Amadeusz Żołnowski <aidecoe@gentoo.org>
   +files/0.9-emacsetcdir.patch, +files/0.9-fix-lib-makefile-local.patch,
diff --git a/net-mail/notmuch/files/0.9-emacsetcdir.patch b/net-mail/notmuch/files/0.9-emacsetcdir.patch
index 4d42cb95af42..97e28feedb18 100644
--- a/net-mail/notmuch/files/0.9-emacsetcdir.patch
+++ b/net-mail/notmuch/files/0.9-emacsetcdir.patch
@@ -1,18 +1,17 @@
-From 38375cefb708081eab7e7c928dcb85a1d68da6f1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Mon, 24 Oct 2011 20:26:27 +0200
-Subject: [PATCH] Separate Emacs miscellaneous files directory from Emacs code
- directory.
+From e6d85fb97d86e103c2c62cd215f54a3fe37856d0 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
+Date: Tue, 25 Oct 2011 10:07:02 +0200
+Subject: [PATCH 1/1] Separate Emacs misc. files dir. from Emacs code dir.
 
---emacsetcdir was added, but it's set default to the same value as
---emacslispdir for backward compatibility.
+New option --emacsetcdir was added, but it's set default to the same
+value as --emacslispdir for backward compatibility.
 ---
- configure            |   14 ++++++++++++++
+ configure            |   15 +++++++++++++++
  emacs/Makefile.local |    3 ++-
- 2 files changed, 16 insertions(+), 1 deletions(-)
+ 2 files changed, 17 insertions(+), 1 deletions(-)
 
 diff --git a/configure b/configure
-index 3999ce8..37c0283 100755
+index 3999ce8..e90b76f 100755
 --- a/configure
 +++ b/configure
 @@ -97,6 +97,7 @@ Fine tuning of some installation directories is available:
@@ -47,11 +46,12 @@ index 3999ce8..37c0283 100755
  printf "Checking if emacs is available... "
  if emacs --quick --batch > /dev/null 2>&1; then
      printf "Yes.\n"
-@@ -614,6 +625,9 @@ sysconfdir = ${SYSCONFDIR:=\$(prefix)/etc}
+@@ -614,6 +625,10 @@ sysconfdir = ${SYSCONFDIR:=\$(prefix)/etc}
  # The directory to which emacs lisp files should be installed
  emacslispdir=${EMACSLISPDIR}
  
-+# The directory to which emacs lisp files should be installed
++# The directory to which emacs miscellaneous (machine-independent) files should
++# be installed
 +emacsetcdir=${EMACSETCDIR}
 +
  # Whether there's an emacs binary available for byte-compiling
@@ -71,5 +71,5 @@ index ce0c3f0..0c58b82 100644
  
  CLEAN := $(CLEAN) $(emacs_bytecode)
 -- 
-1.7.7.1
+1.7.0.4
 
diff --git a/net-mail/notmuch/files/0.9-fix-lib-makefile-local.patch b/net-mail/notmuch/files/0.9-fix-lib-makefile-local.patch
index a454f9db84e2..0e61665ab6f5 100644
--- a/net-mail/notmuch/files/0.9-fix-lib-makefile-local.patch
+++ b/net-mail/notmuch/files/0.9-fix-lib-makefile-local.patch
@@ -1,8 +1,7 @@
-From 42ba9b5456567686c77acbac716982e21a154172 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sun, 23 Oct 2011 16:24:36 +0200
-Subject: [PATCH] Prefix lib/notmuch.h and lib/gen-version-script.sh with
- $(srcdir)
+From 8d282adf53148469c3d6a9d41346919aa70028af Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
+Date: Sun, 23 Oct 2011 16:44:01 +0200
+Subject: [PATCH] Prefix lib/notmuch.h and lib/gen-version-script.sh with $(srcdir)
 
 lib/notmuch.h and lib/gen-version-script.sh couldn't have been found
 when building out of sources directory.
@@ -49,5 +48,5 @@ index ea20b2b..be51eaa 100644
  	mkdir -p "$(DESTDIR)$(libdir)/"
  	install -m0644 "$(lib)/$(LIBNAME)" "$(DESTDIR)$(libdir)/"
 -- 
-1.7.7
+1.7.0.4
 
diff --git a/net-mail/notmuch/notmuch-0.9.ebuild b/net-mail/notmuch/notmuch-0.9.ebuild
index 7e8f032e180f..3cf95cfb1443 100644
--- a/net-mail/notmuch/notmuch-0.9.ebuild
+++ b/net-mail/notmuch/notmuch-0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.9.ebuild,v 1.1 2011/11/02 15:30:50 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.9.ebuild,v 1.2 2011/11/02 16:48:13 aidecoe Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="${HOMEPAGE}/releases/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="bash-completion debug emacs vim zsh-completion"
 
 DEPEND="
@@ -22,6 +22,7 @@ DEPEND="
 	sys-libs/talloc
 	debug? ( dev-util/valgrind )
 	emacs? ( >=virtual/emacs-23 )
+	x86? ( >=dev-libs/xapian-1.2.7-r2 )
 	vim? ( || ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 ) )
 	"
 RDEPEND="${DEPEND}