commit: f62a8afb27f7b9f5dcc9e6c846001efcf0c97174
Author: Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 6 17:31:11 2017 +0000
Commit: Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Fri Oct 6 17:31:33 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f62a8afb
mail-client/neomutt: Version bump to 20171006
Package-Manager: Portage-2.3.8, Repoman-2.3.3
mail-client/neomutt/Manifest | 1 +
...eomutt.patch => 0001-Rename-mutt-to-neomutt-20171006.patch} | 6 +++---
...to-neomutt.patch => 0001-Rename-mutt-to-neomutt-9999.patch} | 0
mail-client/neomutt/neomutt-20170912.ebuild | 2 +-
.../{neomutt-20170912.ebuild => neomutt-20171006.ebuild} | 10 ++++------
mail-client/neomutt/neomutt-9999.ebuild | 2 +-
6 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/mail-client/neomutt/Manifest b/mail-client/neomutt/Manifest
index 4f8cd512557..273709d7264 100644
--- a/mail-client/neomutt/Manifest
+++ b/mail-client/neomutt/Manifest
@@ -1,2 +1,3 @@
DIST neomutt-20170714.tar.gz 2509160 SHA256
40d48920f95ca49ab96eb109b658f5cf6e1c222320c58bdd03769c1355d7a383 SHA512
eb31d2f23b7211904cd66ba293c008f953778b37f13fd09d4db571d013f1c8e6449fccd827872f3ad0a2c8e62555f92b3f9591a1f0f4ac37ab362a4681abaaa0
WHIRLPOOL
455495501a2ab1989d5f3bfa75aa2370896956cdfd7d2e852e225c96aa23a1abdaf2dbb9d886d1d96486d19b2b38c225e8263f268ebafcef8cbd0024885189f3
DIST neomutt-20170912.tar.gz 2533245 SHA256
9f0d128fe8dbbbddb67e2b629f8b5e52a9d892f82c735845c1708c14e3046657 SHA512
7551da47029667443257d9d370af7217846abf988d1469c4e08f367ef0bce2dfb658321df27176622bbd07e6d46c320380749d4ce05ee39cb1e8d9b6c3e1d7e6
WHIRLPOOL
0dad6380acf5b6f891bcb77388023de27d23e4ea8ad0eb3563c1704de555a2fc54604d47b9b67557c6ab0310e1c365c786a1952f6794b2012594f1c19033ad3c
+DIST neomutt-20171006.tar.gz 2706019 SHA256
86e9d945919438a377828b15f03c8690f639062e44151e219e2f8443ae27147c SHA512
adfa702ee642ce58b11dab1d2b805626d8f90e8cc88731cb7e051df5b785010ac43d90eb14d2a5ace02d3abaf921c9f36f86f627063036bcb7f5724912ca134d
WHIRLPOOL
75f2a0c8881b769f1a7acd8c0e7724baf0a2943a68a4029d74d32a5a5ed3203c32ce3704b3271a8e05f02c233273319437a593ffad9df5e1b988f8725f0f2433
diff --git a/mail-client/neomutt/files/0001-Rename-mutt-to-neomutt.patch
b/mail-client/neomutt/files/0001-Rename-mutt-to-neomutt-20171006.patch
similarity index 96%
copy from mail-client/neomutt/files/0001-Rename-mutt-to-neomutt.patch
copy to mail-client/neomutt/files/0001-Rename-mutt-to-neomutt-20171006.patch
index 319adafc80b..b0c4673f3a9 100644
--- a/mail-client/neomutt/files/0001-Rename-mutt-to-neomutt.patch
+++ b/mail-client/neomutt/files/0001-Rename-mutt-to-neomutt-20171006.patch
@@ -1,4 +1,4 @@
-From 8bbf8197154cea2cfec0236a0fad6e7c1eff8163 Mon Sep 17 00:00:00 2001
+From ac4562d86f6d920044a30b196cdab7a94e44d46a Mon Sep 17 00:00:00 2001
From: Nicolas Bock <nicolasb...@gmail.com>
Date: Mon, 2 Oct 2017 14:04:34 -0600
Subject: [PATCH] Rename mutt to neomutt
@@ -11,7 +11,7 @@ Subject: [PATCH] Rename mutt to neomutt
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Makefile.am b/Makefile.am
-index b00d1f8a..08a16a7e 100644
+index d3e125b4..ea9ff58c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -62,8 +62,8 @@ nodist_neomutt_SOURCES = $(BUILT_SOURCES)
@@ -26,7 +26,7 @@ index b00d1f8a..08a16a7e 100644
neomutt_LDADD = $(MUTT_LIB_OBJECTS) $(LIBOBJS) $(HCACHE_LIBS) $(NCRYPT_LIBS) \
$(LIBIMAP) $(LIBMUTT) $(LIBICONV) $(GPGME_LIBS) $(INTLLIBS)
diff --git a/configure.ac b/configure.ac
-index 0299f921..667b7f65 100644
+index 7a3cfad9..4e2968fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -184,7 +184,7 @@ AC_ARG_WITH(mailpath,
diff --git a/mail-client/neomutt/files/0001-Rename-mutt-to-neomutt.patch
b/mail-client/neomutt/files/0001-Rename-mutt-to-neomutt-9999.patch
similarity index 100%
rename from mail-client/neomutt/files/0001-Rename-mutt-to-neomutt.patch
rename to mail-client/neomutt/files/0001-Rename-mutt-to-neomutt-9999.patch
diff --git a/mail-client/neomutt/neomutt-20170912.ebuild
b/mail-client/neomutt/neomutt-20170912.ebuild
index 404b40f4688..af1e426e2d5 100644
--- a/mail-client/neomutt/neomutt-20170912.ebuild
+++ b/mail-client/neomutt/neomutt-20170912.ebuild
@@ -98,7 +98,7 @@ src_install() {
rm "${ED}"/etc/${PN}/mime.types || die
dosym "${EPREFIX}/etc/mime.types" /etc/${PN}/mime.types
- ## A man-page is always handy, so fake one
+ # A man-page is always handy, so fake one
if use !doc; then
emake -C doc muttrc.man
# make the fake slightly better, bug #413405
diff --git a/mail-client/neomutt/neomutt-20170912.ebuild
b/mail-client/neomutt/neomutt-20171006.ebuild
similarity index 91%
copy from mail-client/neomutt/neomutt-20170912.ebuild
copy to mail-client/neomutt/neomutt-20171006.ebuild
index 404b40f4688..1adc070a098 100644
--- a/mail-client/neomutt/neomutt-20170912.ebuild
+++ b/mail-client/neomutt/neomutt-20171006.ebuild
@@ -95,19 +95,17 @@ src_install() {
emake DESTDIR="${D}" install
# A newer file is provided by app-misc/mime-types. So we link it.
- rm "${ED}"/etc/${PN}/mime.types || die
- dosym "${EPREFIX}/etc/mime.types" /etc/${PN}/mime.types
- ## A man-page is always handy, so fake one
+ # A man-page is always handy, so fake one
if use !doc; then
- emake -C doc muttrc.man
+ emake -C doc neomuttrc.man
# make the fake slightly better, bug #413405
sed -e 's#@docdir@/manual.txt#http://www.neomutt.org/guide#' \
-e 's#in @docdir@,#at http://www.neomutt.org/,#' \
-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
-e "s#@bindir@#${EPREFIX}/usr/bin#" \
- doc/mutt.man > neomutt.1 || die
- cp doc/muttrc.man neomuttrc.5 || die
+ doc/neomutt.man > neomutt.1 || die
+ cp doc/neomuttrc.man neomuttrc.5 || die
doman neomutt.1 neomuttrc.5
fi
diff --git a/mail-client/neomutt/neomutt-9999.ebuild
b/mail-client/neomutt/neomutt-9999.ebuild
index efec30f01e8..67c81d2fa7f 100644
--- a/mail-client/neomutt/neomutt-9999.ebuild
+++ b/mail-client/neomutt/neomutt-9999.ebuild
@@ -55,7 +55,7 @@ RDEPEND="${CDEPEND}
S="${WORKDIR}/${PN}-${P}"
src_prepare() {
- eapply "${FILESDIR}/0001-Rename-mutt-to-neomutt.patch"
+ eapply "${FILESDIR}/0001-Rename-mutt-to-neomutt-${PV}.patch"
eapply_user
AT_M4DIR="m4" eautoreconf
}
