diff options
| -rw-r--r-- | mail-client/mutt/ChangeLog | 9 | ||||
| -rw-r--r-- | mail-client/mutt/Manifest | 5 | ||||
| -rw-r--r-- | mail-client/mutt/mutt-1.5.20-r6.ebuild | 28 | ||||
| -rw-r--r-- | mail-client/mutt/mutt-1.5.20-r7.ebuild | 269 |
4 files changed, 291 insertions, 20 deletions
diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog index 303dfe61f23c..4abcbf2301e4 100644 --- a/mail-client/mutt/ChangeLog +++ b/mail-client/mutt/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for mail-client/mutt # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.158 2009/10/20 17:55:10 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.159 2009/10/22 18:35:57 grobian Exp $ + +*mutt-1.5.20-r7 (22 Oct 2009) + + 22 Oct 2009; Fabian Groffen <grobian@gentoo.org> mutt-1.5.20-r6.ebuild, + +mutt-1.5.20-r7.ebuild: + Revert addition of tokyocabinet USE-flag to -r6, add it to -r7 and drop + keywords for arches that don't have tokyocabinet keyworded, bug #290154 20 Oct 2009; Fabian Groffen <grobian@gentoo.org> mutt-1.5.20-r6.ebuild: Add tokyocabinet support with USE=tokyocabinet, thanks Tim Harder in bug diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest index 23c9c0ffa3b5..1d49bb5e4cbd 100644 --- a/mail-client/mutt/Manifest +++ b/mail-client/mutt/Manifest @@ -41,6 +41,7 @@ DIST patch-1.5.20.sidebar.20090619.txt 53335 RMD160 4c693b100a320d11ea94aedb75cf EBUILD mutt-1.5.16.ebuild 4989 RMD160 2a9ae3ece8f56692e0077b7b3940e607c79f2a14 SHA1 a79646fbfce1e85ecc2f8aaa4728e3c7303185f0 SHA256 55a70c2bb8f144549e6a12a4ba6bcb8796202d4f7be25fb809fefa2848615368 EBUILD mutt-1.5.19-r1.ebuild 5933 RMD160 67a206bce8e2c652216cab13b619adfa2924f624 SHA1 07f6fc64eed63a635dc92f56f53687c66b8def13 SHA256 13c9eb5b1e3d933a4ede446d4779202f47ec6695dc4ecbd7fef31f78c67e8dfc EBUILD mutt-1.5.20-r4.ebuild 8442 RMD160 b8e5a90fa48cb236f31e69dddb63ba7078f2dd5d SHA1 88f66d53c60f431173ac86c7c1ca5888879e9e7c SHA256 ddfda6ec2a6649f05b36e492b5237feaf64546c758e1c8bfd0a600af8b25ee80 -EBUILD mutt-1.5.20-r6.ebuild 9031 RMD160 a873bf129c3ad56c1902bc78f7550542748f05a2 SHA1 1c6a5d593093a1861e7bae7c9c9b17e4fad48e05 SHA256 cfda3b79cfe4583d8819898d7cde0bf2618fe87dbeb5fd6fbd958d3c70d90d8c -MISC ChangeLog 35710 RMD160 f192455f3a5d559a11866e70b1b079c175413e82 SHA1 63276cc47c1558bb5d097918466ea478eab51d21 SHA256 3a0c019e44132b494818b544f112d94da2396912c7f8b3129d0d4e97d9284016 +EBUILD mutt-1.5.20-r6.ebuild 8728 RMD160 f8df0550896b4ca3b6b81e06a2bb657c6fb429e3 SHA1 a8a7da268bcbb48384a4930eae472f08575a579f SHA256 86e66961cbef99cb844de77c0ea7177e24890a3830debe8caab5bfa4424e9d74 +EBUILD mutt-1.5.20-r7.ebuild 8977 RMD160 23fdf95facff5114571fa3c73b1fe15d1b0394ac SHA1 7d452f13f0860c1a9c6b074774e965792660a0f6 SHA256 048437592ed493030fe7637447e3ef2c2175bf9af975eb416a4699ac072ba6e8 +MISC ChangeLog 35990 RMD160 1fe9643499145c09782581b842ddc2460b2eed2c SHA1 7cbddaf2cf3e1c88043816da0cab0886870a17a6 SHA256 c30c05534e981f1f3e026d482a9679382780195141c848d7a79add0034a8b734 MISC metadata.xml 627 RMD160 e3a3709dcc01a6b9db15ac7836c75f8dbe3456ea SHA1 92be48491c090c3e6968812b58dde85961af3b8f SHA256 c30f8f2126be6b11b3e0d0e2f6413ce7ab2ca2613856f558bec7689e5a9ada0b diff --git a/mail-client/mutt/mutt-1.5.20-r6.ebuild b/mail-client/mutt/mutt-1.5.20-r6.ebuild index 1e59ff8d9d5c..5a611c2b4047 100644 --- a/mail-client/mutt/mutt-1.5.20-r6.ebuild +++ b/mail-client/mutt/mutt-1.5.20-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r6.ebuild,v 1.2 2009/10/20 17:55:10 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r6.ebuild,v 1.3 2009/10/22 18:35:57 grobian Exp $ inherit eutils flag-o-matic autotools @@ -22,18 +22,15 @@ SRC_URI="ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz sidebar? ( http://www.lunar-linux.org/~tchan/mutt/${SIDEBAR_PATCH_N} )" -IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl sidebar smime smtp ssl tokyocabinet vanilla" +IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl sidebar smime smtp ssl vanilla" SLOT="0" LICENSE="GPL-2" KEYWORDS="~alpha ~amd64 ~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" RDEPEND=">=sys-libs/ncurses-5.2 - tokyocabinet? ( dev-db/tokyocabinet ) - !tokyocabinet? ( - qdbm? ( dev-db/qdbm ) - !qdbm? ( - gdbm? ( sys-libs/gdbm ) - !gdbm? ( berkdb? ( >=sys-libs/db-4 ) ) - ) + qdbm? ( dev-db/qdbm ) + !qdbm? ( + gdbm? ( sys-libs/gdbm ) + !gdbm? ( berkdb? ( >=sys-libs/db-4 ) ) ) imap? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) @@ -169,21 +166,18 @@ src_compile() { # 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 + if use qdbm; then myconf="${myconf} --enable-hcache \ - --without-tokyocabinet --with-qdbm --without-gdbm --without-bdb" + --with-qdbm --without-gdbm --without-bdb" elif use gdbm ; then myconf="${myconf} --enable-hcache \ - --without-tokyocabinet --without-qdbm --with-gdbm --without-bdb" + --without-qdbm --with-gdbm --without-bdb" elif use berkdb; then myconf="${myconf} --enable-hcache \ - --without-tokyocabinet --without-qdbm --without-gdbm --with-bdb" + --without-gdbm --without-qdbm --with-bdb" else myconf="${myconf} --disable-hcache \ - --without-tokyocabinet --without-qdbm --without-gdbm --without-bdb" + --without-qdbm --without-gdbm --without-bdb" fi # there's no need for gnutls, ssl or sasl without socket support diff --git a/mail-client/mutt/mutt-1.5.20-r7.ebuild b/mail-client/mutt/mutt-1.5.20-r7.ebuild new file mode 100644 index 000000000000..2c1a8bc36d68 --- /dev/null +++ b/mail-client/mutt/mutt-1.5.20-r7.ebuild @@ -0,0 +1,269 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r7.ebuild,v 1.1 2009/10/22 18:35:57 grobian Exp $ + +inherit eutils flag-o-matic autotools + +PATCHSET_REV="-r3" + +# note: latest sidebar patches can be found here: +# http://www.lunar-linux.org/index.php?option=com_content&task=view&id=44 +SIDEBAR_PATCH_N="patch-1.5.20.sidebar.20090619.txt" + +DESCRIPTION="a small but very powerful text-based mail client" +HOMEPAGE="http://www.mutt.org" +SRC_URI="ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz + !vanilla? ( + !sidebar? ( + mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2 + http://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2 + ) + ) + sidebar? ( + http://www.lunar-linux.org/~tchan/mutt/${SIDEBAR_PATCH_N} + )" +IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl sidebar smime smtp ssl tokyocabinet vanilla" +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~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" +RDEPEND=">=sys-libs/ncurses-5.2 + 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 ) + ) + 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 ) + app-misc/mime-types" +DEPEND="${RDEPEND} + net-mail/mailbase + doc? ( + dev-libs/libxml2 + dev-libs/libxslt + app-text/docbook-xsl-stylesheets + || ( www-client/lynx www-client/w3m www-client/elinks ) + )" + +PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV} + +src_unpack() { + unpack ${A//${SIDEBAR_PATCH_N}} + cd "${S}" + + # 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 "${FILESDIR}"/mutt-1.5.13-prefix-mailcap.patch + + epatch "${FILESDIR}"/mutt-1.5.18-bdb-prefix.patch # fix bdb detection + epatch "${FILESDIR}"/mutt-1.5.18-interix.patch + built_with_use sys-libs/ncurses unicode && \ + epatch "${FILESDIR}"/mutt-1.5.18-solaris-ncurses-chars.patch + epatch "${FILESDIR}"/mutt-1.5.20-gpgme-1.2.0.patch + # post-release hot-fixes + epatch "${FILESDIR}"/mutt-1.5.20-imap-port-invalid-d6f88fbf8387.patch + epatch "${FILESDIR}"/mutt-1.5.20-header-weeding-f40de578e8ed.patch + epatch "${FILESDIR}"/mutt-1.5.20-display-unsigned-pgp-7f37d0a57d83.patch + epatch "${FILESDIR}"/mutt-1.5.20-unmailbox-segfault-25e46aad362b.patch + epatch "${FILESDIR}"/mutt-1.5.20-mbox-new-mail-bd59be56c6b0.patch + epatch "${FILESDIR}"/mutt-1.5.20-mbox-unchanged-new-mail-9ae13dedb5ed.patch + epatch "${FILESDIR}"/mutt-1.5.20-imap-start-fatal-fe30f394cbe6.patch + epatch "${FILESDIR}"/mutt-1.5.20-tab-subject-questionmark-298194c414f0-cff8e8ce4327.patch + epatch "${FILESDIR}"/mutt-1.5.20-smtp-batch-mode-0a3de4d9a009-f6c6066a5925.patch + epatch "${FILESDIR}"/mutt-1.5.20-leave-mailbox-no-new-mail-118b8fef8aae.patch + epatch "${FILESDIR}"/mutt-1.5.20-gpgme-keys-d41e043fa775.patch + epatch "${FILESDIR}"/mutt-1.5.20-mhs-flags-leak-9f3053f75f27.patch + epatch "${FILESDIR}"/mutt-1.5.20-hcache-restore-address-848f08512bf3.patch + epatch "${FILESDIR}"/mutt-1.5.20-ungroup-command-77ac8b5c2be6.patch + epatch "${FILESDIR}"/mutt-1.5.20-propagate-mh_read_sequences-2fc9348684fe.patch + epatch "${FILESDIR}"/mutt-1.5.20-hcache-uidvalidity-size-fix-a2a4286491b4.patch + epatch "${FILESDIR}"/mutt-1.5.20-fix-mh-parsing-14bb498c6a1c.patch + epatch "${FILESDIR}"/mutt-1.5.20-search-pattern-crash-053ef7bbaa72.patch + epatch "${FILESDIR}"/mutt-1.5.20-next-invalid-pattern-crash-6a08a5244d60.patch + epatch "${FILESDIR}"/mutt-1.5.20-dont-reveal-bbc.patch + + # patch version string for bug reports + sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}"')"/' \ + muttlib.c || die "failed patching in Gentoo version" + + if use !vanilla && use !sidebar ; then + use nntp || rm "${PATCHDIR}"/06-nntp.patch + for p in "${PATCHDIR}"/*.patch ; do + epatch "${p}" + done + fi + + if use sidebar ; then + use vanilla || \ + ewarn "The sidebar patch is only applied to a vanilla mutt tree." + epatch "${DISTDIR}"/${SIDEBAR_PATCH_N} + fi + + 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_compile() { + declare myconf=" + $(use_enable nls) \ + $(use_enable gpg gpgme) \ + $(use_enable imap) \ + $(use_enable pop) \ + $(use_enable smtp) \ + $(use_enable crypt pgp) \ + $(use_enable smime) \ + $(use_enable debug) \ + $(use_with idn) \ + --with-curses \ + --sysconfdir="${EPREFIX}"/etc/${PN} \ + --with-docdir="${EPREFIX}"/usr/share/doc/${PN}-${PVR} \ + --with-regex \ + --enable-nfs-fix --enable-external-dotlock \ + $(use_with !nntp mixmaster) \ + --with-exec-shell=${EPREFIX}/bin/sh" + + case $CHOST in + *-darwin7) + # locales are broken on Panther + myconf="${myconf} --enable-locales-fix --without-wc-funcs" + myconf="${myconf} --disable-fcntl --enable-flock" + ;; + *-solaris*) + # Solaris has no flock in the standard headers + myconf="${myconf} --enable-fcntl --disable-flock" + ;; + *) + myconf="${myconf} --disable-fcntl --enable-flock" + ;; + esac + + # See Bug #22787 + unset WANT_AUTOCONF_2_5 WANT_AUTOCONF + + # 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 + + if use !vanilla && use !sidebar ; then + # rr.compressed patch + myconf="${myconf} --enable-compressed" + + # nntp patch applied conditionally, so avoid QA warning when doing + # --disable-nntp while patch not being applied, bug #262069 + use nntp && myconf="${myconf} --enable-nntp" + fi + + econf ${myconf} || die "configure failed" + emake || die "make failed" +} + +src_install() { + local ED=${ED-${D}} + make DESTDIR="${D}" install || die "install failed" + find "${ED}"/usr/share/doc -type f | grep -v "html\|manual" | xargs gzip + 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 + if use !doc; then + cp doc/mutt.man mutt.1 + cp doc/muttbug.man flea.1 + doman mutt.1 flea.1 + 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_setup() { + if ! use gpg && + has_version "<${CATEGORY}/${PN}-1.5.20-r2" && + built_with_use ${CATEGORY}/${PN} gpgme ; + then + ewarn 'The "gpgme" USE-flag has been changed into "gpg". You' + ewarn 'previously had "gpgme" set, and you most likely want to' + ewarn 'enable "gpg" instead, right now, to obtain equivalent behaviour.' + fi +} + +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 " http://www.gentoo.org/doc/en/guide-to-mutt.xml" + echo +} |