Fix the nodoc patch to apply to mutt. The muttng patch didn't apply

correctly. Use --with-mailpath instead of --with-maildir #100831
(Portage version: 2.0.51.22-r2)

5 files changed, 23 insertions, 30 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index 189478e470ca..973a1b543eae 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/mutt
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.52 2005/08/11 22:57:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.53 2005/08/11 23:22:39 agriffis Exp $
+
+  11 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  +files/mutt-1.5.9-nodoc.patch, -files/muttng-20050809-nodoc.patch,
+  mutt-1.5.9.ebuild:
+  Fix the nodoc patch to apply to mutt. The muttng patch didn't apply
+  correctly. Use --with-mailpath instead of --with-maildir #100831
 
   11 Aug 2005; Aron Griffis <agriffis@gentoo.org> mutt-1.4.2.1.ebuild,
   mutt-1.5.8-r1.ebuild, mutt-1.5.8-r2.ebuild, mutt-1.5.9.ebuild:
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 9837d5cd18a3..5775ffa40800 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -1,25 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 aa5fad36225eca95b13ed368c0ca4300 mutt-1.5.9.ebuild 5983
+MD5 d4d47454cb77d06c591a9bbd038c1665 mutt-1.5.9.ebuild 5978
 MD5 b684c056a91bcad2e4f3d99c9332c1a0 mutt-1.5.8-r2.ebuild 4961
 MD5 f46d05fe0172cb035a01f40d25242d30 metadata.xml 253
 MD5 e44bf55819260efa50a49ae2c09496b7 ChangeLog 16802
 MD5 640db6b6a90de9a4579acf772c311b94 mutt-1.4.2.1.ebuild 3331
 MD5 cb2a1c4875a1f091afd9577f4f61d2e8 mutt-1.5.8-r1.ebuild 4605
+MD5 b1da3a7a15479e6c5f08fb96c33b201e files/mutt-1.5.9-nodoc.patch 382
 MD5 6064ff5a3d1a71ccdb48f88872feb3a3 files/Muttrc 667
 MD5 3f1450d2a3bdb1e595bf5820239364cc files/digest-mutt-1.5.9 659
 MD5 25e242fd402f42d5bd5230dbe9ea68a6 files/slang.patch 493
-MD5 7f8dd20237497b4bba89df29f400bd6d files/muttng-20050809-nodoc.patch 566
 MD5 74ddaf505ea8bd19fbeb1330a23506ea files/8patch-1.5.6.dyc.source_stat 1531
 MD5 30ce590d0284ffb0896857714c6a47d4 files/Muttrc.mbox 486
 MD5 17ca1e2a5696251d01b9b488bcb0fc79 files/digest-mutt-1.5.8-r1 581
 MD5 2f50af3ba9259b1ac0dcf7faa2e9545e files/digest-mutt-1.5.8-r2 662
 MD5 cae412df424c3f499c539c93ebd02e48 files/digest-mutt-1.4.2.1 292
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC+9fkBXaUFmZvwyMRArJuAKC8aDKXpcSzU7+HMNty3ysEOQrJdACdEJWq
-OSi8NnWDbEHr0ywQH1Un3z8=
-=615H
------END PGP SIGNATURE-----
diff --git a/mail-client/mutt/files/mutt-1.5.9-nodoc.patch b/mail-client/mutt/files/mutt-1.5.9-nodoc.patch
new file mode 100644
index 000000000000..5c97e8e66d55
--- /dev/null
+++ b/mail-client/mutt/files/mutt-1.5.9-nodoc.patch
@@ -0,0 +1,11 @@
+--- mutt-1.5.9/doc/Makefile.in.nosgml	2005-02-15 14:28:24.000000000 -0500
++++ mutt-1.5.9/doc/Makefile.in	2005-08-11 19:17:29.210073879 -0400
+@@ -63,7 +63,7 @@
+ 	ChangeLog.old					\
+ 	README NEWS TODO README.SECURITY README.SSL 
+ 
+-all: muttrc.man try-html try-txt
++all: muttrc.man
+ 
+ try-html: ../makedoc
+ 	test -f manual.html || $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
diff --git a/mail-client/mutt/files/muttng-20050809-nodoc.patch b/mail-client/mutt/files/muttng-20050809-nodoc.patch
deleted file mode 100644
index f89a8c18c9fc..000000000000
--- a/mail-client/mutt/files/muttng-20050809-nodoc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-sgml2html from sgmltools-lite fails miserably trying to build the
-documentation.  Just skip it for now...
-
---- muttng-20050809/doc/Makefile.in.nodoc	2005-08-06 14:07:10.000000000 -0400
-+++ muttng-20050809/doc/Makefile.in	2005-08-10 16:50:11.000000000 -0400
-@@ -62,7 +62,7 @@
- topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog	\
- 	UPGRADING README NEWS TODO TODO.mutt-ng README.SSL 
- 
--all: muttng.1 muttrc.man try-html try-txt
-+all: muttng.1 muttrc.man
- 
- try-html: ../makedoc$(EXEEXT)
- 	test -f manual.html || $(MAKE) manual.html || cp $(srcdir)/manual*.html ./
diff --git a/mail-client/mutt/mutt-1.5.9.ebuild b/mail-client/mutt/mutt-1.5.9.ebuild
index 9c1b5a39b7dd..3e052bcbaf2f 100644
--- a/mail-client/mutt/mutt-1.5.9.ebuild
+++ b/mail-client/mutt/mutt-1.5.9.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/mutt/mutt-1.5.9.ebuild,v 1.2 2005/08/11 22:57:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.9.ebuild,v 1.3 2005/08/11 23:22:39 agriffis Exp $
 
 inherit eutils flag-o-matic
 
@@ -65,7 +65,7 @@ src_unpack() {
 	unpack ${P}i.tar.gz && cd ${S} || die "unpack failed"
 
 	# disable sgml conversion since it fails with sgml2html
-	epatch ${FILESDIR}/muttng-20050809-nodoc.patch
+	epatch ${FILESDIR}/mutt-1.5.9-nodoc.patch
 
 	if ! use vanilla; then
 		epatch ${DISTDIR}/${compressed_patch}
@@ -154,7 +154,7 @@ src_compile() {
 	fi
 
 	if use mbox; then
-		myconf="${myconf} --with-maildir=/var/spool/mail"
+		myconf="${myconf} --with-mailpath=/var/spool/mail"
 	else
 		myconf="${myconf} --with-homespool=Maildir"
 	fi