net-mail/notmuch: bump net-mail/notmuch, thank to Tommy[D], bapa, binki and Arfrever from #gentoo-python

svn path=/sunrise/; revision=11799

6 files changed, 252 insertions, 68 deletions

diff --git a/net-mail/notmuch/ChangeLog b/net-mail/notmuch/ChangeLog
index 84f3aa7c5..cbe5464bf 100644
--- a/net-mail/notmuch/ChangeLog
+++ b/net-mail/notmuch/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for net-mail/notmuch
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Feb 2011; Cédric Cabessa (ced_c) <ced@ryick.net> +notmuch-0.5.ebuild,
+  +files/50notmuch-gentoo.el, -notmuch-0.3.1.ebuild,
+  +files/configure_add_option.patch:
+  bump net-mail/notmuch, thank to Tommy[D], bapa, binki and Arfrever from
+  #gentoo-python
+
   09 May 2010; Cédric Cabessa (ced_c) <ced@ryick.net>
   +notmuch-0.3.1.ebuild, +metadata.xml:
   New ebuild for notmuch, bug #318499. Many thanks to Tommy[D] and Ramonster
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 2130ff763..e75c8c4e5 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,4 +1,6 @@
-DIST notmuch-0.3.1.tar.gz 239839 RMD160 081f29d0ff875296f8491289895d3b6b378c9e18 SHA1 a59820085c44229843684d81fbfbbed473956a12 SHA256 870c3d2cddb200a1c57fa7735cf19983de6e5856038a877f6e4403b5f41ca4e2
-EBUILD notmuch-0.3.1.ebuild 1293 RMD160 1f8a45e845c5b178f3afc804a4760de3bef7c95f SHA1 1852987113335ea3f0a1e33491ec2e50a1ae4cef SHA256 5676567fb02e4da4319b5c4b3403923bec208e64a31b25e00ce860793b354f88
-MISC ChangeLog 290 RMD160 456a6e020cbe7048beca5c1e14ef68e63ef65227 SHA1 4422ec879b05948b938c3f93ad22bf22722a7664 SHA256 0d8d601325839e258f196f0e86420d1f2dd17f1d19ca52914fa13055de3c455b
+AUX 50notmuch-gentoo.el 57 RMD160 2d99dcca6388a04a7a1739fc920d72ebf6459f48 SHA1 65d00dde7847c046951b172ed54c46c1bb1dbabf SHA256 828c766b97a5f80a250bcea64af1f59075f48bd448b8510e9c6d6231e4ddec34
+AUX configure_add_option.patch 5082 RMD160 8702f3e9ee3e1a195dcc14bb5d074cf10845a294 SHA1 28578a1e1abc2c6a10897f49ca7e46de3761f7ba SHA256 9fac3a4d2523c995e926396943aab27388b584cfaa9cd2d6c582e54359c8c17a
+DIST notmuch-0.5.tar.gz 340156 RMD160 57cd41d2c2b672dffe733fcbd171082e7be8a30e SHA1 8a02dba668abdae783b94d11de01a27f9dcd6085 SHA256 c7eeb95c89c5b9cb22cc0b90abce5f923c20c982d607bf32829c989e905ff1a9
+EBUILD notmuch-0.5.ebuild 2083 RMD160 06989e328c76c8fc9ff0b8bd65a168dbe720993d SHA1 d7f38160a7a46874200b6d4cac20adb7e8040c0d SHA256 da7846d6a6916e9a92fa0b09bc55cafb4f0ce9010013469cc678df031dd35519
+MISC ChangeLog 548 RMD160 19a29b136e762d2771e96f2d5117f7866bde2004 SHA1 7a31dbbbdf5da9c47b15ecbb1faa0b11654ad921 SHA256 f411f5ddffc162dff66f048860f0277a6a1ab584d8ee8669e19bc3c1fce09f27
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
diff --git a/net-mail/notmuch/files/50notmuch-gentoo.el b/net-mail/notmuch/files/50notmuch-gentoo.el
new file mode 100644
index 000000000..a890e1189
--- /dev/null
+++ b/net-mail/notmuch/files/50notmuch-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(require 'notmuch)
diff --git a/net-mail/notmuch/files/configure_add_option.patch b/net-mail/notmuch/files/configure_add_option.patch
new file mode 100644
index 000000000..0ef650946
--- /dev/null
+++ b/net-mail/notmuch/files/configure_add_option.patch
@@ -0,0 +1,148 @@
+diff --git a/Makefile.local b/Makefile.local
+index f9b5a9b..3c6151c 100644
+--- a/Makefile.local
++++ b/Makefile.local
+@@ -277,6 +277,7 @@ ifeq ($(MAKECMDGOALS), install)
+ 	@echo "through the process of configuring notmuch and creating"
+ 	@echo "a database of existing email messages. The \"notmuch\""
+ 	@echo "command will also offer some sample search commands."
++ifeq ($(WITH_EMACS), 1)
+ 	@echo ""
+ 	@echo "Beyond the command-line interface, notmuch also offers"
+ 	@echo "a full-featured interface for reading and writing mail"
+@@ -288,6 +289,7 @@ ifeq ($(MAKECMDGOALS), install)
+ 	@echo "And then run emacs as \"emacs -f notmuch\" or invoke"
+ 	@echo "the command \"M-x notmuch\" from within emacs."
+ endif
++endif
+ 
+ .PHONY: install-desktop
+ install-desktop:
+diff --git a/completion/Makefile.local b/completion/Makefile.local
+index 6a6012d..0b74c06 100644
+--- a/completion/Makefile.local
++++ b/completion/Makefile.local
+@@ -12,7 +12,11 @@ install: install-$(dir)
+ 
+ install-$(dir):
+ 	@echo $@
++ifeq ($(WITH_BASH),1)
+ 	mkdir -p $(DESTDIR)$(bash_completion_dir)
+ 	install -m0644 $(bash_script) $(DESTDIR)$(bash_completion_dir)/notmuch
++endif
++ifeq ($(WITH_ZSH),1)
+ 	mkdir -p $(DESTDIR)$(zsh_completion_dir)
+ 	install -m0644 $(zsh_script) $(DESTDIR)$(zsh_completion_dir)/notmuch
++endif
+diff --git a/configure b/configure
+index c58dd0f..c7ec414 100755
+--- a/configure
++++ b/configure
+@@ -28,6 +28,9 @@ XAPIAN_CONFIG=${XAPIAN_CONFIG:-xapian-config}
+ # options.
+ PREFIX=/usr/local
+ LIBDIR=
++WITH_EMACS=1
++WITH_BASH=1
++WITH_ZSH=1
+ 
+ usage ()
+ {
+@@ -81,6 +84,15 @@ Fine tuning of some installation directories is available:
+ 	--mandir=DIR		Install man pages to DIR [PREFIX/share/man]
+ 	--sysconfdir=DIR	Read-only single-machine data [PREFIX/etc]
+ 	--emacslispdir=DIR	Emacs code [PREFIX/share/emacs/site-lisp]
++	--bashcompletiondir=DIR Bash completions files [SYSCONFDIR/bash_completion.d]
++	--zshcompletiondir=DIR	Zsh completions files [PREFIX/share/zsh/functions/Completion/Unix]
++
++Some features can be disabled (--with-feature=no is equivalent to
++--without-feature) :
++
++	--without-emacs			Do not install lisp file
++	--without-bash-completion	Do not install bash completions files
++	--without-zsh-completion	Do not install zsh completions files
+ 
+ Additional options are accepted for compatibility with other
+ configure-script calling conventions, but don't do anything yet:
+@@ -114,6 +126,34 @@ for option; do
+ 	SYSCONFDIR="${option#*=}"
+     elif [ "${option%%=*}" = '--emacslispdir' ] ; then
+ 	EMACSLISPDIR="${option#*=}"
++    elif [ "${option%%=*}" = '--bashcompletiondir' ] ; then
++	BASHCOMPLETIONDIR="${option#*=}"
++    elif [ "${option%%=*}" = '--zshcompletiondir' ] ; then
++	ZSHCOMLETIONDIR="${option#*=}"
++    elif [ "${option%%=*}" = '--with-emacs' ]; then
++	if [ "${option#*=}" = 'no' ]; then
++	    WITH_EMACS=0
++	else
++	    WITH_EMACS=1
++	fi
++    elif [ "${option}" = '--without-emacs' ] ; then
++	WITH_EMACS=0
++    elif [ "${option%%=*}" = '--with-bash-completion' ]; then
++	if [ "${option#*=}" = 'no' ]; then
++	    WITH_BASH=0
++	else
++	    WITH_BASH=1
++	fi
++    elif [ "${option}" = '--without-bash-completion' ] ; then
++	WITH_BASH=0
++    elif [ "${option%%=*}" = '--with-zsh-completion' ]; then
++	if [ "${option#*=}" = 'no' ]; then
++	    WITH_ZSH=0
++	else
++	    WITH_ZSH=1
++	fi
++    elif [ "${option}" = '--without-zsh-completion' ] ; then
++	WITH_ZSH=0
+     elif [ "${option%%=*}" = '--build' ] ; then
+ 	build_option="${option#*=}"
+ 	case ${build_option} in
+@@ -527,10 +567,10 @@ HAVE_EMACS = ${have_emacs}
+ desktop_dir = \$(prefix)/share/applications
+ 
+ # The directory to which bash completions files should be installed
+-bash_completion_dir = \$(sysconfdir)/bash_completion.d
++bash_completion_dir = ${BASHCOMPLETIONDIR:=\$(sysconfdir)/bash_completion.d}
+ 
+ # The directory to which zsh completions files should be installed
+-zsh_completion_dir = \$(prefix)/share/zsh/functions/Completion/Unix
++zsh_completion_dir = ${ZSHCOMLETIONDIR:=\$(prefix)/share/zsh/functions/Completion/Unix}
+ 
+ # Whether the getline function is available (if not, then notmuch will
+ # build its own version)
+@@ -572,6 +612,15 @@ HAVE_VALGRIND = ${have_valgrind}
+ # And if so, flags needed at compile time for valgrind macros
+ VALGRIND_CFLAGS = ${valgrind_cflags}
+ 
++# Support for emacs
++WITH_EMACS = ${WITH_EMACS}
++
++# Support for bash completion
++WITH_BASH = ${WITH_BASH}
++
++# Support for zsh completion
++WITH_ZSH = ${WITH_ZSH}
++
+ # Combined flags for compiling and linking against all of the above
+ CONFIGURE_CFLAGS = -DHAVE_GETLINE=\$(HAVE_GETLINE) \$(GMIME_CFLAGS)      \\
+ 		   \$(TALLOC_CFLAGS) -DHAVE_VALGRIND=\$(HAVE_VALGRIND)   \\
+diff --git a/emacs/Makefile.local b/emacs/Makefile.local
+index 86f9b07..9ea8e49 100644
+--- a/emacs/Makefile.local
++++ b/emacs/Makefile.local
+@@ -22,11 +22,13 @@ emacs_bytecode := $(subst .el,.elc,$(emacs_sources))
+ %.elc: %.el
+ 	$(call quiet,EMACS) --directory emacs -batch -f batch-byte-compile $<
+ 
++ifeq ($(WITH_EMACS),1)
+ ifeq ($(HAVE_EMACS),1)
+ all: $(emacs_bytecode)
+ endif
+ 
+ install: install-emacs
++endif
+ 
+ .PHONY: install-emacs
+ install-emacs:
diff --git a/net-mail/notmuch/notmuch-0.3.1.ebuild b/net-mail/notmuch/notmuch-0.3.1.ebuild
deleted file mode 100644
index 35ff6b2fa..000000000
--- a/net-mail/notmuch/notmuch-0.3.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-PYTHON_DEPEND="python? 2:2.6"
-
-inherit distutils
-
-DESCRIPTION="Thread-based email index, search and tagging"
-HOMEPAGE="http://notmuchmail.org/"
-SRC_URI="http://notmuchmail.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="python"
-
-DEPEND="dev-libs/gmime:2.4
-	sys-libs/talloc
-	>=dev-libs/xapian-1.0.19
-	"
-RDEPEND="${DEPEND}"
-
-#This is need for src_compile and src_install:
-#setup.py imports the notmuch module (__init__.py), which looks for
-#libnotmuch.so
-export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${S}/lib
-
-src_prepare() {
-	if use python ; then
-		cd bindings/python || die "bindings/python not found"
-		distutils_src_prepare
-	fi
-}
-
-src_compile() {
-	default
-	if use python ; then
-		cd bindings/python || die "bindings/python not found"
-		distutils_src_compile
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake failed"
-	dodoc AUTHORS NEWS README TODO || die "dodoc failed"
-	if use python ; then
-		cd bindings/python || die "bindings/python not found"
-		distutils_src_install
-	fi
-}
-
-pkg_postinst() {
-	if use python ; then
-		distutils_pkg_postinst
-	fi
-}
-
-pkg_postrm() {
-	if use python ; then
-		distutils_pkg_postrm
-	fi
-}
diff --git a/net-mail/notmuch/notmuch-0.5.ebuild b/net-mail/notmuch/notmuch-0.5.ebuild
new file mode 100644
index 000000000..3d8c58135
--- /dev/null
+++ b/net-mail/notmuch/notmuch-0.5.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+PYTHON_DEPEND="python? 2:2.6"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit bash-completion distutils elisp-common eutils
+
+DESCRIPTION="Thread-based email index, search and tagging"
+HOMEPAGE="http://notmuchmail.org/"
+SRC_URI="http://notmuchmail.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+emacs python zsh-completion"
+
+CDEPEND="emacs? ( virtual/emacs )
+	dev-libs/gmime:2.4
+	sys-libs/talloc
+	dev-libs/xapian"
+
+DEPEND="${CDEPEND}
+	dev-util/pkgconfig"
+
+RDEPEND="${CDEPEND}
+	zsh-completion? ( app-shells/zsh-completion )"
+
+RESTRICT_PYTHON_ABIS="3.*"
+
+
+src_prepare() {
+	if ! use emacs; then
+		ewarn "The default UI is provided as an emacs module."
+		ewarn "You should set USE=emacs if you want to use ${PN} as a MUA."
+	fi
+
+	epatch "${FILESDIR}/configure_add_option.patch"
+
+	if use python ; then
+		cd bindings/python || die "bindings/python not found"
+		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${S}/lib distutils_src_prepare
+	fi
+}
+
+src_configure() {
+	econf \
+		"--emacslispdir=${SITELISP}/${PN}" \
+		"--bashcompletiondir=/usr/share/bash-completion" \
+		"--zshcompletiondir=/usr/share/zsh/site-functions" \
+		$(use_with bash-completion) \
+		$(use_with emacs) \
+		$(use_with zsh-completion)
+}
+
+src_compile() {
+	default
+
+	if use python ; then
+		cd bindings/python || die "bindings/python not found"
+		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${S}/lib distutils_src_compile
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake failed"
+	dodoc AUTHORS NEWS README TODO || die "dodoc failed"
+
+	if use emacs ; then
+		elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" || die
+	fi
+
+	if use python ; then
+		cd bindings/python || die "bindings/python not found"
+		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${S}/lib distutils_src_install
+	fi
+}
+
+pkg_postinst() {
+	use python && distutils_pkg_postinst
+	use emacs && elisp-site-regen
+	bash-completion_pkg_postinst
+}
+
+pkg_postrm() {
+	use python && distutils_pkg_postrm
+	use emacs && elisp-site-regen
+}