aidecoe 14/08/28 14:07:54 Modified: ChangeLog notmuch-0.18.1.ebuild Log: 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)
Revision Changes Path 1.101 net-mail/notmuch/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/ChangeLog?rev=1.101&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/ChangeLog?rev=1.101&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/ChangeLog?r1=1.100&r2=1.101 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v retrieving revision 1.100 retrieving revision 1.101 diff -u -r1.100 -r1.101 --- ChangeLog 28 Aug 2014 11:39:27 -0000 1.100 +++ ChangeLog 28 Aug 2014 14:07:54 -0000 1.101 @@ -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 <[email protected]> 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 <[email protected]> notmuch-0.18.1.ebuild: Unconditional installation of zsh/bash completion files. Fixes bug #521372. 1.6 net-mail/notmuch/notmuch-0.18.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/notmuch-0.18.1.ebuild?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/notmuch-0.18.1.ebuild?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/notmuch-0.18.1.ebuild?r1=1.5&r2=1.6 Index: notmuch-0.18.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.18.1.ebuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- notmuch-0.18.1.ebuild 28 Aug 2014 11:39:27 -0000 1.5 +++ notmuch-0.18.1.ebuild 28 Aug 2014 14:07:54 -0000 1.6 @@ -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 @@ 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 @@ 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 @@ fi } +pkg_postinst() { + use emacs && elisp-site-regen +} + pkg_postrm() { use emacs && elisp-site-regen }
