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

Package-Manager: portage-2.1.2.2

6 files changed, 77 insertions, 35 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/Manifest b/mail-client/mutt/Manifest
index a6619596ddf7..b43bc4b411c6 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -33,6 +33,10 @@ AUX mutt-1.5.13-sasl.patch 2468 RMD160 7c0ee6795f8b7a11059f3802b098735897cf7cf2
 MD5 acb389c41ad44abd6dd79073cf5820d4 files/mutt-1.5.13-sasl.patch 2468
 RMD160 7c0ee6795f8b7a11059f3802b098735897cf7cf2 files/mutt-1.5.13-sasl.patch 2468
 SHA256 f2a646a227dc768d93dba54b7c02d7ea4e0d4c1641f03d3878870821d38e4e50 files/mutt-1.5.13-sasl.patch 2468
+AUX mutt-1.5.15-parallel-make.patch 946 RMD160 80c9bfa187c784d650f5850469021f94547c897e SHA1 5b8b9e2d3bc8e36b8a95fc3bc79f5bfe50ec5008 SHA256 d4b6abc9f43989a6c7a22f3fbaafd4ffa524ad516c4cb5b8cfe884985cce74f6
+MD5 bdbf9eadab5bd4f2755ca8295e168661 files/mutt-1.5.15-parallel-make.patch 946
+RMD160 80c9bfa187c784d650f5850469021f94547c897e files/mutt-1.5.15-parallel-make.patch 946
+SHA256 d4b6abc9f43989a6c7a22f3fbaafd4ffa524ad516c4cb5b8cfe884985cce74f6 files/mutt-1.5.15-parallel-make.patch 946
 AUX slang.patch 493 RMD160 16dcedee86fe91ecac48ec5be8a6f67798ef7ac0 SHA1 f913e8c717f76186b0edc8856bf02a167d540c70 SHA256 040c8b63b2d805dae800fa9b1826d158b7104641339cee9a404985616b3502c7
 MD5 25e242fd402f42d5bd5230dbe9ea68a6 files/slang.patch 493
 RMD160 16dcedee86fe91ecac48ec5be8a6f67798ef7ac0 files/slang.patch 493
@@ -44,7 +48,7 @@ DIST mutt-1.5.13-gentoo-patches.tar.bz2 53418 RMD160 67274bef651c1c78d1e6878d8bb
 DIST mutt-1.5.13.tar.gz 3442681 RMD160 9327b7f928aad78a20c2395629113ac2519bb945 SHA1 6d5b88d33e1727bf0342c31f06d55d7a3d2d4e0a SHA256 e0481690c0caf23b5c88359b2dbac70308f8f138663e8fee482b163562fe8da9
 DIST mutt-1.5.14-gentoo-patches.tar.bz2 53898 RMD160 584cdf88e3fd0fea0a672ef5373bee0b95b0623f SHA1 6308bd600ac21ab19f1a5a0f1a624333a94cc6e0 SHA256 e71f0a6c2c62bca41280e64b2b4687ab9c468e4151d3ba3082125710a487a2f9
 DIST mutt-1.5.14.tar.gz 3441678 RMD160 ed4eeaf75d37757ed5b370e9763b6f8524df5ca7 SHA1 7be098c13302fab8a954095d17a9a64e1e1519c1 SHA256 9dbee28bd48a0f1779ba3b00f98dda74a3f629e8109f1842616d48b85013946a
-DIST mutt-1.5.15-gentoo-patches.tar.bz2 72590 RMD160 c8e44e2659f1fb3fc9d0f6c23127f30e74838104 SHA1 7ea2961ad9f7656beba08adeda5dfa8ddce48d35 SHA256 603affa18ebbd9192025b57d35d4c226d450eda599f35e5149a32b0a35ba2328
+DIST mutt-1.5.15-gentoo-patches-r1.tar.bz2 75096 RMD160 1e70e5cb99ec609bd67a4578ad0d084cbe0d8e56 SHA1 9cb7b827fecbf59d9800d6df62de05a1a6b03984 SHA256 76eddfd760f4db2e9bdc48c0d66317daf7bdc13971e7175ed31400223cfa7eab
 DIST mutt-1.5.15.tar.gz 3517899 RMD160 0cc084d2fcdabc0bc41632fcff90703c206de3db SHA1 1adabf6e07e099bb664c83e3c0100bbbdfec7a9a SHA256 03fa1f45d4743cd395b634d19aebbc2c1918cf6b683e0af51076ccc79f643a9a
 DIST mutt-1.5.4-imap-fcc-status.patch 380 RMD160 cbeac806b610bcd945bf3b52120a8aa2aba27df3 SHA1 6567f4c9fac3ca52f13c23aed2e3aa017b49e25f SHA256 22cb4e1625ae2d22f94e8d815cb3515db75801f8a4cb9e4f047c4fb4ded8757c
 DIST mutt-1.5.7-mixmaster+nntp.patch 310 RMD160 38e42b700d1badb3d39550ada6eb08cb122480a0 SHA1 996f1f922d8150ce9b70b484877fe22ec8d463dd SHA256 e035b746f391aaba51b2e0917ecf4c60db7c81546a9b54f06881cf75410575da
@@ -78,14 +82,14 @@ EBUILD mutt-1.5.14.ebuild 4477 RMD160 854063ac3471204336557b95f2f0b84db782e1a7 S
 MD5 6886b5dc7a2af8f34dae30df116faf2e mutt-1.5.14.ebuild 4477
 RMD160 854063ac3471204336557b95f2f0b84db782e1a7 mutt-1.5.14.ebuild 4477
 SHA256 cc27d01f1d3d727b37c9b9dad92fff1afd9600301238d195cbcb69d47244bb29 mutt-1.5.14.ebuild 4477
-EBUILD mutt-1.5.15.ebuild 4426 RMD160 df6d1ac3d4723f493883c6e3d5538b99795e13ad SHA1 e42e3cea760e7595883b9a32714e0ac564ad9877 SHA256 03edf498fa5d583bdefbe6dfc6ab86c0da53114fdad802a9233f38f738d29a1d
-MD5 20f368e77784e19e925b15e70a843dd4 mutt-1.5.15.ebuild 4426
-RMD160 df6d1ac3d4723f493883c6e3d5538b99795e13ad mutt-1.5.15.ebuild 4426
-SHA256 03edf498fa5d583bdefbe6dfc6ab86c0da53114fdad802a9233f38f738d29a1d mutt-1.5.15.ebuild 4426
-MISC ChangeLog 24994 RMD160 1cf23b14ff1497bfe94c195f4a1a60652f3944e8 SHA1 653005624a9af3e2e40e8d88c1b4a4b65b377198 SHA256 3f0ddb9e334271e3ae6f024c7d75de6e9647c17540285afb9a7d9e09ab114aa3
-MD5 aa80e836f511109ebec214af2d01eaf8 ChangeLog 24994
-RMD160 1cf23b14ff1497bfe94c195f4a1a60652f3944e8 ChangeLog 24994
-SHA256 3f0ddb9e334271e3ae6f024c7d75de6e9647c17540285afb9a7d9e09ab114aa3 ChangeLog 24994
+EBUILD mutt-1.5.15-r1.ebuild 4828 RMD160 6a9fc7aee2acfb5c7a4862378099c93081d9f8cb SHA1 3b457af0d791a5a0ec2ed4799b1cbbcf0957c05c SHA256 799f26fef01d02454b921c71b8effa07fe4926d8514b2281a2e844966cf3a104
+MD5 29a3d2f5ce4f8451cea0d4a0cfa30f08 mutt-1.5.15-r1.ebuild 4828
+RMD160 6a9fc7aee2acfb5c7a4862378099c93081d9f8cb mutt-1.5.15-r1.ebuild 4828
+SHA256 799f26fef01d02454b921c71b8effa07fe4926d8514b2281a2e844966cf3a104 mutt-1.5.15-r1.ebuild 4828
+MISC ChangeLog 25318 RMD160 c69a4fe373bd89722665afb6cb7bbf194fd1ed8b SHA1 07da4d0cb695cdb4e84a769dabaface6327882c2 SHA256 16e345096754f34f6f90d08f28579fe623d1fb252d6016d40284a43c243fd252
+MD5 8eafc3a1fd9a43681d11143bc8347be7 ChangeLog 25318
+RMD160 c69a4fe373bd89722665afb6cb7bbf194fd1ed8b ChangeLog 25318
+SHA256 16e345096754f34f6f90d08f28579fe623d1fb252d6016d40284a43c243fd252 ChangeLog 25318
 MISC metadata.xml 344 RMD160 6fb7283d0c812896b18cf91969a744fe9f34f57a SHA1 6a2f5f2822e49aadad2f8b16b8a565f627cc697f SHA256 9241b10ef441b7a14e730c2feff17fa387c48291caa52e788acca2befc4ad480
 MD5 cb5fc428c975ffb2fc20fc8c577cca9a metadata.xml 344
 RMD160 6fb7283d0c812896b18cf91969a744fe9f34f57a metadata.xml 344
@@ -108,13 +112,13 @@ SHA256 e79af34a5a8d834a2f5556020b501596f7bdc9a82eaf73896e2e60ebac2a029a files/di
 MD5 98ed952eb41aad4b8304e129ef1ac02e files/digest-mutt-1.5.14 518
 RMD160 c53753fa9da1428429f7a1c98d9a9346da362272 files/digest-mutt-1.5.14 518
 SHA256 0befea25b5cd922f96a15398408503be2d2e7935197a6d53270dd4ac42d19fb4 files/digest-mutt-1.5.14 518
-MD5 c21e0cb62beeadcf90f57145330637e5 files/digest-mutt-1.5.15 518
-RMD160 cb9a00c4eadad4bebbf8e16194f7bd60326670bd files/digest-mutt-1.5.15 518
-SHA256 a1e6696fc85d9b8ffd807987004fa437ee6924589e230abafe8ff1bfc4fad1ae files/digest-mutt-1.5.15 518
+MD5 12c96c3f4afe4c2c4b030374148c1975 files/digest-mutt-1.5.15-r1 527
+RMD160 e7e4744dcd72e71eafb8f65371b9c66095d3b371 files/digest-mutt-1.5.15-r1 527
+SHA256 4fb1da114e5f44603003b8d643dc5e45138ab8e1f45e6de39271096b13feb56e files/digest-mutt-1.5.15-r1 527
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFGG8ldViELBEf1JB0RAnfMAJ4lacXXCc6sAXUkf8r6PIbCAeN/EQCeOSRM
-zgVvTA1hsuvkPtOkxQr4r4U=
-=VtKm
+iD4DBQFGHjeuViELBEf1JB0RAqIjAJY2mypvlxtr0ZMH8bDMrok3rr59AKCCKhYo
+n7hPaxHzl2o1fnIwbtzGaw==
+=8g1K
 -----END PGP SIGNATURE-----
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