summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmadeusz Żołnowski <aidecoe@gentoo.org>2014-08-28 14:08:01 +0000
committerAmadeusz Żołnowski <aidecoe@gentoo.org>2014-08-28 14:08:01 +0000
commit73ae95c1b1890e173488f02c9f9bb11ea0c6c256 (patch)
treec4bb71a9c332f871277c618a1d522f65c25c7491 /net-mail/notmuch
parentCleanup old patch and remove warning for bug 519630 (diff)
downloadhistorical-73ae95c1b1890e173488f02c9f9bb11ea0c6c256.tar.gz
historical-73ae95c1b1890e173488f02c9f9bb11ea0c6c256.tar.bz2
historical-73ae95c1b1890e173488f02c9f9bb11ea0c6c256.zip
Moved check for /etc/mutt/notmuch-mutt.rc to pkg_preinst(). Now it should
work fine with binpkgs. Package-Manager: portage-2.2.10/cvs/Linux x86_64 Manifest-Sign-Key: 0xF0134531E1DBFAB5
Diffstat (limited to 'net-mail/notmuch')
-rw-r--r--net-mail/notmuch/ChangeLog6
-rw-r--r--net-mail/notmuch/Manifest18
-rw-r--r--net-mail/notmuch/notmuch-0.18.1.ebuild13
3 files changed, 21 insertions, 16 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/Manifest b/net-mail/notmuch/Manifest
index 39c69c791f2d..a17fe1ed6fba 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -9,17 +9,17 @@ DIST notmuch-0.17.tar.gz 606710 SHA256 d215e0e7e536c50bc0d8a455a58bb4ddabe0678cc
DIST notmuch-0.18.1.tar.gz 634691 SHA256 f2d53dc1916283123d008a6084de860340a436631e83b1a41b2d9ced0f4db7dd SHA512 4268a32036b42cbacb0b43d7838f67c83f2c20ad9018e44c51f6112e22f3ffe5847a9f1418527865447a2442ee6ab9e77cf05b61090c2a1f02356dde6eae8ece WHIRLPOOL dc35171b2a1b20acfc5a8de3993335893ea73b236066a2f88b9a7aa2fe3389f88b791e72c8c9f493548ef0fddb19abfabc9f7664b2bd2d404eb964ec67cc2458
EBUILD notmuch-0.16-r1.ebuild 4174 SHA256 6aeb9434308a0f68f4f6acedf999274db8a71e09a40ab02b7dab6a621072c694 SHA512 c0dca5b593829a677d40ba6db499a9dbc02ae8d720f46744d6907de2b652c427bc2791fcef1a179c2f2b125f969678bda2a8ceb1aeae7be6fb1e1b6b4f45e1a9 WHIRLPOOL d9b3eed485bb08882db36d9701f5ee0138781279817c1b80da1adf8a938271c5ced99579b03deb7c7085bc951502f3490890eccaf5f218ce25b138ebdb9be8d1
EBUILD notmuch-0.17.ebuild 3807 SHA256 a403ba90051af8a8b780cea53d68e2efc69740c75a67141027162d6654cf0828 SHA512 433215cbd7c3e4edd26a91d7dac64f1b02d1b7a86763ba421fe6b3736a3d3a1fd81ffb01e9e003a4fc5a60fec4c43f6274d4b5d2628a393a59012cbc400684ec WHIRLPOOL 0b307881e24c39d7b098fb87482a81000ecaf06e9728b2e2dbe93b5d8ff0915947f4e85548bee1330010bde36e0ffc263e085e33bf82b44aa62c900a602f673e
-EBUILD notmuch-0.18.1.ebuild 4089 SHA256 84be2f26b0d17f43eefdc775d809ba59c93062a0a97612474a1eba69328cfdb4 SHA512 5bc18e49cc94ae8c402703d95cf119b8f4ff7e215a99df65c5a51e25aa3aa7731f74446c839e71161e7469ecd1e19c7877d0210417834f855df8a75795540d3d WHIRLPOOL fe8e90568d73d84bf171eb96880793659d7bf4d9adea5c143ccc58ce553988cd249b04822132ad82dd596e693d88ed396801dfaa8bcf8d6edbcd9f4edc49c7cc
-MISC ChangeLog 29858 SHA256 9a5014baadeb2e83045ed78584dcceb50b9760ac9f28824a82c6fe5d3f4c57ce SHA512 ebc01e778407c323210a8b0c084adb55683f41a2c8c5a39ee249d9ad8271cb4ba2d7f7a7c37e527711cc214c9e0468a50907288485a8b3aa4e8a6d1ad14ab866 WHIRLPOOL df21d0a2e113fbf50a0fcbfb0d4ddbc4d9cf7da1063e63d7f31634dbb0464f578726af0ed264055e4997f45a73bc6c1f4af38644e553bf88aaa8327e39bdf8fe
+EBUILD notmuch-0.18.1.ebuild 4052 SHA256 cc1843b5536a0d422d5d1b89e5603d52e548955b3e8672a5716cba37298028c9 SHA512 10d35aa95fb95d29dd28413fd6a04a260445125a8367e0d7832d53208f666d10cb3a71f45ab4bcea8752f6c079458ee110a999e2fb2cb2cc4c7d59bf44c2f484 WHIRLPOOL 14a972eec59bf5cb8c1e21fa8e27345b76e5ed2e919c5ca9b99ae521d03fa3d7a56d84d6157da6d3fe143e8bc06022da0b5e135c7562e0648651f11faf41a51b
+MISC ChangeLog 30041 SHA256 c452520835c2a09aede9f6f66201195972c01f86657df9e2c5fe9515f01ab2bd SHA512 7af2884d63d20822c608b43d68797967f2e2f106ff6d25f28321e34351c92a3e1b89b9798150ad65bc6f592ca50dffb74fa00766480889948de8ca1561e48157 WHIRLPOOL 6532b9cad2a63cb9910a94a2232eb0b0ef0c1be2efd27e34d42d92441977497af1b4686e366875392f9963a7b47e95f0368d656442e237c8903dfbff652838e1
MISC metadata.xml 1074 SHA256 d47c3e91da2cbe2009bb0458e3858949883949b0aed2bf03b2dbd7ca7d4c1d14 SHA512 702cd1ad104daddbd22120ec417f2e7459e133d8a1fd2ff26f1485c6663949c63d00335c086fd298f8c251c3633e03d24575a1eb06ec29344577dd9dfea11792 WHIRLPOOL aa65462ae71e101d88b9d4b7eb1c1947c6bf794ea32c215916c41d592166c43334386e4e9196c98daa74b82049d73571b1533089e7319f9c2ca3e75b9ad0b63f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQEcBAEBCAAGBQJT/xTxAAoJEPATRTHh2/q1vScH/3aFVTRLrbkLI2IupycaoBBW
-S9vAg3UFbXjD6Zc9msiVebhKUNIlKiXhmJOxPbRPiuWLS3BnpoZ/MoqcQP+PpnaW
-0N+NiZfYTlEALWVedEZL6uGoCvla1Mz5qxGKXGn2/R7GGZEO+rnjXudkpIHiiu19
-8V00uaOD+oIZlVsRzgUtCVRFl0uur/VvNxqR/Z1sJh7ASJMazgovs20Plig9bKOI
-+35nbnkoZ4LpLZb2flu0NI1UVJUyUCUYaQeHOB46VDBRxBO0Ns/kYi4sK5qOh1R/
-1Y3KtWwUeeSy5ZIiNNXq664VHdT7bA4TVRTt9w4/UIlSzxq0MsZ5ws9mItkHFys=
-=0GFN
+iQEcBAEBCAAGBQJT/ze8AAoJEPATRTHh2/q1jHoH/1Cx+EpdFmG4z6+zNiQxRyZx
+D+4vp6UDIUqTks1MTlXeRg047lOmtURPiUlBvJqOr4w+W6MsmWwyow3GJsbaKAwh
+Tf4IaNFnOGK4ck0ygL+DxgiQ2ov07rgxoptwC9YE1rTrkriDfUKQJ0edNlMC9fCd
+KHaWrJpsynwZLuaPxb+hqqQ8DY+zdM6u+rd+6Gbq0A6ZgZzUtd2o9dkYBhlC5Lk1
+Eww6ORRfvCfdzpcklb1m5e8dEl6+XpaHENHv3RPXg7bmhTV+wCAh8VwLhG3cIlnh
+XhAv5aJ5i1bOk5OSGgs8MVPzPBmZ8ut/3HuscJAZbtrv08Jt+kQbzoQTwR6NR38=
+=yTH4
-----END PGP SIGNATURE-----
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
}