From: Amadeusz Żołnowski Date: Wed, 2 Nov 2011 15:30:50 +0000 (+0000) Subject: Moved from app-text/notmuch to net-mail/notmuch. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=0dfc5b596a3616f6777593b75a64d7a58ae7019d;p=gentoo.git Moved from app-text/notmuch to net-mail/notmuch. Package-Manager: portage-2.1.10.31/cvs/Linux x86_64 --- diff --git a/net-mail/notmuch/ChangeLog b/net-mail/notmuch/ChangeLog new file mode 100644 index 000000000000..2c3e63cefb14 --- /dev/null +++ b/net-mail/notmuch/ChangeLog @@ -0,0 +1,32 @@ +# 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 $ + + 02 Nov 2011; Amadeusz Å»ołnowski + +files/0.9-emacsetcdir.patch, +files/0.9-fix-lib-makefile-local.patch, + +notmuch-0.9.ebuild, +files/50notmuch-gentoo.el, +metadata.xml: + Moved from app-text/notmuch to net-mail/notmuch. + + 26 Oct 2011; Ulrich Mueller files/50notmuch-gentoo.el: + Use SITEETC instead of absolute path in emacs site-init file. + + 24 Oct 2011; Amadeusz Å»ołnowski notmuch-0.9.ebuild: + ~amd64 keyword. Notmuch works fine in terminal, Vim and Emacs. + + 24 Oct 2011; Amadeusz Å»ołnowski + +files/0.9-emacsetcdir.patch, +files/50notmuch-gentoo.el, notmuch-0.9.ebuild: + Improved emacs support. Added site-init file by Ulrich Müller + . + + 24 Oct 2011; Amadeusz Å»ołnowski notmuch-0.9.ebuild, + metadata.xml: + Checking emacs version in pkg_setup(), not in pkg_pretend(). Paths in + src_install() were prefixed with ${ROOT} and emacs files were put into ${PN} + subdirectory. Better descriptions for vim and emacs flags in metadata.xml. + +*notmuch-0.9 (23 Oct 2011) + + 23 Oct 2011; Amadeusz Å»ołnowski + +files/0.9-fix-lib-makefile-local.patch, +notmuch-0.9.ebuild, +metadata.xml: + Initial ebuild without python and ruby bindings yet. + diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest new file mode 100644 index 000000000000..108bd52a7c12 --- /dev/null +++ b/net-mail/notmuch/Manifest @@ -0,0 +1,21 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX 0.9-emacsetcdir.patch 2728 RMD160 43517840aef14758aba5b7353eed2979d0afdbee SHA1 82c1095f4ef3df2f07cca86cbf0429c06815c158 SHA256 156cb739a1b1e34fd72e68a5c71a1211eb81dcdcb37dee65c7b93c22e92a9e3f +AUX 0.9-fix-lib-makefile-local.patch 1897 RMD160 a5cb4d7fdb0a47e19cd5c73894400c90b470b897 SHA1 929983d5551d90393552f45e3fad4d197941468c SHA256 ce2a844ac18b3ef1059c44998e521df0594824383742a7e2d12069d9a45621e9 +AUX 50notmuch-gentoo.el 291 RMD160 7e036b8700f50cde6c3b27622193ddf08812229b SHA1 cc087fe76f750e84171a6ddef9dc10139b8450cc SHA256 68c0ecfd3d10246fb65ec48b097c1b477ce33f44014f602f903c16b752ba7d3b +DIST notmuch-0.9.tar.gz 398868 RMD160 b956ceb629943bfa65c1c6fab6b10dc78639588b SHA1 988e93545880e9465380383f00d591d8a23c61dd SHA256 e6f1046941d2894d143cb7c19d4810f97946f98742f6d9b8a7208ddb858c57e4 +EBUILD notmuch-0.9.ebuild 1685 RMD160 2fb961eb28c38eb4b0d1973f0d225c16ee3abe00 SHA1 2ad4145d8af099b0a807410a243220d5fa0ca390 SHA256 ba5ec063122c01f5655569c830e1c1379205cfa531998f5c47168f014813318a +MISC ChangeLog 1503 RMD160 8b0daec7ca1f499b908d8ab0947f35f6353b99ce SHA1 69e612c009710d50c60f5b1a3cc578d102cd9f3d SHA256 5d230d4ac6d0da2a1907943b0fcf49db5f0f0b92325accd223a4d9799d49b1e3 +MISC metadata.xml 680 RMD160 9a11badec2b61f6979c22c0697810e38b4d9b29e SHA1 e1155327fffd111080a11c217b2017ba9fef570d SHA256 1994e7631102e70bc89b2cee9cc662e60ea8bd3c021fa02581677ee8a7cc7b2a +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iQEcBAEBAgAGBQJOsWIxAAoJEPATRTHh2/q11zAIAKI3YudzoGeTO0FNjT7sy/rw +gFHXSJMR6n8i9SRdpg7aLes/DQ+AH2allCFGi3OxjvMfqcLJhnxgkpsw0ah+DIi5 +jtyv25vJRp7kDudoDoNstz3t+QxxD1dbYCRCPWWMNeTwMhaliOiMA8uw4L1MPwF2 +cDHkCJUgTm6FK7bGZbYf/b1EUPmEmGTskRRV/IhveJxRk82n3KokwJmt+VaUL7te +zrBkTIYnhbj6N/UKbPQP6xtYXd0bwC1VujgnJ2gl4gi7gjUmqbNbsjKnyo8NK6Rv +RtQwo1mKCgbR9qSxwj2TJZS7QrsDergHzg4Q/j84D4hRQtcH4RzYaK/T9A8Ht+4= +=dZSN +-----END PGP SIGNATURE----- diff --git a/net-mail/notmuch/files/0.9-emacsetcdir.patch b/net-mail/notmuch/files/0.9-emacsetcdir.patch new file mode 100644 index 000000000000..4d42cb95af42 --- /dev/null +++ b/net-mail/notmuch/files/0.9-emacsetcdir.patch @@ -0,0 +1,75 @@ +From 38375cefb708081eab7e7c928dcb85a1d68da6f1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= +Date: Mon, 24 Oct 2011 20:26:27 +0200 +Subject: [PATCH] Separate Emacs miscellaneous files directory from Emacs code + directory. + +--emacsetcdir was added, but it's set default to the same value as +--emacslispdir for backward compatibility. +--- + configure | 14 ++++++++++++++ + emacs/Makefile.local | 3 ++- + 2 files changed, 16 insertions(+), 1 deletions(-) + +diff --git a/configure b/configure +index 3999ce8..37c0283 100755 +--- a/configure ++++ b/configure +@@ -97,6 +97,7 @@ 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] ++ --emacsetcdir=DIR Emacs miscellaneous files [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] + +@@ -139,6 +140,8 @@ for option; do + SYSCONFDIR="${option#*=}" + elif [ "${option%%=*}" = '--emacslispdir' ] ; then + EMACSLISPDIR="${option#*=}" ++ elif [ "${option%%=*}" = '--emacsetcdir' ] ; then ++ EMACSETCDIR="${option#*=}" + elif [ "${option%%=*}" = '--bashcompletiondir' ] ; then + BASHCOMPLETIONDIR="${option#*=}" + elif [ "${option%%=*}" = '--zshcompletiondir' ] ; then +@@ -330,6 +333,14 @@ if [ -z "${EMACSLISPDIR}" ]; then + fi + fi + ++if [ -z "${EMACSETCDIR}" ]; then ++ if pkg-config --exists emacs; then ++ EMACSETCDIR=$(pkg-config emacs --variable sitepkglispdir) ++ else ++ EMACSETCDIR='$(prefix)/share/emacs/site-lisp' ++ fi ++fi ++ + 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} + # The directory to which emacs lisp files should be installed + emacslispdir=${EMACSLISPDIR} + ++# The directory to which emacs lisp files should be installed ++emacsetcdir=${EMACSETCDIR} ++ + # Whether there's an emacs binary available for byte-compiling + HAVE_EMACS = ${have_emacs} + +diff --git a/emacs/Makefile.local b/emacs/Makefile.local +index ce0c3f0..0c58b82 100644 +--- a/emacs/Makefile.local ++++ b/emacs/Makefile.local +@@ -38,6 +38,7 @@ install-emacs: + ifeq ($(HAVE_EMACS),1) + install -m0644 $(emacs_bytecode) "$(DESTDIR)$(emacslispdir)" + endif +- install -m0644 $(emacs_images) "$(DESTDIR)$(emacslispdir)" ++ mkdir -p "$(DESTDIR)$(emacsetcdir)" ++ install -m0644 $(emacs_images) "$(DESTDIR)$(emacsetcdir)" + + CLEAN := $(CLEAN) $(emacs_bytecode) +-- +1.7.7.1 + 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 new file mode 100644 index 000000000000..a454f9db84e2 --- /dev/null +++ b/net-mail/notmuch/files/0.9-fix-lib-makefile-local.patch @@ -0,0 +1,53 @@ +From 42ba9b5456567686c77acbac716982e21a154172 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= +Date: Sun, 23 Oct 2011 16:24:36 +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. +--- + lib/Makefile.local | 13 +++++++------ + 1 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/lib/Makefile.local b/lib/Makefile.local +index ea20b2b..be51eaa 100644 +--- a/lib/Makefile.local ++++ b/lib/Makefile.local +@@ -41,6 +41,11 @@ endif + dir := lib + extra_cflags += -I$(srcdir)/$(dir) -fPIC + ++# The (often-reused) $dir works fine within targets/prerequisites, ++# but cannot be used reliably within commands, so copy its value to a ++# variable that is not reused. ++lib := $(dir) ++ + libnotmuch_c_srcs = \ + $(notmuch_compat_srcs) \ + $(dir)/filenames.c \ +@@ -68,8 +73,8 @@ $(dir)/libnotmuch.a: $(libnotmuch_modules) + $(dir)/$(LIBNAME): $(libnotmuch_modules) notmuch.sym + $(call quiet,CXX $(CXXFLAGS)) $(libnotmuch_modules) $(FINAL_LIBNOTMUCH_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@ + +-notmuch.sym: lib/notmuch.h $(libnotmuch_modules) +- sh lib/gen-version-script.sh $< $(libnotmuch_modules) > $@ ++notmuch.sym: $(srcdir)/$(dir)/notmuch.h $(libnotmuch_modules) ++ sh $(srcdir)/$(lib)/gen-version-script.sh $< $(libnotmuch_modules) > $@ + + $(dir)/$(SONAME): $(dir)/$(LIBNAME) + ln -sf $(LIBNAME) $@ +@@ -79,10 +84,6 @@ $(dir)/$(LINKER_NAME): $(dir)/$(SONAME) + + install: install-$(dir) + +-# The (often-reused) $dir works fine within targets/prerequisites, +-# but cannot be used reliably within commands, so copy its value to a +-# variable that is not reused. +-lib := $(dir) + install-$(dir): $(dir)/$(LIBNAME) + mkdir -p "$(DESTDIR)$(libdir)/" + install -m0644 "$(lib)/$(LIBNAME)" "$(DESTDIR)$(libdir)/" +-- +1.7.7 + diff --git a/net-mail/notmuch/files/50notmuch-gentoo.el b/net-mail/notmuch/files/50notmuch-gentoo.el new file mode 100644 index 000000000000..95e06246fea4 --- /dev/null +++ b/net-mail/notmuch/files/50notmuch-gentoo.el @@ -0,0 +1,7 @@ +(add-to-list 'load-path "@SITELISP@") +(if (boundp 'image-load-path) + (add-to-list 'image-load-path "@SITEETC@" t)) +(autoload 'notmuch "notmuch" nil t) +(autoload 'notmuch-search "notmuch" nil t) +(autoload 'notmuch-hello "notmuch-hello" nil t) +(autoload 'notmuch-show "notmuch-show" nil t) diff --git a/net-mail/notmuch/metadata.xml b/net-mail/notmuch/metadata.xml new file mode 100644 index 000000000000..a062b2ac438a --- /dev/null +++ b/net-mail/notmuch/metadata.xml @@ -0,0 +1,18 @@ + + + + + aidecoe@gentoo.org + Amadeusz Å»ołnowski + + + Install Notmuch client for Emacs (main client) + Install Notmuch client for Vim (experimental) + + + Notmuch is a system for indexing, searching, reading, and tagging large + collections of email messages in maildir or mh format. It uses the + Xapian library to provide fast, full-text search with a convenient + search syntax. + + diff --git a/net-mail/notmuch/notmuch-0.9.ebuild b/net-mail/notmuch/notmuch-0.9.ebuild new file mode 100644 index 000000000000..7e8f032e180f --- /dev/null +++ b/net-mail/notmuch/notmuch-0.9.ebuild @@ -0,0 +1,76 @@ +# 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 $ + +EAPI=4 + +inherit autotools-utils elisp-common + +DESCRIPTION="The mail indexer" +HOMEPAGE="http://notmuchmail.org/" +SRC_URI="${HOMEPAGE}/releases/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="bash-completion debug emacs vim zsh-completion" + +DEPEND=" + >=dev-libs/glib-2.14 + dev-libs/gmime:2.4 + dev-libs/xapian + sys-libs/talloc + debug? ( dev-util/valgrind ) + emacs? ( >=virtual/emacs-23 ) + vim? ( || ( >=app-editors/vim-7.0 >=app-editors/gvim-7.0 ) ) + " +RDEPEND="${DEPEND} + zsh-completion? ( app-shells/zsh ) + " + +DOCS=( AUTHORS NEWS README TODO ) +PATCHES=( + "${FILESDIR}/${PV}-fix-lib-makefile-local.patch" + "${FILESDIR}/${PV}-emacsetcdir.patch" + ) +SITEFILE="50${PN}-gentoo.el" + +pkg_setup() { + if use emacs; then + elisp-need-emacs 23 || die "Emacs version too low" + fi +} + +src_configure() { + local myeconfargs=( + --bashcompletiondir="${ROOT}/usr/share/bash-completion" + --emacslispdir="${ROOT}/${SITELISP}/${PN}" + --emacsetcdir="${ROOT}/${SITEETC}/${PN}" + --zshcompletiondir="${ROOT}/usr/share/zsh/site-functions" + $(use_with bash-completion) + $(use_with emacs) + $(use_with zsh-completion) + ) + autotools-utils_src_configure +} + +src_install() { + autotools-utils_src_install + + if use emacs; then + elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die + fi + + if use vim; then + insinto /usr/share/vim/vimfiles + doins -r vim/plugin vim/syntax + fi +} + +pkg_postinst() { + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +}