diff options
author | Amadeusz Piotr Żołnowski <aidecoe@gentoo.org> | 2014-08-28 14:07:54 +0000 |
---|---|---|
committer | Amadeusz Piotr Żołnowski <aidecoe@gentoo.org> | 2014-08-28 14:07:54 +0000 |
commit | 2b8fd065657e8384bb50dc7d33cab2932981588a (patch) | |
tree | ef5126b52584de4b9d236700afac2ed14907b69d /net-mail | |
parent | Cleanup old patch and remove warning for bug 519630 (diff) | |
download | gentoo-2-2b8fd065657e8384bb50dc7d33cab2932981588a.tar.gz gentoo-2-2b8fd065657e8384bb50dc7d33cab2932981588a.tar.bz2 gentoo-2-2b8fd065657e8384bb50dc7d33cab2932981588a.zip |
Moved check for /etc/mutt/notmuch-mutt.rc to pkg_preinst(). Now it should
work fine with binpkgs.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F0134531E1DBFAB5)
Diffstat (limited to 'net-mail')
-rw-r--r-- | net-mail/notmuch/ChangeLog | 6 | ||||
-rw-r--r-- | net-mail/notmuch/notmuch-0.18.1.ebuild | 13 |
2 files changed, 12 insertions, 7 deletions
diff --git a/net-mail/notmuch/ChangeLog b/net-mail/notmuch/ChangeLog index c29add4d89a6..7e1bb0048396 100644 --- a/net-mail/notmuch/ChangeLog +++ b/net-mail/notmuch/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-mail/notmuch # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.100 2014/08/28 11:39:27 aidecoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.101 2014/08/28 14:07:54 aidecoe Exp $ + + 28 Aug 2014; Amadeusz Żołnowski <aidecoe@gentoo.org> notmuch-0.18.1.ebuild: + Moved check for /etc/mutt/notmuch-mutt.rc to pkg_preinst(). Now it should + work fine with binpkgs. 28 Aug 2014; Amadeusz Żołnowski <aidecoe@gentoo.org> notmuch-0.18.1.ebuild: Unconditional installation of zsh/bash completion files. Fixes bug #521372. diff --git a/net-mail/notmuch/notmuch-0.18.1.ebuild b/net-mail/notmuch/notmuch-0.18.1.ebuild index 2e0ae77388aa..4efd660ed80c 100644 --- a/net-mail/notmuch/notmuch-0.18.1.ebuild +++ b/net-mail/notmuch/notmuch-0.18.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.18.1.ebuild,v 1.5 2014/08/28 11:39:27 aidecoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.18.1.ebuild,v 1.6 2014/08/28 14:07:54 aidecoe Exp $ EAPI=5 @@ -148,7 +148,6 @@ src_install() { fi if use mutt; then - [[ -e /etc/mutt/notmuch-mutt.rc ]] && NOTMUCH_MUTT_RC_EXISTS=1 pushd contrib/notmuch-mutt || die dobin notmuch-mutt doman notmuch-mutt.1 @@ -162,10 +161,8 @@ src_install() { use doc && bindings python dohtml -r python } -pkg_postinst() { - use emacs && elisp-site-regen - - if use mutt && [[ ! ${NOTMUCH_MUTT_RC_EXISTS} ]]; then +pkg_preinst() { + if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then elog "To enable notmuch support in mutt, add the following line into" elog "your mutt config file, please:" elog "" @@ -173,6 +170,10 @@ pkg_postinst() { fi } +pkg_postinst() { + use emacs && elisp-site-regen +} + pkg_postrm() { use emacs && elisp-site-regen } |