Gentoo Archives: gentoo-commits

From: "Amadeusz Zolnowski (aidecoe)" <aidecoe@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-mail/notmuch: ChangeLog notmuch-0.18.1.ebuild
Date: Thu, 28 Aug 2014 14:07:58
Message-Id: 20140828140754.EF420A04@oystercatcher.gentoo.org
1 aidecoe 14/08/28 14:07:54
2
3 Modified: ChangeLog notmuch-0.18.1.ebuild
4 Log:
5 Moved check for /etc/mutt/notmuch-mutt.rc to pkg_preinst(). Now it should
6 work fine with binpkgs.
7
8 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F0134531E1DBFAB5)
9
10 Revision Changes Path
11 1.101 net-mail/notmuch/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/ChangeLog?rev=1.101&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/ChangeLog?rev=1.101&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/ChangeLog?r1=1.100&r2=1.101
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v
20 retrieving revision 1.100
21 retrieving revision 1.101
22 diff -u -r1.100 -r1.101
23 --- ChangeLog 28 Aug 2014 11:39:27 -0000 1.100
24 +++ ChangeLog 28 Aug 2014 14:07:54 -0000 1.101
25 @@ -1,6 +1,10 @@
26 # ChangeLog for net-mail/notmuch
27 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.100 2014/08/28 11:39:27 aidecoe Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/ChangeLog,v 1.101 2014/08/28 14:07:54 aidecoe Exp $
30 +
31 + 28 Aug 2014; Amadeusz Żołnowski <aidecoe@g.o> notmuch-0.18.1.ebuild:
32 + Moved check for /etc/mutt/notmuch-mutt.rc to pkg_preinst(). Now it should
33 + work fine with binpkgs.
34
35 28 Aug 2014; Amadeusz Żołnowski <aidecoe@g.o> notmuch-0.18.1.ebuild:
36 Unconditional installation of zsh/bash completion files. Fixes bug #521372.
37
38
39
40 1.6 net-mail/notmuch/notmuch-0.18.1.ebuild
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/notmuch-0.18.1.ebuild?rev=1.6&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/notmuch-0.18.1.ebuild?rev=1.6&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/notmuch/notmuch-0.18.1.ebuild?r1=1.5&r2=1.6
45
46 Index: notmuch-0.18.1.ebuild
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.18.1.ebuild,v
49 retrieving revision 1.5
50 retrieving revision 1.6
51 diff -u -r1.5 -r1.6
52 --- notmuch-0.18.1.ebuild 28 Aug 2014 11:39:27 -0000 1.5
53 +++ notmuch-0.18.1.ebuild 28 Aug 2014 14:07:54 -0000 1.6
54 @@ -1,6 +1,6 @@
55 # Copyright 1999-2014 Gentoo Foundation
56 # Distributed under the terms of the GNU General Public License v2
57 -# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.18.1.ebuild,v 1.5 2014/08/28 11:39:27 aidecoe Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/net-mail/notmuch/notmuch-0.18.1.ebuild,v 1.6 2014/08/28 14:07:54 aidecoe Exp $
59
60 EAPI=5
61
62 @@ -148,7 +148,6 @@
63 fi
64
65 if use mutt; then
66 - [[ -e /etc/mutt/notmuch-mutt.rc ]] && NOTMUCH_MUTT_RC_EXISTS=1
67 pushd contrib/notmuch-mutt || die
68 dobin notmuch-mutt
69 doman notmuch-mutt.1
70 @@ -162,10 +161,8 @@
71 use doc && bindings python dohtml -r python
72 }
73
74 -pkg_postinst() {
75 - use emacs && elisp-site-regen
76 -
77 - if use mutt && [[ ! ${NOTMUCH_MUTT_RC_EXISTS} ]]; then
78 +pkg_preinst() {
79 + if use mutt && ! [[ -e ${ROOT}/etc/mutt/notmuch-mutt.rc ]]; then
80 elog "To enable notmuch support in mutt, add the following line into"
81 elog "your mutt config file, please:"
82 elog ""
83 @@ -173,6 +170,10 @@
84 fi
85 }
86
87 +pkg_postinst() {
88 + use emacs && elisp-site-regen
89 +}
90 +
91 pkg_postrm() {
92 use emacs && elisp-site-regen
93 }