app-text/notmuch-0.9: Improved emacs support.

Added site-init file by Ulrich Müller <ulm@gentoo.org>.

Package-Manager: portage-2.1.10.31/cvs/Linux x86_64

diff --git a/app-text/notmuch/ChangeLog b/app-text/notmuch/ChangeLog
index 70a49fc0643a00783320bafb49735e2cbd5b4c0b..88185044f196192d06041c7b639057487c236122 100644 (file)
--- a/app-text/notmuch/ChangeLog
+++ b/app-text/notmuch/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/notmuch
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/notmuch/ChangeLog,v 1.2 2011/10/24 12:17:18 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/notmuch/ChangeLog,v 1.3 2011/10/24 18:43:09 aidecoe Exp $
+
+  24 Oct 2011; Amadeusz Żołnowski <aidecoe@gentoo.org>
+  +files/0.9-emacsetcdir.patch, +files/50notmuch-gentoo.el, notmuch-0.9.ebuild:
+  Improved emacs support. Added site-init file by Ulrich Müller
+  <ulm@gentoo.org>.
 
   24 Oct 2011; Amadeusz Żołnowski <aidecoe@gentoo.org> notmuch-0.9.ebuild,
   metadata.xml:

diff --git a/app-text/notmuch/Manifest b/app-text/notmuch/Manifest
index e7eade623b8eacfcc78799388b55ea2d22b1bbbb..5bb4cdd5fa372910a710fd27d736344415c91643 100644 (file)
--- a/app-text/notmuch/Manifest
+++ b/app-text/notmuch/Manifest
@@ -1,19 +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 309 RMD160 deec951cb9560404c9854fef255999f79c2c0a72 SHA1 a912c2022c07c0ffcb52b256f75a20a8b913b657 SHA256 3e616ba2cf9aa33884362ccbfd715c4c3196e7658a08b665682059b4bb6e54da
 DIST notmuch-0.9.tar.gz 398868 RMD160 b956ceb629943bfa65c1c6fab6b10dc78639588b SHA1 988e93545880e9465380383f00d591d8a23c61dd SHA256 e6f1046941d2894d143cb7c19d4810f97946f98742f6d9b8a7208ddb858c57e4
-EBUILD notmuch-0.9.ebuild 1396 RMD160 4054be9be4bab7b7c117d6ae584cd5d694406a8a SHA1 9d2d56295bab1bef72255038afb20250e1b57242 SHA256 4cad1cc079fdbce0907f6899f010069ecde1049ba62289892bccedcdf57e2b33
-MISC ChangeLog 750 RMD160 312cc820bcef3349e1a107ef75065468ab0b52ac SHA1 774dabb1552d7c4501910b71a87a23d254ea316c SHA256 b515423fabcbd96cf492ec24aad45453dcee51725121fd3b6b21728692a434f5
+EBUILD notmuch-0.9.ebuild 1679 RMD160 13c37a5cc8798cb314f57ce09668e20f5a6204cd SHA1 c8933e97eba9aa1cef9ca8ec47406466f2d3b73d SHA256 34c4e9cb9b315a7cda5cd8f1043eb5fab343738704435cef6c1e866181e313b6
+MISC ChangeLog 973 RMD160 f6bb875640ab29a3936383710e90263a37d511d3 SHA1 83f6c42df88b2d5a9b30b6acb46f3b62865b04a7 SHA256 283e098b6e099de554259420ba027ee64ae7f2995519694c78ec20691efc4ffa
 MISC metadata.xml 680 RMD160 9a11badec2b61f6979c22c0697810e38b4d9b29e SHA1 e1155327fffd111080a11c217b2017ba9fef570d SHA256 1994e7631102e70bc89b2cee9cc662e60ea8bd3c021fa02581677ee8a7cc7b2a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOpVdTAAoJEPATRTHh2/q1WiYH/0u7Nqky5dunjpdUEZYQ22s5
-+xP8ZqBXdr0zBd2Hz8rqv0ciQmj0n4SHs/jjzHy/hgNsmrJwRmndu/KdpYGvtFw7
-l0tmWuiyMbygVIshga4aGWU4bkU79G6pMveQyIrDcNCf/naAN5p2AUHhVArgXb4j
-Tu9JxiQF4ZkdOte5fxArB03L3vRNubgsVSw+5FqgSK57khW8SI9k73TtVzCLX0S3
-rIqQmOLi5vwSeINNJrV1YDBl3SmCDih9TvwUtMkgVaXH1bZuVVMM/xAC7dOuCShr
-V82DG3fWOuMgbZBDkRJimIwTB3dQycf/+vAzgneMkp1raqk5v59xoLzunheV/9U=
-=VhGD
+iQEcBAEBAgAGBQJOpbHCAAoJEPATRTHh2/q11UMIAI+i7bAuG7qlMwUyqbv6R8PX
+pK0C6A1A3PKqm37vhiDynAQMGaHsJzzbxg85NeoiPN1OZZQ07doLqfJCJ+I+fTir
+yHGWjNhkUpCNrO5BxpTgUvO57Mpavcz/4b//MlMgZ2+PTyxIphRWzJ3S8to4rW7M
+VPtfmVreOrbVHRXZXi6ghAmjb6aFuFKBKBdC76/M4qhC+ipFYSHW4IypC1sZW42m
+FdMH7RKSQyUR1MARQ9p+Aw7N4KRbI0jyAToWY+19KAG44ZF5scn6HxqpqaleS7Rz
+AatCj/Xe6TIRTCDPS1ADLKBPbaBe+ChMVg5bu0m2EbMtzqsTH3fs1X2FPJzySLY=
+=swB0
 -----END PGP SIGNATURE-----

diff --git a/app-text/notmuch/files/0.9-emacsetcdir.patch b/app-text/notmuch/files/0.9-emacsetcdir.patch
new file mode 100644 (file)
index 0000000..4d42cb9
--- /dev/null
+++ b/app-text/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?= <aidecoe@aidecoe.name>
+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/app-text/notmuch/files/50notmuch-gentoo.el b/app-text/notmuch/files/50notmuch-gentoo.el
new file mode 100644 (file)
index 0000000..ada42a3
--- /dev/null
+++ b/app-text/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 "/usr/share/emacs/etc/notmuch" 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)
\ No newline at end of file

diff --git a/app-text/notmuch/notmuch-0.9.ebuild b/app-text/notmuch/notmuch-0.9.ebuild
index 78e892600eee051fe9f82c2bb11353f98843b9cf..9d9fe751ca9c3f96e35ce25576f0bbc2f3596b2e 100644 (file)
--- a/app-text/notmuch/notmuch-0.9.ebuild
+++ b/app-text/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/app-text/notmuch/notmuch-0.9.ebuild,v 1.2 2011/10/24 12:17:18 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/notmuch/notmuch-0.9.ebuild,v 1.3 2011/10/24 18:43:09 aidecoe Exp $
 
 EAPI=4
 
@@ -29,7 +29,11 @@ RDEPEND="${DEPEND}
        "
 
 DOCS=( AUTHORS NEWS README TODO )
-PATCHES=( "${FILESDIR}/${PV}-fix-lib-makefile-local.patch" )
+PATCHES=(
+       "${FILESDIR}/${PV}-fix-lib-makefile-local.patch"
+       "${FILESDIR}/${PV}-emacsetcdir.patch"
+       )
+SITEFILE="50${PN}-gentoo.el"
 
 pkg_setup() {
        if use emacs; then
@@ -40,7 +44,8 @@ pkg_setup() {
 src_configure() {
        local myeconfargs=(
                --bashcompletiondir="${ROOT}/usr/share/bash-completion"
-               --emacslispdir="${ROOT}/usr/share/emacs/site-lisp/${PN}"
+               --emacslispdir="${ROOT}/${SITELISP}/${PN}"
+               --emacsetcdir="${ROOT}/${SITEETC}/${PN}"
                --zshcompletiondir="${ROOT}/usr/share/zsh/site-functions"
                $(use_with bash-completion)
                $(use_with emacs)
@@ -52,8 +57,20 @@ 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
+}