Update snapshot to fix compilation with gpgme, thanks to Stelian Ionescu in

#85771. Include ebuild overhaul from Torsten Veller in the same bug
Package-Manager: portage-2.0.51.19

5 files changed, 120 insertions, 15 deletions

diff --git a/mail-client/muttng/ChangeLog b/mail-client/muttng/ChangeLog
index 611c5d06338a..3c526824af4a 100644
--- a/mail-client/muttng/ChangeLog
+++ b/mail-client/muttng/ChangeLog
@@ -1,6 +1,13 @@
 # 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.2 2005/03/18 10:34:56 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/muttng/ChangeLog,v 1.3 2005/03/25 12:33:15 agriffis Exp $
+
+*muttng-20050325 (25 Mar 2005)
+
+  25 Mar 2005; Aron Griffis <agriffis@gentoo.org> muttng-20050317.ebuild,
+  +muttng-20050325.ebuild:
+  Update snapshot to fix compilation with gpgme, thanks to Stelian Ionescu in
+  #85771. Include ebuild overhaul from Torsten Veller in the same bug
 
   18 Mar 2005; Sven Wegener <swegener@gentoo.org> muttng-20050317.ebuild:
   Fixed invalid atoms in *DEPEND.
diff --git a/mail-client/muttng/Manifest b/mail-client/muttng/Manifest
index 194592aa457f..42e34a9bba54 100644
--- a/mail-client/muttng/Manifest
+++ b/mail-client/muttng/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 523def10f1b11303e9c9cc83134a11c1 muttng-20050317.ebuild 2734
-MD5 99947e1f2b2e893cdcfdfcae3c5c4d38 ChangeLog 493
+MD5 c44b8bf6113f22a496a9bae47ae5289f muttng-20050317.ebuild 2741
+MD5 187d35e38f8c3a2218d1dd51ca6af80e muttng-20050325.ebuild 2918
+MD5 c9399ac44f92648b9e0ff2f86cfef17d ChangeLog 775
 MD5 f46d05fe0172cb035a01f40d25242d30 metadata.xml 253
 MD5 e8992882a1c72fd8d97ea7eb60084283 files/digest-muttng-20050317 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCOq7bI1lqEGTUzyQRAl4UAKC7MIrUpK1YSO6G0kBcw8KlM+zHMwCgil7c
-SN3f6Dw6f+uDKYWv27bquPc=
-=5NbU
------END PGP SIGNATURE-----
+MD5 f4f235522662bdfeee247efdb8082cb1 files/digest-muttng-20050325 68
diff --git a/mail-client/muttng/files/digest-muttng-20050325 b/mail-client/muttng/files/digest-muttng-20050325
new file mode 100644
index 000000000000..2b478edd0753
--- /dev/null
+++ b/mail-client/muttng/files/digest-muttng-20050325
@@ -0,0 +1 @@
+MD5 4add7223b6f3dee313f1ce0cc052b7e6 muttng-20050325.tar.gz 2267641
diff --git a/mail-client/muttng/muttng-20050317.ebuild b/mail-client/muttng/muttng-20050317.ebuild
index 8e216b095150..fe5da21fbcb5 100644
--- a/mail-client/muttng/muttng-20050317.ebuild
+++ b/mail-client/muttng/muttng-20050317.ebuild
@@ -1,6 +1,6 @@
 # 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-20050317.ebuild,v 1.3 2005/03/18 10:34:56 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/muttng/muttng-20050317.ebuild,v 1.4 2005/03/25 12:33:15 agriffis Exp $
 
 DESCRIPTION="mutt-ng is the next generation of mutt."
 HOMEPAGE="http://www.muttng.org/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.muttng.org/snapshots/${P}.tar.gz"
 IUSE="crypt debug gnutls gpgme imap mbox nls nntp sasl slang smtp ssl"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~ia64 ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~x86"
 RDEPEND="nls? ( sys-devel/gettext )
 	>=sys-libs/ncurses-5.2
 	sys-devel/automake
diff --git a/mail-client/muttng/muttng-20050325.ebuild b/mail-client/muttng/muttng-20050325.ebuild
new file mode 100644
index 000000000000..4e4c99a869cc
--- /dev/null
+++ b/mail-client/muttng/muttng-20050325.ebuild
@@ -0,0 +1,105 @@
+# 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-20050325.ebuild,v 1.1 2005/03/25 12:33:15 agriffis Exp $
+
+DESCRIPTION="mutt-ng is the next generation of mutt."
+HOMEPAGE="http://www.muttng.org/"
+SRC_URI="http://www.muttng.org/snapshots/${P}.tar.gz"
+IUSE="crypt debug gnutls gdbm gpgme idn imap mbox nls nntp sasl slang smtp ssl"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~x86"
+RDEPEND="nls? ( sys-devel/gettext )
+	>=sys-libs/ncurses-5.2
+	idn?     ( net-dns/libidn )
+	gdbm?    ( sys-libs/gdbm )
+	!gdbm?   ( >=sys-libs/db-4 )
+	smtp?    ( net-libs/libesmtp )
+	slang?   ( >=sys-libs/slang-1.4.2 )
+	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 "unpacking failed"
+
+	aclocal -I m4					|| die "aclocal failed"
+	autoheader						|| die "autoheader failed"
+	make -C m4 -f Makefile.am.in	|| die "make in m4 failed"
+	automake --foreign				|| die "automake failed"
+	WANT_AUTOCONF=2.5 autoconf		|| die "autoconf failed"
+}
+
+src_compile() {
+	local myconf="
+		$(use_enable nls) \
+		$(use_enable gpgme) \
+		$(use_enable imap) \
+		$(use_with sasl sasl2) \
+		$(use_enable crypt pgp) \
+		$(use_enable nntp) \
+		$(use_enable debug) \
+		$(use_with smtp libesmtp) \
+		$(use_with idn) \
+		$(use_with gdbm) \
+		--enable-hcache \
+		--enable-compressed \
+		--sysconfdir=/etc/muttng \
+		--with-docdir=/usr/share/doc/muttng-${PVR} \
+		--with-regex \
+		--enable-pop \
+		--disable-fcntl \
+		--enable-flock \
+		--with-mixmaster \
+		--enable-external-dotlock"
+
+		if useq gnutls; then
+			myconf="${myconf} --with-gnutls"
+		elif useq ssl; then
+			myconf="${myconf} --with-ssl"
+		fi
+
+		if useq slang; then
+			myconf="${myconf} --with-slang"
+			ewarn "To use a transparend background merge muttng with USE=-slang"
+		else
+			# --without-slang doesn't work;
+			# specify --with-curses if you don't want slang
+			myconf="${myconf} --with-curses"
+		fi
+
+		if useq 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 useq 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
+}