From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9F377138330 for ; Sun, 18 Sep 2016 13:17:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 15AD4E0B10; Sun, 18 Sep 2016 13:17:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6BDDEE0B10 for ; Sun, 18 Sep 2016 13:17:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DE685340B1F for ; Sun, 18 Sep 2016 13:17:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 547212478 for ; Sun, 18 Sep 2016 13:17:15 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1474204592.e741758ef6abc12874f62cedc4021e18f018e762.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/mutt/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-client/mutt/mutt-1.7.0-r4.ebuild X-VCS-Directories: mail-client/mutt/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: e741758ef6abc12874f62cedc4021e18f018e762 X-VCS-Branch: master Date: Sun, 18 Sep 2016 13:17:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0a63f6cf-b82a-495a-97c8-98b093a438d7 X-Archives-Hash: 14272cd64aa795303d80efcc8ba6ba11 commit: e741758ef6abc12874f62cedc4021e18f018e762 Author: Fabian Groffen gentoo org> AuthorDate: Sun Sep 18 13:16:20 2016 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sun Sep 18 13:16:32 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e741758e mail-client/mutt: revise 1.7.0 ebuild - drop NeoMutt references since we're no longer on it - re-introduce USE=vanilla for upstream bug reports - only show SmartTime warning for upgrade to 1.7 Package-Manager: portage-2.2.28 mail-client/mutt/mutt-1.7.0-r4.ebuild | 78 ++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 38 deletions(-) diff --git a/mail-client/mutt/mutt-1.7.0-r4.ebuild b/mail-client/mutt/mutt-1.7.0-r4.ebuild index 0aff2a1..470118b 100644 --- a/mail-client/mutt/mutt-1.7.0-r4.ebuild +++ b/mail-client/mutt/mutt-1.7.0-r4.ebuild @@ -6,16 +6,16 @@ EAPI="6" inherit eutils flag-o-matic autotools -#NEOMUTT="neomutt-20160710" -NEOMUTT="gentoo-${PVR}" +PATCHREV="r4" +PATCHSET="gentoo-${PVR}/${PATCHREV}" DESCRIPTION="A small but very powerful text-based mail client" HOMEPAGE="http://www.mutt.org/" +MUTT_G_PATCHES="mutt-gentoo-1.7.0-patches-${PATCHREV}.tar.xz" SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz - https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-1.7.0-patches-r4.tar.xz" - #https://github.com/neomutt/integration/archive/${NEOMUTT}.tar.gz -> ${P}-patches-${NEOMUTT}.tar.gz" -IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet" + https://dev.gentoo.org/~grobian/distfiles/${MUTT_G_PATCHES}" +IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla" SLOT="0" LICENSE="GPL-2" KEYWORDS="~alpha ~amd64 ~x86 ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" @@ -84,40 +84,37 @@ RDEPEND="${CDEPEND} " src_prepare() { - #local PATCHDIR="${WORKDIR}"/integration-${NEOMUTT} local PATCHDIR="${WORKDIR}"/gentoo-mutt-1.7.0-patches - # apply NeoMutt patches - export EPATCH_FORCE="yes" - export EPATCH_SUFFIX="patch" - # order of patches from README.md - local patches=( - patches-mutt - #bugs-common - bugs-gentoo - features-common - features-extra - #bugs-neomutt - gentoo - ) - local patchset - for patchset in "${patches[@]}" ; do - einfo "Applying NeoMutt ${NEOMUTT} patchset ${patchset}" - EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \ - || die "NeoMutt patchset ${patchset} failed" - done - # add some explanation as to why not going to upstream - sed -i \ - -e '/ReachingUs = N_(/a\"This release of Mutt is heavily enriched by NeoMutt patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor directly to the NeoMutt project.\\n"' \ - version.c || die "Failed to add bug instructions" + if use !vanilla ; then + # apply patches + export EPATCH_FORCE="yes" + export EPATCH_SUFFIX="patch" + local patches=( + patches-mutt + bugs-gentoo + features-common + features-extra + gentoo + ) + local patchset + for patchset in "${patches[@]}" ; do + einfo "Applying ${PATCHSET} patchset ${patchset}" + EPATCH_SOURCE="${PATCHDIR}"/${patchset} epatch \ + || die "patchset ${patchset} failed" + done + # add some explanation as to why not to go upstream + sed -i \ + -e '/ReachingUs = N_(/a\"This release of Mutt is heavily enriched with patches.\\nFor this reason, any bugs are better reported at https://bugs.gentoo.org/\\nor re-emerge with USE=vanilla and try to reproduce your problem.\\n"' \ + version.c || die "Failed to add bug instructions" + fi local upatches= # allow user patches eapply_user && upatches=" with user patches" # patch version string for bug reports - #rm VERSION.neo || die # we already flag it appropriate - sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}${upatches}, NeoMutt ${NEOMUTT})"'"/' \ + sed -i -e 's|"Mutt %s (%s)"|"Mutt %s (%s, '"${PATCHSET}${upatches}"')"|' \ muttlib.c || die "failed patching in Gentoo version" # many patches touch the buildsystem, we always need this @@ -253,12 +250,17 @@ pkg_postinst() { elog " https://wiki.gentoo.org/wiki/Mutt" echo else - echo - elog "This version of Mutt is entirely based on NeoMutt patches." - elog "Please visit http://www.neomutt.org/ to learn more about this project." - elog "As a result, SmartTime functionality has been replaced with" - elog "CondDate feature. To mimic SmartTime, use this CondDate formatter:" - elog "%<[12m?%<[7d?%<[12H?%[%H:%M ]&%[%a-%d]>&%[%d-%b]>&%[%b-%y]>" - echo + local ver + local preconddate= + for ver in ${REPLACING_VERSIONS} ; do + [[ ${ver} == "1.5"* || ${ver} == "1.6"* ]] && preconddate=true + done + if [[ -n ${preconddate} ]] ; then + echo + elog "The SmartTime functionality has been replaced with" + elog "CondDate feature. To mimic SmartTime, use this CondDate formatter:" + elog "%<[12m?%<[7d?%<[12H?%[%H:%M ]&%[%a-%d]>&%[%d-%b]>&%[%b-%y]>" + echo + fi fi }