commit: cfe0ecbe7f0b98e16fb7f5cf47f969d60cbf9933 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Mon Jul 10 16:50:43 2017 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Mon Jul 10 16:50:43 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfe0ecbe
mail-client/mutt: drop old ebuilds, bug #604902 Package-Manager: Portage-2.3.6, Repoman-2.3.1 mail-client/mutt/Manifest | 6 - mail-client/mutt/mutt-1.5.23-r7.ebuild | 251 ------------------------------ mail-client/mutt/mutt-1.5.24-r2.ebuild | 271 --------------------------------- mail-client/mutt/mutt-1.8.2.ebuild | 252 ------------------------------ 4 files changed, 780 deletions(-) diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest index 05a8c8a4895..67f9939b19b 100644 --- a/mail-client/mutt/Manifest +++ b/mail-client/mutt/Manifest @@ -1,10 +1,4 @@ -DIST mutt-1.5.23-gentoo-patches-r7.tar.bz2 167553 SHA256 354bd25bdba4f58b4bfcbc84b451199d0d801c239b7e610ff0ec3e76e838741e SHA512 7e7090d7bf74d3d0cc59facc3715f2671a5a2b82ab794b1e1b2b6178ff4059854b3fe6f5b3e3833381d24f7150bea2b8542f26e7ea29aa72752bda1ac3051b29 WHIRLPOOL 0e2f37efdcb4195c5d9d3ec7c859a1f1fa2316907e4b6352c470701ef3613e41502deccd3ca45b5a3e60e5353612b339a26f8c649d2813a0898d67a3802a1a99 -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.7.2.tar.gz 4025880 SHA256 1553501687cd22d5b8aaee4dc5a7d9dcf6cc61d7956f6aabaadd252d10cd5ff9 SHA512 5f13cbdf802bca80668b2f54bc66201d01bfe34c7f377b1bad88f8fa0e0c695264ff0bf6b64ae9bb6f5a3e22b6f096d2dd99fa36724937609f6f46e6a74da74e WHIRLPOOL c3a6bac41e31d79ae06ddfba1e9d8868e0cd4b54b04b3ca61ed5330f61ab56c7cf88273ae937c9de134fde01a31aebd70242afee6987177f152a5acd6d9d26b4 -DIST mutt-1.8.2.tar.gz 4118429 SHA256 1d057bf1b565f2c38ee50c9a661654cbbe4165f98e25bfa361ebbd707d96f235 SHA512 a5db6154c6baf96e64e9b55b866052b1dae96166b9993fd9a55dc9801a525b50539d26b68d04983f70e9cc1927d95b5b9057f153ce579398e711a24bbd04869c WHIRLPOOL 338728bd97c1bad36b71fb187b2bd91b517f987049aef7ead0cb8baaefc5b2828991590569980e97b8228fe870cf77439ab01577e3c6dcc10684858be9f1a64c DIST mutt-1.8.3.tar.gz 4122012 SHA256 9b81746d67ffeca5ea44f60893b70dc93c86d4bc10187d4dd360185e4d42ed42 SHA512 8cfb4b1d42add3e8b34ba140e606e57f98d98ca685538ecb159f584635c50a7b0afaf81e09361d52a39188d4bb59a7432d01d58d030a93b0d3d92f0ee4062048 WHIRLPOOL e913c06e58411feda9d91af619bc68df066355d7a7cf400fcb779db8bfb45600f28131279f571a45f088c2be6b46199758d90708d7372e143e05f1a3a462c57d DIST mutt-gentoo-1.7.2-patches-r1.tar.xz 143816 SHA256 6358ee38ff32a35a0bc6449cba13b5cab406148fc068f2faa81aca16a6b5d158 SHA512 21703bc808ae510e26ede38e1dda5d7c74cad15823154584a83209e9dbf68bf6350961e66729cf2ede78bde003f3b92567d42f9f8f89ed53643dcfa536625b7e WHIRLPOOL 8b6b19da9ced5bf27d86b3143c878c8a392ffa1a3505d7f07d6a5ba5f76289f08447266be0b717179062cff3ba52155538be39f02f5af67fe4d84f9dc2a9d36c -DIST mutt-gentoo-1.8.2-patches-r2.tar.xz 134776 SHA256 912618e9d2bef70f60767f857641e4061ebca1df4e6b64dbb59f5cb4d1265f2b SHA512 e261e9e146a7f6ef82fadc927536bb2113e94eb322e59d3d11147b417a2f30e03e978b58a66b576d26f1312727f140b7f548c6954f1be21776556d5136d7c908 WHIRLPOOL 1b761bb42c824378113d873cf47b616772690da1b0984a405a210b3bfcfd316a22815ef62b378b6f16807fe20a4888fcfc057caa961cf6832f531c4ebfb0ebf5 DIST mutt-gentoo-1.8.3-patches-r0.tar.xz 142724 SHA256 a4eec3dc4732cb98ac9ef3eb4c4ac7ba651a7ea7e99ebf5d33679cff84e15726 SHA512 db4963c04deb29703f744a7e24248f44d4dc69636b42a2ee8dc3a773e847770b735b048670fe3c6d64528a8df9a04bba4fca2eebcfbe79ad11ec6108d6cf9a7e WHIRLPOOL d2d23e1a21165d2489fad716422defb5eeb0178053391c0b9fd97b141b1c663584f1af66721ffbf5feca586c53ac0403c46d5975d34bbc6ebfc9e73622a87999 diff --git a/mail-client/mutt/mutt-1.5.23-r7.ebuild b/mail-client/mutt/mutt-1.5.23-r7.ebuild deleted file mode 100644 index 5c06980881f..00000000000 --- a/mail-client/mutt/mutt-1.5.23-r7.ebuild +++ /dev/null @@ -1,251 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils flag-o-matic autotools - -PATCHSET_REV="-r7" - -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="ia64 sparc x86" # last stable -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 <app-crypt/gpgme-1.8.0 ) - smime? ( >=dev-libs/openssl-0.9.6:0= ) - 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 - - # 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-r2.ebuild b/mail-client/mutt/mutt-1.5.24-r2.ebuild deleted file mode 100644 index 644638020d3..00000000000 --- a/mail-client/mutt/mutt-1.5.24-r2.ebuild +++ /dev/null @@ -1,271 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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 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 ~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 <app-crypt/gpgme-1.8.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 - - # 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.8.2.ebuild b/mail-client/mutt/mutt-1.8.2.ebuild deleted file mode 100644 index 9e1a14057dd..00000000000 --- a/mail-client/mutt/mutt-1.8.2.ebuild +++ /dev/null @@ -1,252 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit eutils flag-o-matic autotools - -PATCHREV="r2" -PATCHSET="gentoo-${PVR}/${PATCHREV}" - -DESCRIPTION="A small but very powerful text-based mail client" -HOMEPAGE="http://www.mutt.org/"; -MUTT_G_PATCHES="mutt-gentoo-${PV}-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 +hcache idn imap kerberos libressl lmdb mbox nls nntp notmuch pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet vanilla" -REQUIRED_USE=" - hcache? ( ^^ ( berkdb gdbm lmdb qdbm tokyocabinet ) ) - imap? ( ssl ) - pop? ( ssl ) - nntp? ( ssl ) - smime? ( ssl !gnutls ) - smtp? ( ssl ) - sasl? ( || ( imap pop smtp nntp ) ) - kerberos? ( || ( imap pop smtp nntp ) )" -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -CDEPEND=" - app-misc/mime-types - - berkdb? ( >=sys-libs/db-4:= ) - gdbm? ( sys-libs/gdbm ) - lmdb? ( dev-db/lmdb:= ) - qdbm? ( dev-db/qdbm ) - tokyocabinet? ( dev-db/tokyocabinet ) - - ssl? ( - gnutls? ( >=net-libs/gnutls-1.0.17:= ) - !gnutls? ( - libressl? ( dev-libs/libressl:= ) - !libressl? ( >=dev-libs/openssl-0.9.6:0= ) - ) - ) - - nls? ( virtual/libintl ) - sasl? ( >=dev-libs/cyrus-sasl-2 ) - kerberos? ( virtual/krb5 ) - idn? ( net-dns/libidn ) - gpg? ( >=app-crypt/gpgme-0.9.0:= ) - 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}"/mutt-gentoo-${PV}-patches - - if use !vanilla ; then - # apply patches - export EPATCH_FORCE="yes" - export EPATCH_SUFFIX="patch" - # http://hg.code.sf.net/p/gentoomutt/code/file/gentoo-1.8 - # http://hg.code.sf.net/p/gentoomuttpatches/code/file/mutt-1.8 - local patches=( - patches-mutt - bugs-gentoo - features-common - features-extra - gentoo - ) - local patchset - for patchset in "${patches[@]}" ; do - [[ -d "${PATCHDIR}/${patchset}" ]] || continue - 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_(/aThis 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\\' \ - main.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 - local patchset= - use vanilla || patchset=", ${PATCHSET}" - 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" -} - -src_configure() { - local myconf=( - "$(use_enable crypt pgp)" - "$(use_enable debug)" - "$(use_enable doc)" - "$(use_enable gpg gpgme)" - "$(use_enable nls)" - "$(use_enable notmuch)" - "$(use_enable sidebar)" - "$(use_enable smime)" - - "$(use_enable imap)" - "$(use_enable pop)" - "$(use_enable nntp)" - "$(use_enable smtp)" - - $(use ssl && use gnutls && echo --with-gnutls --without-ssl) - $(use ssl && use !gnutls && echo --without-gnutls --with-ssl ) - $(use !ssl && echo --without-gnutls --without-ssl) - - "$(use_with idn)" - "$(use_with kerberos gss)" - "$(use_with sasl)" - "$(use slang && echo --with-slang=${EPREFIX}/usr)" - "$(use_with !slang 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 - - # REQUIRED_USE should have selected only one of these - local hcaches=( - "berkdb:bdb" - "gdbm" - "lmdb" - "qdbm" - "tokyocabinet" - ) - local ucache hcache lcache - for hcache in "${hcaches[@]}" ; do - if use ${hcache%%:*} ; then - ucache=${hcache} - break - fi - done - if [[ -n ${ucache} ]] ; then - myconf+=( "--enable-hcache" ) - else - myconf+=( "--disable-hcache" ) - fi - for hcache in "${hcaches[@]}" ; do - [[ ${hcache} == ${ucache} ]] \ - && myconf+=( "--with-${hcache#*:}" ) \ - || myconf+=( "--without-${hcache#*:}" ) - done - - if use mbox; then - myconf+=( "--with-mailpath=${EPREFIX}/var/spool/mail" ) - else - 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 -}
