diff options
author | Fernando J. Pereda <ferdy@gentoo.org> | 2007-04-12 13:43:45 +0000 |
---|---|---|
committer | Fernando J. Pereda <ferdy@gentoo.org> | 2007-04-12 13:43:45 +0000 |
commit | 1ec77decbde944a8124c9a00f5233e68fd0783c4 (patch) | |
tree | c0f445787ff3b46ae00f0f60ee3c6f65b3607cb2 /mail-client/mutt | |
parent | Add ~x86 (diff) | |
download | gentoo-2-1ec77decbde944a8124c9a00f5233e68fd0783c4.tar.gz gentoo-2-1ec77decbde944a8124c9a00f5233e68fd0783c4.tar.bz2 gentoo-2-1ec77decbde944a8124c9a00f5233e68fd0783c4.zip |
Refresh nntp patch in our patchset. Add smtp support as per bug #174123. Fix parallel make as per bug #173969. Fix dependencies. Remove 1.5.15-r0
(Portage version: 2.1.2.2)
Diffstat (limited to 'mail-client/mutt')
-rw-r--r-- | mail-client/mutt/ChangeLog | 10 | ||||
-rw-r--r-- | mail-client/mutt/files/digest-mutt-1.5.15 | 6 | ||||
-rw-r--r-- | mail-client/mutt/files/digest-mutt-1.5.15-r1 | 6 | ||||
-rw-r--r-- | mail-client/mutt/files/mutt-1.5.15-parallel-make.patch | 16 | ||||
-rw-r--r-- | mail-client/mutt/mutt-1.5.15-r1.ebuild (renamed from mail-client/mutt/mutt-1.5.15.ebuild) | 40 |
5 files changed, 58 insertions, 20 deletions
diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog index e1c0cfed42bc..69ab582a6429 100644 --- a/mail-client/mutt/ChangeLog +++ b/mail-client/mutt/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for mail-client/mutt # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.104 2007/04/10 17:28:36 ferdy Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.105 2007/04/12 13:43:45 ferdy Exp $ + +*mutt-1.5.15-r1 (12 Apr 2007) + + 12 Apr 2007; Fernando J. Pereda <ferdy@gentoo.org> + +files/mutt-1.5.15-parallel-make.patch, -mutt-1.5.15.ebuild, + +mutt-1.5.15-r1.ebuild: + Refresh nntp patch in our patchset. Add smtp support as per bug #174123. Fix + parallel make as per bug #173969. Fix dependencies. Remove 1.5.15-r0 10 Apr 2007; Fernando J. Pereda <ferdy@gentoo.org> mutt-1.5.15.ebuild: Force -j1 as per bug #173969 diff --git a/mail-client/mutt/files/digest-mutt-1.5.15 b/mail-client/mutt/files/digest-mutt-1.5.15 deleted file mode 100644 index 055dcec719f4..000000000000 --- a/mail-client/mutt/files/digest-mutt-1.5.15 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 6e04e127620f07f7494aab96ca1a0c8c mutt-1.5.15-gentoo-patches.tar.bz2 72590 -RMD160 c8e44e2659f1fb3fc9d0f6c23127f30e74838104 mutt-1.5.15-gentoo-patches.tar.bz2 72590 -SHA256 603affa18ebbd9192025b57d35d4c226d450eda599f35e5149a32b0a35ba2328 mutt-1.5.15-gentoo-patches.tar.bz2 72590 -MD5 b2c1eb45fd958f6589ee52a98f2a3ce1 mutt-1.5.15.tar.gz 3517899 -RMD160 0cc084d2fcdabc0bc41632fcff90703c206de3db mutt-1.5.15.tar.gz 3517899 -SHA256 03fa1f45d4743cd395b634d19aebbc2c1918cf6b683e0af51076ccc79f643a9a mutt-1.5.15.tar.gz 3517899 diff --git a/mail-client/mutt/files/digest-mutt-1.5.15-r1 b/mail-client/mutt/files/digest-mutt-1.5.15-r1 new file mode 100644 index 000000000000..b41ec091ebed --- /dev/null +++ b/mail-client/mutt/files/digest-mutt-1.5.15-r1 @@ -0,0 +1,6 @@ +MD5 af56827dcd36aa8454aec7a0214e47c4 mutt-1.5.15-gentoo-patches-r1.tar.bz2 75096 +RMD160 1e70e5cb99ec609bd67a4578ad0d084cbe0d8e56 mutt-1.5.15-gentoo-patches-r1.tar.bz2 75096 +SHA256 76eddfd760f4db2e9bdc48c0d66317daf7bdc13971e7175ed31400223cfa7eab mutt-1.5.15-gentoo-patches-r1.tar.bz2 75096 +MD5 b2c1eb45fd958f6589ee52a98f2a3ce1 mutt-1.5.15.tar.gz 3517899 +RMD160 0cc084d2fcdabc0bc41632fcff90703c206de3db mutt-1.5.15.tar.gz 3517899 +SHA256 03fa1f45d4743cd395b634d19aebbc2c1918cf6b683e0af51076ccc79f643a9a mutt-1.5.15.tar.gz 3517899 diff --git a/mail-client/mutt/files/mutt-1.5.15-parallel-make.patch b/mail-client/mutt/files/mutt-1.5.15-parallel-make.patch new file mode 100644 index 000000000000..e5026ee518d1 --- /dev/null +++ b/mail-client/mutt/files/mutt-1.5.15-parallel-make.patch @@ -0,0 +1,16 @@ +diff --git a/doc/Makefile.am b/doc/Makefile.am +index c151d56..b1b5784 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -130,10 +130,9 @@ EDIT = sed -e 's,@sysconfdir\@,$(sysconfdir),g' \ + mutt.1: $(srcdir)/mutt.man + $(EDIT) $(srcdir)/mutt.man > $@ + +-stamp-doc-xml: $(top_srcdir)/makedoc.c $(top_srcdir)/makedoc-defs.h $(top_srcdir)/init.h \ ++stamp-doc-xml: ../makedoc$(EXEEXT) $(top_srcdir)/makedoc-defs.h $(top_srcdir)/init.h \ + manual.xml.head $(top_srcdir)/functions.h $(top_srcdir)/OPS* manual.xml.tail \ + $(srcdir)/gen-map-doc $(top_srcdir)/VERSION $(top_srcdir)/ChangeLog +- $(MAKE) -j1 ../makedoc$(EXEEXT) # we do not want to rebuild the documentation in tarball builds + ( date=`head -n 1 $(top_srcdir)/ChangeLog | LC_ALL=C cut -d ' ' -f 1` && \ + sed -e "s/@VERSION\@/`cat $(top_srcdir)/VERSION` ($$date)/" $(srcdir)/manual.xml.head && \ + $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -s && \ diff --git a/mail-client/mutt/mutt-1.5.15.ebuild b/mail-client/mutt/mutt-1.5.15-r1.ebuild index b5c86b6f2726..2a4bf5916f28 100644 --- a/mail-client/mutt/mutt-1.5.15.ebuild +++ b/mail-client/mutt/mutt-1.5.15-r1.ebuild @@ -1,17 +1,19 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.15.ebuild,v 1.2 2007/04/10 17:28:36 ferdy Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.15-r1.ebuild,v 1.1 2007/04/12 13:43:45 ferdy Exp $ 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="ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz !vanilla? ( - mirror://gentoo/${P}-gentoo-patches.tar.bz2 + mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2 )" IUSE="berkdb buffysize cjk crypt debug gdbm gnutls gpgme idn imap mbox nls nntp -pop qdbm sasl smime ssl vanilla" +pop qdbm sasl smime smtp ssl vanilla" SLOT="0" LICENSE="GPL-2" KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" @@ -31,19 +33,32 @@ RDEPEND=">=sys-libs/ncurses-5.2 !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 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) smime? ( >=dev-libs/openssl-0.9.6 ) app-misc/mime-types" DEPEND="${RDEPEND} - net-mail/mailbase" + net-mail/mailbase + !vanilla? ( + dev-libs/libxml2 + dev-libs/libxslt + app-text/docbook-xsl-stylesheets + || ( www-client/lynx www-client/w3m ) + )" -PATCHDIR="${WORKDIR}"/${P}-gentoo-patches +PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV} src_unpack() { unpack ${A} && cd "${S}" || die "unpack failed" if ! use vanilla ; then + epatch "${FILESDIR}"/${P}-parallel-make.patch + if ! use nntp ; then rm "${PATCHDIR}"/07-nntp.patch fi @@ -53,8 +68,6 @@ src_unpack() { done AT_M4DIR="m4" eautoreconf - else - eautoconf fi } @@ -64,6 +77,7 @@ src_compile() { $(use_enable gpgme) \ $(use_enable imap) \ $(use_enable pop) \ + $(use_enable smtp) \ $(use_enable crypt pgp) \ $(use_enable smime) \ $(use_enable cjk default-japanese) \ @@ -99,7 +113,7 @@ src_compile() { # there's no need for gnutls, ssl or sasl without either pop or imap. # in fact mutt's configure will bail if you do: # --without-pop --without-imap --with-ssl - if use pop || use imap; then + if use pop || use imap || use smtp ; then if use gnutls; then myconf="${myconf} --with-gnutls" elif use ssl; then @@ -136,22 +150,22 @@ src_compile() { fi econf ${myconf} || die "configure failed" - emake -j1 || die "make failed" + emake || die "make failed" } src_install() { - make DESTDIR=${D} install || die "install failed" + make DESTDIR="${D}" install || die "install failed" find ${D}/usr/share/doc -type f | grep -v "html\|manual" | xargs gzip if use mbox; then insinto /etc/mutt - newins ${FILESDIR}/Muttrc.mbox Muttrc + newins "${FILESDIR}"/Muttrc.mbox Muttrc else insinto /etc/mutt - doins ${FILESDIR}/Muttrc + doins "${FILESDIR}"/Muttrc fi # A newer file is provided by app-misc/mime-types. So we link it. - rm ${D}/etc/${PN}/mime.types + rm "${D}"/etc/${PN}/mime.types dosym /etc/mime.types /etc/${PN}/mime.types dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION |