net-mail/notmuch: bump and add vim support. Thanks to floppym, hwoarang

svn path=/sunrise/; revision=12303

5 files changed, 30 insertions, 162 deletions

diff --git a/net-mail/notmuch/ChangeLog b/net-mail/notmuch/ChangeLog
index cbe5464bf..ff8b4f6e6 100644
--- a/net-mail/notmuch/ChangeLog
+++ b/net-mail/notmuch/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Aug 2011; Cédric Cabessa (ced_c) <ced@ryick.net> -notmuch-0.5.ebuild,
+  +notmuch-0.7.ebuild, -files/configure_add_option.patch, metadata.xml:
+  bump and add vim support. Thanks to floppym, hwoarang
+
   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:
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 5a062f8d0..deaa566ef 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,6 +1,5 @@
 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 2082 RMD160 5c110c83a74aa8c97909ca0bf0f7ca78aa142ef0 SHA1 269de04e6740e4d314452c9674b6dfbbf86db76e SHA256 47df6f3707c22eba022d5343672686ea1cd4229d00a8461e5e81b8c44703b4a5
-MISC ChangeLog 548 RMD160 19a29b136e762d2771e96f2d5117f7866bde2004 SHA1 7a31dbbbdf5da9c47b15ecbb1faa0b11654ad921 SHA256 f411f5ddffc162dff66f048860f0277a6a1ab584d8ee8669e19bc3c1fce09f27
-MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
+DIST notmuch-0.7.tar.gz 389830 RMD160 ae55134588c7435074ce6d73dcb151bee2447845 SHA1 a16bf6dfbce78a62b004ce9f983c1b3a4951c733 SHA256 0548310551b5e0da2eb366e1683e4b81b25b774d5ab4c5117091a67653646ec8
+EBUILD notmuch-0.7.ebuild 2187 RMD160 fdd8185c35993d90aaf31465952b18bfbbb08768 SHA1 925301a9d32ceedc84c85096bafe7634bc074dcd SHA256 45a08747ef5fbb76c5e41ab4e05c48e6b6cedaaa14c3ae310e5de9dc2c0955d2
+MISC ChangeLog 753 RMD160 65c048d2aa0665c4786b618da9fe31648b0a7c27 SHA1 e66196eb8b60b40094c0d6c53e9be745826e5dea SHA256 4718d3a977988b3b00b6be53cef583b8351a15bf195074279efa4f8f03366a11
+MISC metadata.xml 295 RMD160 e2d719c4419598bdfc0ac31128845169708f9a69 SHA1 8af77de11465facc86fed12abcaedbec6ae3860e SHA256 167473dd9f849c95de39fdce32587efb9b05582fa5649d77cc3d1d317a2085f4
diff --git a/net-mail/notmuch/files/configure_add_option.patch b/net-mail/notmuch/files/configure_add_option.patch
deleted file mode 100644
index 0ef650946..000000000
--- a/net-mail/notmuch/files/configure_add_option.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-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/metadata.xml b/net-mail/notmuch/metadata.xml
index e6233b5dc..72cd00e6e 100644
--- a/net-mail/notmuch/metadata.xml
+++ b/net-mail/notmuch/metadata.xml
@@ -3,4 +3,7 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer><email>maintainer-wanted@gentoo.org</email></maintainer>
+<use>
+  <flag name="vim">Install notmuch UI for vim</flag>
+</use>
 </pkgmetadata>
diff --git a/net-mail/notmuch/notmuch-0.5.ebuild b/net-mail/notmuch/notmuch-0.7.ebuild
index acb4eba1c..ab48da925 100644
--- a/net-mail/notmuch/notmuch-0.5.ebuild
+++ b/net-mail/notmuch/notmuch-0.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://notmuchmail.org/releases/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+emacs python zsh-completion"
+IUSE="+emacs python vim zsh-completion"
 
 CDEPEND="emacs? ( virtual/emacs )
 	dev-libs/gmime:2.4
@@ -26,6 +26,7 @@ DEPEND="${CDEPEND}
 	dev-util/pkgconfig"
 
 RDEPEND="${CDEPEND}
+	vim? ( app-editors/vim )
 	zsh-completion? ( app-shells/zsh-completion )"
 
 RESTRICT_PYTHON_ABIS="3.*"
@@ -36,11 +37,10 @@ src_prepare() {
 		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
+		pushd bindings/python || die "bindings/python not found"
+		distutils_src_prepare
+		popd
 	fi
 }
 
@@ -58,8 +58,9 @@ 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
+		pushd bindings/python || die "bindings/python not found"
+		distutils_src_compile
+		popd
 	fi
 }
 
@@ -72,8 +73,17 @@ src_install() {
 	fi
 
 	if use python ; then
-		cd bindings/python || die "bindings/python not found"
-		LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${S}/lib distutils_src_install
+		pushd bindings/python || die "bindings/python not found"
+		distutils_src_install
+		popd
+	fi
+
+	if use vim ; then
+		insinto /usr/share/vim/vimfiles/plugin/
+		doins vim/plugin/*.vim || die "cannot install plugin"
+
+		insinto /usr/share/vim/vimfiles/syntax/
+		doins vim/syntax/*.vim || die "cannot install syntax files"
 	fi
 }