Sync with mutt-1.5.9 ebuild:

- inherit flag-o-matic and restrict optimization on some arches
- honor buffysize, cjk and smime USE-flags
- use --enable-nfs-fix
(Portage version: 2.0.51.22-r2)

4 files changed, 170 insertions, 16 deletions

diff --git a/mail-client/muttng/ChangeLog b/mail-client/muttng/ChangeLog
index 087983b60af1..be9ba0594054 100644
--- a/mail-client/muttng/ChangeLog
+++ b/mail-client/muttng/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-client/muttng
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/muttng/ChangeLog,v 1.7 2005/08/10 22:51:53 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/muttng/ChangeLog,v 1.8 2005/08/11 22:38:10 agriffis Exp $
+
+*muttng-20050809-r1 (11 Aug 2005)
+
+  11 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  +muttng-20050809-r1.ebuild:
+  Sync with mutt-1.5.9 ebuild:
+  - inherit flag-o-matic and restrict optimization on some arches
+  - honor buffysize, cjk and smime USE-flags
+  - use --enable-nfs-fix
 
   10 Aug 2005; Aron Griffis <agriffis@gentoo.org> muttng-20050809.ebuild:
   Add berkdb to USE. Honor local USE=pop as well. Fix building when USE='-gdbm
diff --git a/mail-client/muttng/Manifest b/mail-client/muttng/Manifest
index 226b95b5ed44..849575d42106 100644
--- a/mail-client/muttng/Manifest
+++ b/mail-client/muttng/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 4fd13cafa525e845aae4166783d64bde ChangeLog 1441
-MD5 e8992882a1c72fd8d97ea7eb60084283 files/digest-muttng-20050317 68
-MD5 f4f235522662bdfeee247efdb8082cb1 files/digest-muttng-20050325 68
-MD5 04627fce26bec87a8f2ff9a601b92a3a files/digest-muttng-20050809 68
-MD5 7f8dd20237497b4bba89df29f400bd6d files/muttng-20050809-nodoc.patch 566
+MD5 1a61d0be7d250e7ab13dbf6efa958739 muttng-20050809-r1.ebuild 4335
 MD5 f46d05fe0172cb035a01f40d25242d30 metadata.xml 253
 MD5 c44b8bf6113f22a496a9bae47ae5289f muttng-20050317.ebuild 2741
+MD5 4fd13cafa525e845aae4166783d64bde ChangeLog 1441
 MD5 d4aa39cf3d3348af890827d75956c9cd muttng-20050325.ebuild 2931
 MD5 456ffe957aa2e259d92a32f8cd5b9500 muttng-20050809.ebuild 3969
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFC+pgwI1lqEGTUzyQRAgL1AJ4/H7zwjvG9GMOY4AlBQOxp0PRvFwCeISrC
-itVcJfAk3I9i6/Z8m9TIeY4=
-=Er+6
------END PGP SIGNATURE-----
+MD5 e8992882a1c72fd8d97ea7eb60084283 files/digest-muttng-20050317 68
+MD5 04627fce26bec87a8f2ff9a601b92a3a files/digest-muttng-20050809 68
+MD5 7f8dd20237497b4bba89df29f400bd6d files/muttng-20050809-nodoc.patch 566
+MD5 f4f235522662bdfeee247efdb8082cb1 files/digest-muttng-20050325 68
+MD5 04627fce26bec87a8f2ff9a601b92a3a files/digest-muttng-20050809-r1 68
diff --git a/mail-client/muttng/files/digest-muttng-20050809-r1 b/mail-client/muttng/files/digest-muttng-20050809-r1
new file mode 100644
index 000000000000..7fd4b4b91975
--- /dev/null
+++ b/mail-client/muttng/files/digest-muttng-20050809-r1
@@ -0,0 +1 @@
+MD5 cff8c65d17ca2f0da52cc84b3eae1031 muttng-20050809.tar.gz 2448668
diff --git a/mail-client/muttng/muttng-20050809-r1.ebuild b/mail-client/muttng/muttng-20050809-r1.ebuild
new file mode 100644
index 000000000000..417f982c7358
--- /dev/null
+++ b/mail-client/muttng/muttng-20050809-r1.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/muttng/muttng-20050809-r1.ebuild,v 1.1 2005/08/11 22:38:10 agriffis 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"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~sparc"
+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 ) )
+	)
+	smtp?    ( net-libs/libesmtp )
+	slang?   ( >=sys-libs/slang-1.4.2 )
+	imap?    (
+		gnutls?  ( >=net-libs/gnutls-1.0.17 )
+		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+	)
+	pop?     (
+		gnutls?  ( >=net-libs/gnutls-1.0.17 )
+		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
+	)
+	gpgme?   ( >=app-crypt/gpgme-0.9.0 )
+	sasl?    ( >=dev-libs/cyrus-sasl-2 )"
+DEPEND="${RDEPEND}
+	sys-devel/automake
+	>=sys-devel/autoconf-2.5
+	net-mail/mailbase"
+
+src_unpack() {
+	unpack ${P}.tar.gz && cd ${S} || die "unpack failed"
+
+	# disable sgml conversion since it fails with sgml2html
+	epatch ${FILESDIR}/muttng-20050809-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_with sasl sasl2) \
+		$(use_enable crypt pgp) \
+		$(use_enable smime) \
+		$(use_enable cjk default-japanese) \
+		$(use_enable debug) \
+		$(use_enable nntp) \
+		$(use_with smtp libesmtp) \
+		$(use_with idn) \
+		--enable-compressed \
+		--sysconfdir=/etc/${PN} \
+		--with-docdir=/usr/share/doc/${PN}-${PVR} \
+		--with-regex \
+		--disable-fcntl --enable-flock --enable-nfs-fix \
+		--with-mixmaster \
+		--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
+	else
+		myconf="${myconf} --without-gnutls --without-ssl"
+	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-maildir=/var/spool/mail"
+	else
+		myconf="${myconf} --with-homespool=Maildir"
+	fi
+
+	econf ${myconf}
+	emake || die "emake failed (myconf=${myconf})"
+}
+
+src_install() {
+	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/muttng
+		newins ${FILESDIR}/Muttngrc.mbox Muttngrc
+	else
+		insinto /etc/muttng
+		doins ${FILESDIR}/Muttngrc
+	fi
+
+	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
+}
+
+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
+}