commit:     31d2fc131967cf504fe6e816b5f8697868511b90
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 13 16:06:13 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Oct 13 16:06:20 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31d2fc13

mail-client/mutt: remove old ebuilds

Package-Manager: portage-2.3.0

 mail-client/mutt/Manifest             |   6 -
 mail-client/mutt/mutt-1.6.1-r1.ebuild | 271 ----------------------------------
 mail-client/mutt/mutt-1.6.2.ebuild    | 260 --------------------------------
 mail-client/mutt/mutt-1.7.0-r5.ebuild | 266 ---------------------------------
 4 files changed, 803 deletions(-)

diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index cdfec20..ff7c8bd 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -2,11 +2,5 @@ DIST mutt-1.5.23-gentoo-patches-r7.tar.bz2 167553 SHA256 
354bd25bdba4f58b4bfcbc8
 DIST mutt-1.5.23.tar.gz 3782032 SHA256 
3af0701e57b9e1880ed3a0dee34498a228939e854a16cdccd24e5e502626fd37 SHA512 
f1b4a7230253651857f61bd7215cce870a613012f613d4c907d401556083726c8ed7d429d57a8bf858c3b5b23683380d4c1494540d86ca80813e22cb6b95bc1e
 WHIRLPOOL 
b5a676d204aece8c572d57a027fa5a402b7afe8e5b7d4c83b2d1b1612eb0ac5cb58cd225757732a017f03444e0ea42dacffcf1cf2d46c18ae92d7d3306059c61
 DIST mutt-1.5.24-gentoo-patches-r1.tar.bz2 118546 SHA256 
411ad728404f4e7743b82bb79020776ce5bdf614772c387b15992e14f7c444d2 SHA512 
c19e6627683b91119bbbfcd5b3250cb3fb79ff9d62b45861002c50ac232f65447744313921fe10a517efb9cb93f5638615d5b8ce1dd946fab3083bd9eaffefc1
 WHIRLPOOL 
cbd1a3858e3b187117e26718066a2f2dd9c690aca3a77b050142d12b96599adada1a8a723b91b000f9eda92d9ceed284a1ac5cdd243de8085a233f01fac003d7
 DIST mutt-1.5.24.tar.gz 3897115 SHA256 
a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200 SHA512 
f7fe7edf9d1701a8e92761b1f5e6ef2e3a3b513af7898872cbe36a8800714cb76945788a60d2008820c57bc5344a4147e2686f690da42cfc8a912e3a432452b1
 WHIRLPOOL 
35408cabab100e688f8c6d0d598f79144b7c72fb31f41a720acb9a6381e7ca94d66e640fe1178b911cfb16dfde4c982362c4c78ea203aef3a3dbcba09dcdc023
-DIST mutt-1.6.1-gentoo-patches-r5.tar.xz 173228 SHA256 
cce80ae3b385ed43bedb3674859cb971644c71dde2ac4b00ce4fd94e52eda6a1 SHA512 
c328fa30cf0e3ed14753d0c95daac62d295dfb5c4482323b7bfdc7af89e3d4563678101e74d39c8cdccd40f49e8fca5becd1a211c75e44f66e85190bc8b0ee64
 WHIRLPOOL 
9893878cc6c262b0564920b71d2e906c2f8b0c199e3f7e6883779be63b0af03fdc7a581bc8295c038fb2184d7114a8446356785eb0dfb2680e747e897f6983b4
-DIST mutt-1.6.1.tar.gz 3956840 SHA256 
98b26cecc6b1713082fc880344fa345c20bd7ded6459abe18c84429c7cf8ed20 SHA512 
a45c7bc681ea31a6ee37e95a11f3ec84f580478367250c80eaf5aceeba87e34411346a8b7e80a0f236c507cec1199ddc3ccf4596b81d7e31c235099dccdd4fd5
 WHIRLPOOL 
8cc8e699fbf1832eb411f4f3d59eac57450afade4ddfee3ecb89c0bbaaa92414779f8f2015ec05a9ed19deb88b40298b2f786afb91acbfc2a44a3f8f4876a712
-DIST mutt-1.6.2-patches-neomutt-20160710.tar.gz 498925 SHA256 
9bceb0cbc66ccbdebe9d6e043125a4589586bc8bfded61168f9ed0a9956f6d67 SHA512 
1d9aa8f29cef200c84fbb0e33b1c6d5f9abffb1b038bacf1a1da3b35e9faa2dc6cc43656eaf5a8e3f6ee2af3f999ccee54ce0e842950ac7b7036e83fdbcb8d04
 WHIRLPOOL 
fae79c8d419f8c3cc1e527c9b4f20c2b1257c3e86fac066f6fc9dafe8262417a181685f8d3f2cabfed34fcb1dd42077171a89ac1f04b0ca6d7f8ee74d3e16ed6
-DIST mutt-1.6.2.tar.gz 3956745 SHA256 
c5d02ef06486cdf04f9eeb9e9d7994890d8dfa7f47e7bfeb53a2a67da2ac1d8e SHA512 
c4348ba55459a2f9d5bedda1ec63b7520c0bdcd285bf791972dbd11a947be47e7c88b02c7d244e65c7c0f1be252c43240b570457a5812bf8160611bba7b01916
 WHIRLPOOL 
4adf29c59dffa50f5e7c8500a81f89ddbda894ade20bc3110cbedefbcdd7db3c2e84aae78d0cb4bc74930a94256738a3b0b1880b840fd81ec433b23b609887de
-DIST mutt-1.7.0.tar.gz 4019567 SHA256 
1d3e987433d8c92ef88a604f4dcefdb35a86ce73f3eff0157e2e491e5b55b345 SHA512 
60ff00f268285c12b48e39ca0b5a8bd7e09323255874a6211edc94218ed191ad24ad437dd9c180c45ea6d5a9f163d04bb5515ddf3488c92f4e9411588c550612
 WHIRLPOOL 
90d28dcb1b522e4cf1ce995e7dad69b5546f26e6878f7d1c2785c9e7e2c12fdfd464c7b2490fa7efa873aa22cf117f7369b1a69adfb1c9efe13e61ed15e27e05
 DIST mutt-1.7.1.tar.gz 4025008 SHA256 
e9c6f88e83d48690033f0d862a70293ac746286b77241554f5448bc23bd0d6df SHA512 
c0b0be7ba792ecf42bb63c31aa03889b4998474a7cac9a839df3041b0bb72766da140bbb38e70eab5f78f4503d684c9c20620c599c0970ec6933624d22f4613d
 WHIRLPOOL 
f63a8e8fd0a403f596c041f2afc8e73db7a0b6ba48749e3cdc6663aae9f114589056cc3ddef7dc5c9e1a9282b607e4f76445ecdc6213cc3a337f8cf2284ba2e5
-DIST mutt-gentoo-1.7.0-patches-r5.tar.xz 157172 SHA256 
d9370439e6200d75ba9c6705561a408325c07b18f248f59457b45fa09cb080b0 SHA512 
758a189ec33d346f4dcc9afad7d5d8b7092c89917a7fe40fbb75803fde0469d8dd197bc360d6e7a3897210973846bec6f7451bee3e4c6b1296e0d8fe8d0db39d
 WHIRLPOOL 
6d26015f7827b182941b9903a2ee0ddaeee2788047c50fb8e67c4466f8403a83252139185cddd72058f790c465783f4e1e637c6fb936a3b25a58f6062458de27
 DIST mutt-gentoo-1.7.1-patches-r1.tar.xz 151368 SHA256 
f70d1cd72fbba24b0ab18fcd60a43c61c416b17185c740f97f7a8c3dda182acc SHA512 
3ba00cccea6029986db2c75343a86ed6a1da8e55c4066c7a99a54a8612c1e5d8512e5d58e49be9d6721c8a989775042415ec49055680ac120d267a304bf41f4c
 WHIRLPOOL 
c120f0108d6323e4d1b1597f3a491c2c842825aabf3ac876ab2c7d5c8360a8465ec46eea1b1a5953a28fcf91439971c053e4b806e3dbdf34d5a966f827944ff2

diff --git a/mail-client/mutt/mutt-1.6.1-r1.ebuild 
b/mail-client/mutt/mutt-1.6.1-r1.ebuild
deleted file mode 100644
index edd3d08..00000000
--- a/mail-client/mutt/mutt-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-
-inherit eutils flag-o-matic autotools
-
-PATCHSET_REV="-r5"
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org/";
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-       https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
-       ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
-       mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.xz
-       
https://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.xz";
-IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox 
nls nntp pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
-CDEPEND="
-       app-misc/mime-types
-       nls? ( virtual/libintl )
-       tokyocabinet?  ( dev-db/tokyocabinet )
-       !tokyocabinet? (
-               qdbm?  ( dev-db/qdbm )
-               !qdbm? (
-                       gdbm?  ( sys-libs/gdbm )
-                       !gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
-               )
-       )
-       imap?    (
-               gnutls?  ( >=net-libs/gnutls-1.0.17 )
-               !gnutls? (
-                       ssl? (
-                               !libressl? ( >=dev-libs/openssl-0.9.6:0 )
-                               libressl? ( dev-libs/libressl )
-                       )
-               )
-               sasl?    ( >=dev-libs/cyrus-sasl-2 )
-       )
-       kerberos? ( virtual/krb5 )
-       pop?     (
-               gnutls?  ( >=net-libs/gnutls-1.0.17 )
-               !gnutls? (
-                       ssl? (
-                               !libressl? ( >=dev-libs/openssl-0.9.6:0 )
-                               libressl? ( dev-libs/libressl )
-                       )
-               )
-               sasl?    ( >=dev-libs/cyrus-sasl-2 )
-       )
-       smtp?     (
-               gnutls?  ( >=net-libs/gnutls-1.0.17 )
-               !gnutls? (
-                       ssl? (
-                               !libressl? ( >=dev-libs/openssl-0.9.6:0 )
-                               libressl? ( dev-libs/libressl )
-                       )
-               )
-               sasl?    ( >=dev-libs/cyrus-sasl-2 )
-       )
-       idn?     ( net-dns/libidn )
-       gpg?     ( >=app-crypt/gpgme-0.9.0 )
-       smime?   (
-               !libressl? ( >=dev-libs/openssl-0.9.6:0 )
-               libressl? ( dev-libs/libressl )
-       )
-       slang? ( sys-libs/slang )
-       !slang? ( >=sys-libs/ncurses-5.2:0 )
-"
-DEPEND="${CDEPEND}
-       net-mail/mailbase
-       doc? (
-               dev-libs/libxml2
-               dev-libs/libxslt
-               app-text/docbook-xsl-stylesheets
-               || ( www-client/lynx www-client/w3m www-client/elinks )
-       )"
-RDEPEND="${CDEPEND}
-       selinux? ( sec-policy/selinux-mutt )
-"
-PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV}
-
-src_prepare() {
-       # Post-release hot-fixes grabbed from HG, this is what all following
-       # patches are based on in my Mercurial patchqueue (mq).
-       # If you ever take over or need to modify patches here, just check
-       # out the gentoo branch(es) of Gentoo's Mutt Mercurial clone, and
-       # the patchqueue as it'll save you a lot of work.
-       # http://hg.code.sf.net/p/gentoomutt/code/
-       # http://hg.code.sf.net/p/gentoomuttpatches/code/
-       for rev in $(eval echo {0..${PR#r}}) ; do
-               local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
-               [[ -e ${revpatch} ]] && \
-                       epatch "${revpatch}"
-       done
-       # fix compilation with ncurses[tinfo], #459260
-       epatch "${PATCHDIR}"/ncurses-tinfo.patch
-
-       # this patch is non-generic and only works because we use a sysconfdir
-       # different from the one used by the mailbase ebuild
-       use prefix && epatch "${PATCHDIR}"/prefix-mailcap.patch
-
-       # must have fixes to compile or behave correctly, upstream
-       # ignores, disagrees or simply doesn't respond/apply
-       epatch "${PATCHDIR}"/bdb-prefix.patch # fix bdb detection
-       # same category, but functional bits
-       epatch "${PATCHDIR}"/dont-reveal-bbc.patch
-
-       # the big feature patches that upstream doesn't want to include, but
-       # nearly every distro has due to their usefulness
-       for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do
-               epatch "${p}"
-       done
-
-       local upatches=
-       # allow user patches
-       eapply_user && upatches=" with user patches"
-
-       # patch version string for bug reports
-       sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo 
'"${PVR}${upatches}"')"/' \
-               muttlib.c || die "failed patching in Gentoo version"
-
-       # many patches touch the buildsystem, we always need this
-       AT_M4DIR="m4" eautoreconf
-
-       # the configure script contains some "cleverness" whether or not to 
setgid
-       # the dotlock program, resulting in bugs like #278332
-       sed -i -e 's/@DOTLOCK_GROUP@//' \
-               Makefile.in || die "sed failed"
-
-       # don't just build documentation (lengthy process, with big 
dependencies)
-       if use !doc ; then
-               sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
-       fi
-}
-
-src_configure() {
-       local myconf="
-               $(use_enable crypt pgp) \
-               $(use_enable debug) \
-               $(use_enable gpg gpgme) \
-               $(use_enable imap) \
-               $(use_enable nls) \
-               $(use_enable nntp) \
-               $(use_enable pop) \
-               $(use_enable sidebar) \
-               $(use_enable smime) \
-               $(use_enable smtp) \
-               $(use_with idn) \
-               $(use_with kerberos gss) \
-               $(use slang && echo --with-slang=${EPREFIX}/usr) \
-               $(use !slang && echo --with-curses=${EPREFIX}/usr) \
-               --enable-compressed \
-               --enable-external-dotlock \
-               --enable-nfs-fix \
-               --sysconfdir=${EPREFIX}/etc/${PN} \
-               --with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR} \
-               --with-regex \
-               --with-exec-shell=${EPREFIX}/bin/sh"
-
-       case $CHOST in
-               *-solaris*)
-                       # Solaris has no flock in the standard headers
-                       myconf+=" --enable-fcntl --disable-flock"
-                       # wchar_t depends on locale
-                       myconf+=" --without-wc-funcs"
-               ;;
-               *)
-                       myconf+=" --disable-fcntl --enable-flock"
-               ;;
-       esac
-
-       # mutt prioritizes gdbm over bdb, so we will too.
-       # hcache feature requires at least one database is in USE.
-       if use tokyocabinet; then
-               myconf="${myconf} --enable-hcache \
-                       --with-tokyocabinet --without-qdbm --without-gdbm 
--without-bdb"
-       elif use qdbm; then
-               myconf="${myconf} --enable-hcache \
-                       --without-tokyocabinet --with-qdbm --without-gdbm 
--without-bdb"
-       elif use gdbm ; then
-               myconf="${myconf} --enable-hcache \
-                       --without-tokyocabinet --without-qdbm --with-gdbm 
--without-bdb"
-       elif use berkdb; then
-               myconf="${myconf} --enable-hcache \
-                       --without-tokyocabinet --without-qdbm --without-gdbm 
--with-bdb"
-       else
-               myconf="${myconf} --disable-hcache \
-                       --without-tokyocabinet --without-qdbm --without-gdbm 
--without-bdb"
-       fi
-
-       # there's no need for gnutls, ssl or sasl without socket support
-       if use pop || use imap || use smtp ; then
-               if use gnutls; then
-                       myconf="${myconf} --with-gnutls"
-               elif use ssl; then
-                       myconf="${myconf} --with-ssl"
-               fi
-               # not sure if this should be mutually exclusive with the other 
two
-               myconf="${myconf} $(use_with sasl)"
-       else
-               myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
-       fi
-
-       if use mbox; then
-               myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
-       else
-               myconf="${myconf} --with-homespool=Maildir"
-       fi
-
-       econf ${myconf} || die "configure failed"
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "install failed"
-       if use mbox; then
-               insinto /etc/mutt
-               newins "${FILESDIR}"/Muttrc.mbox Muttrc
-       else
-               insinto /etc/mutt
-               doins "${FILESDIR}"/Muttrc
-       fi
-
-       # A newer file is provided by app-misc/mime-types. So we link it.
-       rm "${ED}"/etc/${PN}/mime.types
-       dosym /etc/mime.types /etc/${PN}/mime.types
-
-       # A man-page is always handy, so fake one
-       if use !doc; then
-               emake -C doc DESTDIR="${D}" muttrc.man || die
-               # make the fake slightly better, bug #413405
-               sed -e 
's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \
-                       -e 's#in @docdir@,#at http://www.mutt.org/,#' \
-                       -e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
-                       -e "s#@bindir@#${EPREFIX}/usr/bin#" \
-                       doc/mutt.man > mutt.1
-               cp doc/muttbug.man flea.1
-               cp doc/muttrc.man muttrc.5
-               doman mutt.1 flea.1 muttrc.5
-       else
-               # nuke manpages that should be provided by an MTA, bug #177605
-               rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
-                       || ewarn "failed to remove files, please file a bug"
-       fi
-
-       if use !prefix ; then
-               fowners root:mail /usr/bin/mutt_dotlock
-               fperms g+s /usr/bin/mutt_dotlock
-       fi
-
-       dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
-}
-
-pkg_postinst() {
-       if [[ -z ${REPLACING_VERSIONS} ]] ; then
-               echo
-               elog "If you are new to mutt you may want to take a look at"
-               elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
-               elog "   https://wiki.gentoo.org/wiki/Mutt";
-               echo
-       elif use sidebar ; then
-               echo
-               elog "The sidebar patch has changed config names, please see"
-               elog "the following page for a list of new names:"
-               elog 
"http://www.neomutt.org/sidebar-intro.html#intro-sidebar-config-changes";
-               echo
-       fi
-}

diff --git a/mail-client/mutt/mutt-1.6.2.ebuild 
b/mail-client/mutt/mutt-1.6.2.ebuild
deleted file mode 100644
index 6562b57..00000000
--- a/mail-client/mutt/mutt-1.6.2.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-
-inherit eutils flag-o-matic autotools
-
-NEOMUTT="neomutt-20160710"
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org/";
-SRC_URI="ftp://ftp.mutt.org/pub/mutt/${P}.tar.gz
-       https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
-       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"
-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"
-CDEPEND="
-       app-misc/mime-types
-       nls? ( virtual/libintl )
-       tokyocabinet?  ( dev-db/tokyocabinet )
-       !tokyocabinet? (
-               qdbm?  ( dev-db/qdbm )
-               !qdbm? (
-                       gdbm?  ( sys-libs/gdbm )
-                       !gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
-               )
-       )
-       imap?    (
-               gnutls?  ( >=net-libs/gnutls-1.0.17 )
-               !gnutls? (
-                       ssl? (
-                               !libressl? ( >=dev-libs/openssl-0.9.6:0 )
-                               libressl? ( dev-libs/libressl )
-                       )
-               )
-               sasl?    ( >=dev-libs/cyrus-sasl-2 )
-       )
-       kerberos? ( virtual/krb5 )
-       pop?     (
-               gnutls?  ( >=net-libs/gnutls-1.0.17 )
-               !gnutls? (
-                       ssl? (
-                               !libressl? ( >=dev-libs/openssl-0.9.6:0 )
-                               libressl? ( dev-libs/libressl )
-                       )
-               )
-               sasl?    ( >=dev-libs/cyrus-sasl-2 )
-       )
-       smtp?     (
-               gnutls?  ( >=net-libs/gnutls-1.0.17 )
-               !gnutls? (
-                       ssl? (
-                               !libressl? ( >=dev-libs/openssl-0.9.6:0 )
-                               libressl? ( dev-libs/libressl )
-                       )
-               )
-               sasl?    ( >=dev-libs/cyrus-sasl-2 )
-       )
-       idn?     ( net-dns/libidn )
-       gpg?     ( >=app-crypt/gpgme-0.9.0 )
-       smime?   (
-               !libressl? ( >=dev-libs/openssl-0.9.6:0 )
-               libressl? ( dev-libs/libressl )
-       )
-       notmuch? ( net-mail/notmuch )
-       slang? ( sys-libs/slang )
-       !slang? ( >=sys-libs/ncurses-5.2:0 )
-"
-DEPEND="${CDEPEND}
-       net-mail/mailbase
-       doc? (
-               dev-libs/libxml2
-               dev-libs/libxslt
-               app-text/docbook-xsl-stylesheets
-               || ( www-client/lynx www-client/w3m www-client/elinks )
-       )"
-RDEPEND="${CDEPEND}
-       selinux? ( sec-policy/selinux-mutt )
-"
-
-src_prepare() {
-       local PATCHDIR="${WORKDIR}"/integration-${NEOMUTT}
-
-       # apply NeoMutt patches
-       export EPATCH_FORCE="yes"
-       export EPATCH_SUFFIX="patch"
-       # order of patches from README.md
-       local patches=(
-               bugs-common
-               features-common
-               features-extra
-               bugs-neomutt
-               gentoo-pre
-               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\\n"' \
-               version.c || die "Failed to add bug instructions"
-
-       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})"'"/' \
-               muttlib.c || die "failed patching in Gentoo version"
-
-       # many patches touch the buildsystem, we always need this
-       AT_M4DIR="m4" eautoreconf
-
-       # the configure script contains some "cleverness" whether or not to 
setgid
-       # the dotlock program, resulting in bugs like #278332
-       sed -i -e 's/@DOTLOCK_GROUP@//' \
-               Makefile.in || die "sed failed"
-
-       # don't just build documentation (lengthy process, with big 
dependencies)
-       if use !doc ; then
-               sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
-       fi
-}
-
-src_configure() {
-       local myconf="
-               $(use_enable crypt pgp) \
-               $(use_enable debug) \
-               $(use_enable gpg gpgme) \
-               $(use_enable imap) \
-               $(use_enable nls) \
-               $(use_enable nntp) \
-               $(use_enable pop) \
-               $(use_enable sidebar) \
-               $(use_enable smime) \
-               $(use_enable smtp) \
-               $(use_enable notmuch) \
-               $(use_with idn) \
-               $(use_with kerberos gss) \
-               $(use slang && echo --with-slang=${EPREFIX}/usr) \
-               $(use !slang && echo --with-curses=${EPREFIX}/usr) \
-               --enable-compressed \
-               --enable-external-dotlock \
-               --enable-nfs-fix \
-               --sysconfdir=${EPREFIX}/etc/${PN} \
-               --with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR} \
-               --with-regex \
-               --with-exec-shell=${EPREFIX}/bin/sh"
-
-       if [[ ${CHOST} == *-solaris* ]] ; then
-               # arrows in index view do not show when using wchar_t
-               myconf+=" --without-wc-funcs"
-       fi
-
-       # mutt prioritizes gdbm over bdb, so we will too.
-       # hcache feature requires at least one database is in USE.
-       if use tokyocabinet; then
-               myconf="${myconf} --enable-hcache \
-                       --with-tokyocabinet --without-qdbm --without-gdbm 
--without-bdb"
-       elif use qdbm; then
-               myconf="${myconf} --enable-hcache \
-                       --without-tokyocabinet --with-qdbm --without-gdbm 
--without-bdb"
-       elif use gdbm ; then
-               myconf="${myconf} --enable-hcache \
-                       --without-tokyocabinet --without-qdbm --with-gdbm 
--without-bdb"
-       elif use berkdb; then
-               myconf="${myconf} --enable-hcache \
-                       --without-tokyocabinet --without-qdbm --without-gdbm 
--with-bdb"
-       else
-               myconf="${myconf} --disable-hcache \
-                       --without-tokyocabinet --without-qdbm --without-gdbm 
--without-bdb"
-       fi
-
-       # there's no need for gnutls, ssl or sasl without socket support
-       if use pop || use imap || use smtp ; then
-               if use gnutls; then
-                       myconf="${myconf} --with-gnutls"
-               elif use ssl; then
-                       myconf="${myconf} --with-ssl"
-               fi
-               # not sure if this should be mutually exclusive with the other 
two
-               myconf="${myconf} $(use_with sasl)"
-       else
-               myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
-       fi
-
-       if use mbox; then
-               myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
-       else
-               myconf="${myconf} --with-homespool=Maildir"
-       fi
-
-       econf ${myconf} || die "configure failed"
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "install failed"
-       if use mbox; then
-               insinto /etc/mutt
-               newins "${FILESDIR}"/Muttrc.mbox Muttrc
-       else
-               insinto /etc/mutt
-               doins "${FILESDIR}"/Muttrc
-       fi
-
-       # A newer file is provided by app-misc/mime-types. So we link it.
-       rm "${ED}"/etc/${PN}/mime.types
-       dosym /etc/mime.types /etc/${PN}/mime.types
-
-       # A man-page is always handy, so fake one
-       if use !doc; then
-               emake -C doc DESTDIR="${D}" muttrc.man || die
-               # make the fake slightly better, bug #413405
-               sed -e 
's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \
-                       -e 's#in @docdir@,#at http://www.mutt.org/,#' \
-                       -e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
-                       -e "s#@bindir@#${EPREFIX}/usr/bin#" \
-                       doc/mutt.man > mutt.1
-               cp doc/muttbug.man flea.1
-               cp doc/muttrc.man muttrc.5
-               doman mutt.1 flea.1 muttrc.5
-       else
-               # nuke manpages that should be provided by an MTA, bug #177605
-               rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
-                       || ewarn "failed to remove files, please file a bug"
-       fi
-
-       if use !prefix ; then
-               fowners root:mail /usr/bin/mutt_dotlock
-               fperms g+s /usr/bin/mutt_dotlock
-       fi
-
-       dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
-}
-
-pkg_postinst() {
-       if [[ -z ${REPLACING_VERSIONS} ]] ; then
-               echo
-               elog "If you are new to mutt you may want to take a look at"
-               elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
-               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
-       fi
-}

diff --git a/mail-client/mutt/mutt-1.7.0-r5.ebuild 
b/mail-client/mutt/mutt-1.7.0-r5.ebuild
deleted file mode 100644
index 59e2726..00000000
--- a/mail-client/mutt/mutt-1.7.0-r5.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-
-inherit eutils flag-o-matic autotools
-
-PATCHREV="r5"
-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_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"
-CDEPEND="
-       app-misc/mime-types
-       nls? ( virtual/libintl )
-       tokyocabinet?  ( dev-db/tokyocabinet )
-       !tokyocabinet? (
-               qdbm?  ( dev-db/qdbm )
-               !qdbm? (
-                       gdbm?  ( sys-libs/gdbm )
-                       !gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
-               )
-       )
-       imap?    (
-               gnutls?  ( >=net-libs/gnutls-1.0.17 )
-               !gnutls? (
-                       ssl? (
-                               !libressl? ( >=dev-libs/openssl-0.9.6:0 )
-                               libressl? ( dev-libs/libressl )
-                       )
-               )
-               sasl?    ( >=dev-libs/cyrus-sasl-2 )
-       )
-       kerberos? ( virtual/krb5 )
-       pop?     (
-               gnutls?  ( >=net-libs/gnutls-1.0.17 )
-               !gnutls? (
-                       ssl? (
-                               !libressl? ( >=dev-libs/openssl-0.9.6:0 )
-                               libressl? ( dev-libs/libressl )
-                       )
-               )
-               sasl?    ( >=dev-libs/cyrus-sasl-2 )
-       )
-       smtp?     (
-               gnutls?  ( >=net-libs/gnutls-1.0.17 )
-               !gnutls? (
-                       ssl? (
-                               !libressl? ( >=dev-libs/openssl-0.9.6:0 )
-                               libressl? ( dev-libs/libressl )
-                       )
-               )
-               sasl?    ( >=dev-libs/cyrus-sasl-2 )
-       )
-       idn?     ( net-dns/libidn )
-       gpg?     ( >=app-crypt/gpgme-0.9.0 )
-       smime?   (
-               !libressl? ( >=dev-libs/openssl-0.9.6:0 )
-               libressl? ( dev-libs/libressl )
-       )
-       notmuch? ( net-mail/notmuch )
-       slang? ( sys-libs/slang )
-       !slang? ( >=sys-libs/ncurses-5.2:0 )
-"
-DEPEND="${CDEPEND}
-       net-mail/mailbase
-       doc? (
-               dev-libs/libxml2
-               dev-libs/libxslt
-               app-text/docbook-xsl-stylesheets
-               || ( www-client/lynx www-client/w3m www-client/elinks )
-       )"
-RDEPEND="${CDEPEND}
-       selinux? ( sec-policy/selinux-mutt )
-"
-
-src_prepare() {
-       local PATCHDIR="${WORKDIR}"/gentoo-mutt-1.7.0-patches
-
-       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
-       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
-       AT_M4DIR="m4" eautoreconf
-
-       # the configure script contains some "cleverness" whether or not to 
setgid
-       # the dotlock program, resulting in bugs like #278332
-       sed -i -e 's/@DOTLOCK_GROUP@//' \
-               Makefile.in || die "sed failed"
-
-       # don't just build documentation (lengthy process, with big 
dependencies)
-       if use !doc ; then
-               sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
-       fi
-}
-
-src_configure() {
-       local myconf="
-               $(use_enable crypt pgp) \
-               $(use_enable debug) \
-               $(use_enable gpg gpgme) \
-               $(use_enable imap) \
-               $(use_enable nls) \
-               $(use_enable nntp) \
-               $(use_enable pop) \
-               $(use_enable sidebar) \
-               $(use_enable smime) \
-               $(use_enable smtp) \
-               $(use_enable notmuch) \
-               $(use_with idn) \
-               $(use_with kerberos gss) \
-               $(use slang && echo --with-slang=${EPREFIX}/usr) \
-               $(use !slang && echo --with-curses=${EPREFIX}/usr) \
-               --enable-compressed \
-               --enable-external-dotlock \
-               --enable-nfs-fix \
-               --sysconfdir=${EPREFIX}/etc/${PN} \
-               --with-docdir=${EPREFIX}/usr/share/doc/${PN}-${PVR} \
-               --with-regex \
-               --with-exec-shell=${EPREFIX}/bin/sh"
-
-       if [[ ${CHOST} == *-solaris* ]] ; then
-               # arrows in index view do not show when using wchar_t
-               myconf+=" --without-wc-funcs"
-       fi
-
-       # mutt prioritizes gdbm over bdb, so we will too.
-       # hcache feature requires at least one database is in USE.
-       if use tokyocabinet; then
-               myconf="${myconf} --enable-hcache \
-                       --with-tokyocabinet --without-qdbm --without-gdbm 
--without-bdb"
-       elif use qdbm; then
-               myconf="${myconf} --enable-hcache \
-                       --without-tokyocabinet --with-qdbm --without-gdbm 
--without-bdb"
-       elif use gdbm ; then
-               myconf="${myconf} --enable-hcache \
-                       --without-tokyocabinet --without-qdbm --with-gdbm 
--without-bdb"
-       elif use berkdb; then
-               myconf="${myconf} --enable-hcache \
-                       --without-tokyocabinet --without-qdbm --without-gdbm 
--with-bdb"
-       else
-               myconf="${myconf} --disable-hcache \
-                       --without-tokyocabinet --without-qdbm --without-gdbm 
--without-bdb"
-       fi
-
-       # there's no need for gnutls, ssl or sasl without socket support
-       if use pop || use imap || use smtp ; then
-               if use gnutls; then
-                       myconf="${myconf} --with-gnutls"
-               elif use ssl; then
-                       myconf="${myconf} --with-ssl"
-               fi
-               # not sure if this should be mutually exclusive with the other 
two
-               myconf="${myconf} $(use_with sasl)"
-       else
-               myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
-       fi
-
-       if use mbox; then
-               myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
-       else
-               myconf="${myconf} --with-homespool=Maildir"
-       fi
-
-       econf ${myconf} || die "configure failed"
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "install failed"
-       if use mbox; then
-               insinto /etc/mutt
-               newins "${FILESDIR}"/Muttrc.mbox Muttrc
-       else
-               insinto /etc/mutt
-               doins "${FILESDIR}"/Muttrc
-       fi
-
-       # A newer file is provided by app-misc/mime-types. So we link it.
-       rm "${ED}"/etc/${PN}/mime.types
-       dosym /etc/mime.types /etc/${PN}/mime.types
-
-       # A man-page is always handy, so fake one
-       if use !doc; then
-               emake -C doc DESTDIR="${D}" muttrc.man || die
-               # make the fake slightly better, bug #413405
-               sed -e 
's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \
-                       -e 's#in @docdir@,#at http://www.mutt.org/,#' \
-                       -e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
-                       -e "s#@bindir@#${EPREFIX}/usr/bin#" \
-                       doc/mutt.man > mutt.1
-               cp doc/muttbug.man flea.1
-               cp doc/muttrc.man muttrc.5
-               doman mutt.1 flea.1 muttrc.5
-       else
-               # nuke manpages that should be provided by an MTA, bug #177605
-               rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
-                       || ewarn "failed to remove files, please file a bug"
-       fi
-
-       if use !prefix ; then
-               fowners root:mail /usr/bin/mutt_dotlock
-               fperms g+s /usr/bin/mutt_dotlock
-       fi
-
-       dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
-}
-
-pkg_postinst() {
-       if [[ -z ${REPLACING_VERSIONS} ]] ; then
-               echo
-               elog "If you are new to mutt you may want to take a look at"
-               elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
-               elog "   https://wiki.gentoo.org/wiki/Mutt";
-               echo
-       else
-               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
-}

Reply via email to