From 8637f2691f75e4959a1281590425e715cfa5c5e7 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Tue, 20 Jun 2006 16:54:17 +0000 Subject: [PATCH] Bump to recent snapshot (two commits since last one), cleanup of old snapshot Package-Manager: portage-2.1_rc2 --- mail-client/muttng/ChangeLog | 10 +- .../muttng/files/digest-muttng-20060619 | 3 + mail-client/muttng/muttng-20060415.ebuild | 10 +- mail-client/muttng/muttng-20060619.ebuild | 157 ++++++++++++++++++ 4 files changed, 170 insertions(+), 10 deletions(-) create mode 100644 mail-client/muttng/files/digest-muttng-20060619 create mode 100644 mail-client/muttng/muttng-20060619.ebuild diff --git a/mail-client/muttng/ChangeLog b/mail-client/muttng/ChangeLog index 7d4a695c3da6..6f6997a78df3 100644 --- a/mail-client/muttng/ChangeLog +++ b/mail-client/muttng/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for mail-client/muttng # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/muttng/ChangeLog,v 1.19 2006/06/14 16:11:23 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/muttng/ChangeLog,v 1.20 2006/06/20 16:54:17 grobian Exp $ + +*muttng-20060619 (20 Jun 2006) + + 20 Jun 2006; Fabian Groffen + -files/muttng-20060309-break_thread.patch, + -files/muttng-20060309-statusbar_length.patch, -muttng-20060309.ebuild, + muttng-20060415.ebuild, +muttng-20060619.ebuild: + Bump to recent snapshot (two commits since last one), cleanup of old snapshot 14 Jun 2006; Fabian Groffen muttng-20060309.ebuild, muttng-20060329.ebuild, muttng-20060415.ebuild: diff --git a/mail-client/muttng/files/digest-muttng-20060619 b/mail-client/muttng/files/digest-muttng-20060619 new file mode 100644 index 000000000000..84316cfe55d5 --- /dev/null +++ b/mail-client/muttng/files/digest-muttng-20060619 @@ -0,0 +1,3 @@ +MD5 7bc0c3fc4f1bfb28ec20c256e92cc41c muttng-20060619.tar.gz 2734131 +RMD160 d482eddb7ac5e1998faa570a496b14f85ff1eef1 muttng-20060619.tar.gz 2734131 +SHA256 151a99dd4c2b91805885c13b78e35e0f2f24ff01ff459945ca5d783a11c293a2 muttng-20060619.tar.gz 2734131 diff --git a/mail-client/muttng/muttng-20060415.ebuild b/mail-client/muttng/muttng-20060415.ebuild index c05ba943b6d3..1ce9a1862b79 100644 --- a/mail-client/muttng/muttng-20060415.ebuild +++ b/mail-client/muttng/muttng-20060415.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/muttng/muttng-20060415.ebuild,v 1.3 2006/06/17 18:39:40 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/muttng/muttng-20060415.ebuild,v 1.4 2006/06/20 16:54:17 grobian Exp $ inherit eutils flag-o-matic @@ -41,8 +41,6 @@ RDEPEND="nls? ( sys-devel/gettext ) )" DEPEND="${RDEPEND} net-mail/mailbase" -# sys-devel/automake -# >=sys-devel/autoconf-2.5 src_unpack() { unpack ${A} || die "unpack failed" @@ -51,12 +49,6 @@ src_unpack() { epatch "${FILESDIR}/${PN}-20060317-sigremovereply.patch" use doc || epatch "${FILESDIR}/${PN}-20060309-nodoc.patch" - -# aclocal -I m4 || die "aclocal failed" -# autoheader || die "autoheader failed" -# emake -C m4 -f Makefile.am.in || die "emake in m4 failed" -# automake --foreign || die "automake failed" -# WANT_AUTOCONF=2.5 autoconf || die "autoconf failed" } src_compile() { diff --git a/mail-client/muttng/muttng-20060619.ebuild b/mail-client/muttng/muttng-20060619.ebuild new file mode 100644 index 000000000000..22bbe95753cd --- /dev/null +++ b/mail-client/muttng/muttng-20060619.ebuild @@ -0,0 +1,157 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-client/muttng/muttng-20060619.ebuild,v 1.1 2006/06/20 16:54:17 grobian Exp $ + +inherit eutils flag-o-matic + +DESCRIPTION="mutt-ng -- fork of mutt with added features" +HOMEPAGE="http://www.muttng.org/" +SRC_URI="http://nion.modprobe.de/mutt-ng/snapshots/${P}.tar.gz" +IUSE="berkdb buffysize cjk crypt debug gdbm gnutls gpgme idn imap mbox nls nntp pop qdbm sasl slang smime smtp ssl doc" +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc-macos ~sparc ~x86" +RDEPEND="nls? ( sys-devel/gettext ) + >=sys-libs/ncurses-5.2 + idn? ( net-dns/libidn ) + qdbm? ( dev-db/qdbm ) + !qdbm? ( + gdbm? ( sys-libs/gdbm ) + !gdbm? ( berkdb? ( >=sys-libs/db-4 ) ) + ) + slang? ( >=sys-libs/slang-1.4.2 ) + smtp? ( net-libs/libesmtp ) + 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 ) + ) + gpgme? ( >=app-crypt/gpgme-0.9.0 ) + doc? ( + www-client/lynx + dev-libs/libxslt + app-text/htmltidy + app-text/openjade + virtual/tetex + )" +DEPEND="${RDEPEND} + net-mail/mailbase" +# sys-devel/automake +# >=sys-devel/autoconf-2.5 + +src_unpack() { + unpack ${A} || die "unpack failed" + cd "${S}" + epatch "${FILESDIR}/${PN}-20060309-smarttime.patch" + epatch "${FILESDIR}/${PN}-20060317-sigremovereply.patch" + + use doc || epatch "${FILESDIR}/${PN}-20060309-nodoc.patch" + +# aclocal -I m4 || die "aclocal failed" +# autoheader || die "autoheader failed" +# emake -C m4 -f Makefile.am.in || die "emake in m4 failed" +# automake --foreign || die "automake failed" +# WANT_AUTOCONF=2.5 autoconf || die "autoconf failed" +} + +src_compile() { + declare myconf=" + $(use_enable nls) \ + $(use_enable gpgme) \ + $(use_enable imap) \ + $(use_enable pop) \ + $(use_enable crypt pgp) \ + $(use_enable smime) \ + $(use_enable cjk default-japanese) \ + $(use_enable debug) \ + $(use_enable nntp) \ + $(use_with idn) \ + $(use_with smtp libesmtp) \ + --enable-compressed \ + --sysconfdir=/etc/${PN} \ + --with-docdir=/usr/share/doc/${PN}-${PVR} \ + --with-regex \ + --disable-fcntl --enable-flock --enable-nfs-fix \ + --with-mixmaster \ + --without-sasl \ + --enable-external-dotlock" + + # muttng prioritizes qdbm over gdbm, so we will too. + # hcache feature requires at least one database is in USE. + if use qdbm; then + myconf="${myconf} --enable-hcache \ + --with-qdbm --without-gdbm --without-bdb" + elif use gdbm; then + myconf="${myconf} --enable-hcache \ + --with-gdbm --without-qdbm --without-bdb" + elif use berkdb; then + myconf="${myconf} --enable-hcache \ + --with-bdb --without-gdbm --without-qdbm" + else + myconf="${myconf} --disable-hcache \ + --without-gdbm --without-qdbm --without-bdb" + fi + + # there's no need for gnutls or ssl 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 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 sasl2)" + else + myconf="${myconf} --without-gnutls --without-ssl --without-sasl2" + fi + + # See Bug #11170 + case ${ARCH} in + alpha|ppc) replace-flags "-O[3-9]" "-O2" ;; + esac + + if use buffysize; then + ewarn "USE=buffy-size is just a workaround. Disable it if you don't need it." + myconf="${myconf} --enable-buffy-size" + fi + + if use slang; then + myconf="${myconf} --with-slang" + ewarn "If you want a transparent background, merge ${PN} with USE=-slang." + else + # --without-slang doesn't work; + # specify --with-curses if you don't want slang + # (26 Sep 2001 agriffis) + myconf="${myconf} --with-curses" + fi + + if use mbox; then + myconf="${myconf} --with-mailpath=/var/spool/mail" + else + myconf="${myconf} --with-homespool=Maildir" + fi + + econf ${myconf} + emake || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" install || die "install failed" + find "${D}"/usr/share/doc -type f | grep -v "html\|manual" | xargs gzip + + dodoc COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO +} + +pkg_postinst() { + echo + einfo "NOTE: muttng is still under heavy development" + einfo "If you find a bug please report at http://bugs.gentoo.org" + echo +} -- 2.26.2