commit: c194bd87ebd69a55fcfe0f62b41389ca7bd16caa Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Mon Aug 22 09:33:22 2016 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Mon Aug 22 09:33:46 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c194bd87
mail-client/mutt: remove old Package-Manager: portage-2.2.28 mail-client/mutt/Manifest | 5 - mail-client/mutt/mutt-1.5.23-r5.ebuild | 250 ----------------------------- mail-client/mutt/mutt-1.5.23-r8.ebuild | 252 ------------------------------ mail-client/mutt/mutt-1.5.24-r1.ebuild | 254 ------------------------------ mail-client/mutt/mutt-1.6.0-r2.ebuild | 277 --------------------------------- mail-client/mutt/mutt-1.6.1-r2.ebuild | 260 ------------------------------- 6 files changed, 1298 deletions(-) diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest index b02eeb1..8825d7a 100644 --- a/mail-client/mutt/Manifest +++ b/mail-client/mutt/Manifest @@ -1,13 +1,8 @@ -DIST mutt-1.5.23-gentoo-patches-r5.tar.bz2 127745 SHA256 a2c457071b17fc1886c8f0d24728df388c5c90eed3276783db061b92212786f3 SHA512 8f89abcca7048a24f5e37190b479f724eb51eb6a1703bc419c9f200f4ad1cb544fa7283ea6d76519f002aed26c9c2f54bd14e89b845001755a0b98e3317b39f8 WHIRLPOOL 04843ec6df35a34b2f601caaff60c6cd2fe16ab66946c6ab0a3be0ff4570743fdc365f7fb28c00c16b6d88e299d0b1b8fac86e8936474e170d1f0d2331209e2c DIST mutt-1.5.23-gentoo-patches-r7.tar.bz2 167553 SHA256 354bd25bdba4f58b4bfcbc84b451199d0d801c239b7e610ff0ec3e76e838741e SHA512 7e7090d7bf74d3d0cc59facc3715f2671a5a2b82ab794b1e1b2b6178ff4059854b3fe6f5b3e3833381d24f7150bea2b8542f26e7ea29aa72752bda1ac3051b29 WHIRLPOOL 0e2f37efdcb4195c5d9d3ec7c859a1f1fa2316907e4b6352c470701ef3613e41502deccd3ca45b5a3e60e5353612b339a26f8c649d2813a0898d67a3802a1a99 -DIST mutt-1.5.23-gentoo-patches-r8.tar.bz2 167959 SHA256 30aed5383b77321b92e407b53d759d72ab6da105771a65cecbb07eae191e496b SHA512 5f88217f0fa94e5eb08aa574b1bfa78a512528eaff8127487c8fd3d3e9c59fb9090a11c3f72beff28ca36a3dd5a8ab155f9de880d332836a0ac12e72b64640f8 WHIRLPOOL 994e0bd6a80d4fbcd523d71cf7615deaa46f5e1753fdb5967730e0013cbb8de0d6ceba3c01ea015e3b363fb395456db7507f75fb52e860e28c03e71371acd2b6 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.0-gentoo-patches-r6.tar.xz 102716 SHA256 7130215f78f69389d9c2520db0ef568c23d9cf508cfec9c058c846b01c53cce6 SHA512 60d47196a3daee1b976bc8a48b0b2f5b73e08106765bfad9cc5a63f9078fea1f86c2ed20365da9f36392b87f1da32a16646c4a20e76ab621038d3b5af388ee5f WHIRLPOOL 445b9d2f33c3a5cbc53cacdf6417945fcd95b8b99e76b77593dd68895f592beed64c44142d7df5467b3f22984d473e150f96e02a7e2d0177621361067457947f -DIST mutt-1.6.0.tar.gz 3954591 SHA256 29afb6238ab7a540c0e3a78ce25c970f975ab6c0f0bc9f919993aab772136c19 SHA512 601d5f70c7cd30903799714cd85b80f9650a029e621d044075e123656411dde809d5cef24a40ba49860bc242cf4a0b914c703deb5a7125b3a24eeb93f4ae3c4c WHIRLPOOL 4d0271ab703ec7fdadc49861921bb4728ee2e88629c45f286647982efa2b1021f07b929a745622961d8cd007941975cee1c29718536fd753563eb74e7670beac DIST mutt-1.6.1-gentoo-patches-r5.tar.xz 173228 SHA256 cce80ae3b385ed43bedb3674859cb971644c71dde2ac4b00ce4fd94e52eda6a1 SHA512 c328fa30cf0e3ed14753d0c95daac62d295dfb5c4482323b7bfdc7af89e3d4563678101e74d39c8cdccd40f49e8fca5becd1a211c75e44f66e85190bc8b0ee64 WHIRLPOOL 9893878cc6c262b0564920b71d2e906c2f8b0c199e3f7e6883779be63b0af03fdc7a581bc8295c038fb2184d7114a8446356785eb0dfb2680e747e897f6983b4 -DIST mutt-1.6.1-neomutt-patches-3d90396616d009a7dcbfbb17d8a74b3eee70bd9a.zip 538034 SHA256 d76441eb51295afccc060bfee40ef03ab1b865de1187ea1f26349281d11784a6 SHA512 ca5334c9d0a295cba8749d1d7315d6d7a8ac93f48cfd9a1e112f9b5dd61f808966ec320464aab282cc626c08764294844368dca1520bc9dc6029c12004b7bb50 WHIRLPOOL b14ae9b58c6ba81956caefe049a0c6706436700e060402a9d869d9b98b61d74df5478dd07ee9cd520c4e6012a22b01d29857f74a8e3955680948e06f4e04cbec 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 diff --git a/mail-client/mutt/mutt-1.5.23-r5.ebuild b/mail-client/mutt/mutt-1.5.23-r5.ebuild deleted file mode 100644 index 877cd5b..0000000 --- a/mail-client/mutt/mutt-1.5.23-r5.ebuild +++ /dev/null @@ -1,250 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -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/mutt/devel/${P}.tar.gz - mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2 - https://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"; -IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos 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? ( >=dev-libs/openssl-0.9.6 ) ) - sasl? ( >=dev-libs/cyrus-sasl-2 ) - ) - kerberos? ( virtual/krb5 ) - pop? ( - gnutls? ( >=net-libs/gnutls-1.0.17 ) - !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) - sasl? ( >=dev-libs/cyrus-sasl-2 ) - ) - smtp? ( - gnutls? ( >=net-libs/gnutls-1.0.17 ) - !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) - sasl? ( >=dev-libs/cyrus-sasl-2 ) - ) - idn? ( net-dns/libidn ) - gpg? ( >=app-crypt/gpgme-0.9.0 ) - smime? ( >=dev-libs/openssl-0.9.6 ) - slang? ( sys-libs/slang ) - !slang? ( >=sys-libs/ncurses-5.2 ) -" -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 - - # we conditionalise this one, simply because it has considerable - # impact on the code - if use sidebar ; then - epatch "${PATCHDIR}"/sidebar-20140412.patch - epatch "${PATCHDIR}"/sidebar-dotpathsep.patch - epatch "${PATCHDIR}"/sidebar-counts.patch - fi - - local upatches= - # allow user patches - epatch_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 smime) \ - $(use_enable smtp) \ - $(use_with idn) \ - $(use_with kerberos gss) \ - $(use slang && echo --with-slang) \ - --enable-compressed \ - --enable-external-dotlock \ - --enable-nfs-fix \ - --sysconfdir=${EPREFIX}/etc/${PN} \ - --with-curses \ - --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="${myconf} --enable-fcntl --disable-flock" - ;; - *) - myconf="${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() { - 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 -} diff --git a/mail-client/mutt/mutt-1.5.23-r8.ebuild b/mail-client/mutt/mutt-1.5.23-r8.ebuild deleted file mode 100644 index 49771a2..0000000 --- a/mail-client/mutt/mutt-1.5.23-r8.ebuild +++ /dev/null @@ -1,252 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils flag-o-matic autotools - -PATCHSET_REV="-r8" - -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/mutt/devel/${P}.tar.gz - mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2 - https://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"; -IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos 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? ( >=dev-libs/openssl-0.9.6 ) ) - sasl? ( >=dev-libs/cyrus-sasl-2 ) - ) - kerberos? ( virtual/krb5 ) - pop? ( - gnutls? ( >=net-libs/gnutls-1.0.17 ) - !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) - sasl? ( >=dev-libs/cyrus-sasl-2 ) - ) - smtp? ( - gnutls? ( >=net-libs/gnutls-1.0.17 ) - !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) - sasl? ( >=dev-libs/cyrus-sasl-2 ) - ) - idn? ( net-dns/libidn ) - gpg? ( >=app-crypt/gpgme-0.9.0 ) - smime? ( >=dev-libs/openssl-0.9.6 ) - slang? ( sys-libs/slang ) - !slang? ( >=sys-libs/ncurses-5.2 ) -" -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 - - # we conditionalise this one, simply because it has considerable - # impact on the code - if use sidebar ; then - epatch "${PATCHDIR}"/sidebar-20140412.patch - epatch "${PATCHDIR}"/sidebar-dotpathsep.patch - epatch "${PATCHDIR}"/sidebar-counts.patch - fi - - local upatches= - # allow user patches - epatch_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 smime) \ - $(use_enable smtp) \ - $(use_with idn) \ - $(use_with kerberos gss) \ - $(use slang && echo --with-slang) \ - --enable-compressed \ - --enable-external-dotlock \ - --enable-nfs-fix \ - --sysconfdir=${EPREFIX}/etc/${PN} \ - --with-curses \ - --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="${myconf} --enable-fcntl --disable-flock" - ;; - *) - myconf="${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 - fi -} diff --git a/mail-client/mutt/mutt-1.5.24-r1.ebuild b/mail-client/mutt/mutt-1.5.24-r1.ebuild deleted file mode 100644 index 3860e13..0000000 --- a/mail-client/mutt/mutt-1.5.24-r1.ebuild +++ /dev/null @@ -1,254 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils flag-o-matic autotools - -PATCHSET_REV="-r1" - -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.bz2 - https://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"; -IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos 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? ( >=dev-libs/openssl-0.9.6 ) ) - sasl? ( >=dev-libs/cyrus-sasl-2 ) - ) - kerberos? ( virtual/krb5 ) - pop? ( - gnutls? ( >=net-libs/gnutls-1.0.17 ) - !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) - sasl? ( >=dev-libs/cyrus-sasl-2 ) - ) - smtp? ( - gnutls? ( >=net-libs/gnutls-1.0.17 ) - !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) - sasl? ( >=dev-libs/cyrus-sasl-2 ) - ) - idn? ( net-dns/libidn ) - gpg? ( >=app-crypt/gpgme-0.9.0 ) - smime? ( >=dev-libs/openssl-0.9.6 ) - slang? ( sys-libs/slang ) - !slang? ( >=sys-libs/ncurses-5.2 ) -" -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 - - # we conditionalise this one, simply because it has considerable - # impact on the code - if use sidebar ; then - epatch "${PATCHDIR}"/sidebar-20140412.patch - epatch "${PATCHDIR}"/sidebar-dotpathsep.patch - epatch "${PATCHDIR}"/sidebar-counts.patch - fi - - local upatches= - # allow user patches - epatch_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 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 - fi -} diff --git a/mail-client/mutt/mutt-1.6.0-r2.ebuild b/mail-client/mutt/mutt-1.6.0-r2.ebuild deleted file mode 100644 index 74da155..0000000 --- a/mail-client/mutt/mutt-1.6.0-r2.ebuild +++ /dev/null @@ -1,277 +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="-r6" - -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 - - # Avoid symbol conflicts on Solaris - sed -i \ - -e 's/\<M_CMD\>/MT_CMD/g' \ - -e 's/\<M_READ\>/MT_READ/g' \ - *.[ch] imap/*.[ch] || die - - 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.1-r2.ebuild b/mail-client/mutt/mutt-1.6.1-r2.ebuild deleted file mode 100644 index d868ccc..0000000 --- a/mail-client/mutt/mutt-1.6.1-r2.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="3d90396616d009a7dcbfbb17d8a74b3eee70bd9a" # 20160611 - -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}.zip -> ${P}-neomutt-patches-${NEOMUTT}.zip" -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=( - 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" - - epatch "${FILESDIR}"/mutt-1.6.1-neomutt-index_format_truncation_problem.patch - 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 -}
