Version bump. Fixed dependencies on =sys-libs/slang-1* as per bug #141947. Changed invalid values for WANT_AUTOCONF as per bug #143429.

Package-Manager: portage-2.1-r2

11 files changed, 241 insertions, 59 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index a0d17e5b70eb..258a81383f9d 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-client/mutt
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.84 2006/08/07 20:12:01 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.85 2006/08/14 17:48:48 ferdy Exp $
+
+*mutt-1.5.13 (14 Aug 2006)
+
+  14 Aug 2006; Fernando J. Pereda <ferdy@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,
+  mutt-1.5.10-r1.ebuild, mutt-1.5.11.ebuild, mutt-1.5.11-r1.ebuild,
+  +mutt-1.5.13.ebuild:
+  Version bump. Fixed dependencies on =sys-libs/slang-1* as per bug #141947.
+  Changed invalid values for WANT_AUTOCONF as per bug #143429.
 
   07 Aug 2006; Fernando J. Pereda <ferdy@gentoo.org>
   +files/mutt-1.5.12-fix-pop-c.patch, mutt-1.5.12.ebuild:
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 32977d244deb..fc3cbc5da2f7 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -51,6 +51,8 @@ DIST mutt-1.5.10i.tar.gz 3156345 RMD160 e6855dd72e41b5e451b17bac9934bea8ca0c5db7
 DIST mutt-1.5.11.tar.gz 3187375 RMD160 812bfa6b1c9bfb1650341f7522298699c7b214a5 SHA1 cc5823016fe7de6ee3a131b19a3f78796f9f53d5 SHA256 0ff256a9851952a5f6dfb4b7dccf5dc26db9de5502d035748abc93dec84af474
 DIST mutt-1.5.12-gentoo-patches.tar.bz2 53435 RMD160 419ff2ebd14ad394ea5d34814f17583ee5a439b6 SHA1 013376bfbb97cb23ef58bf8248ea91b656b4bfe2 SHA256 e285cd217707719ba7a22e912c6cc00319e9873f31580bdef51331d9b6313dff
 DIST mutt-1.5.12.tar.gz 3440835 RMD160 e68d4c5b099b8148769d138a36fa8561b278969c SHA1 bb888a35f42a77de7e326c03b60854ad1cc266ea SHA256 0d0c2ab6cea0d93579bc5490fafdae3bf640070d993490c7b00ccac4fa808b67
+DIST mutt-1.5.13-gentoo-patches.tar.bz2 53418 RMD160 67274bef651c1c78d1e6878d8bb17316abf9d30e SHA1 95819031d9b14914c04ebd36e3ee004b564b942c SHA256 b0a8737ab8ec42b5f071eb08356a2572c49f98c73c3bf42396fd481c4650ef1d
+DIST mutt-1.5.13.tar.gz 3442681 RMD160 9327b7f928aad78a20c2395629113ac2519bb945 SHA1 6d5b88d33e1727bf0342c31f06d55d7a3d2d4e0a SHA256 e0481690c0caf23b5c88359b2dbac70308f8f138663e8fee482b163562fe8da9
 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
 DIST mutt-1.5.8i.tar.gz 3010088 RMD160 2b941aa12381efb2cbad204ebf5512051909911b SHA1 d5381676b7bfb4ebee5d5261e5236d88414c2bd2 SHA256 3f50f60651a8c2543a8935f6593f7260b392e6207e4fa1d591ae54ba077124e0
@@ -74,46 +76,50 @@ DIST patch-1.5.8.vvv.nntp-gentoo-r2.bz2 71752 RMD160 616740af44b0a71b6cc1481c771
 DIST patch-1.5.8.vvv.nntp-gentoo.bz2 71780
 DIST patch-1.5.9.rr.compressed.gz 10260
 DIST patch-1.5.9.vvv.nntp-gentoo.bz2 72024
-EBUILD mutt-1.4.2.1.ebuild 3331 RMD160 61a133db62ec3fb86ac91b3cbff6d17136ee32a9 SHA1 528e9da0cf54a68d6e0641f9ad6ac933ac7591a2 SHA256 78715860e9cbd3729d7e141e5d68444f271df8d7cd604067ca511f4f46acae41
-MD5 dc42018781b04e0934dcfc4f3a6e6303 mutt-1.4.2.1.ebuild 3331
-RMD160 61a133db62ec3fb86ac91b3cbff6d17136ee32a9 mutt-1.4.2.1.ebuild 3331
-SHA256 78715860e9cbd3729d7e141e5d68444f271df8d7cd604067ca511f4f46acae41 mutt-1.4.2.1.ebuild 3331
-EBUILD mutt-1.5.10-r1.ebuild 5581 RMD160 1264145423353dae62afab1d92448b81d8398c55 SHA1 a81cdfd2f5d35f9e4513bf5d2abd1b58d7d35a9b SHA256 0425c04d8498a095116fe95796070ba5757b4281198ee4ddcba145c48869fc5a
-MD5 327b8e25b061f5295baca07bfddab43d mutt-1.5.10-r1.ebuild 5581
-RMD160 1264145423353dae62afab1d92448b81d8398c55 mutt-1.5.10-r1.ebuild 5581
-SHA256 0425c04d8498a095116fe95796070ba5757b4281198ee4ddcba145c48869fc5a mutt-1.5.10-r1.ebuild 5581
-EBUILD mutt-1.5.11-r1.ebuild 5781 RMD160 2431134eb4e519cdbf44b6b90d1fe538d3637203 SHA1 e21380840042c25fc02388ac5844634dc34d42b4 SHA256 d6a72b0856ff2d8ae2c2bd62b74ab59f1de7df68d99e00316db3443639e8147d
-MD5 3b8e3d76bcfb51c31777a7ebd70ebebd mutt-1.5.11-r1.ebuild 5781
-RMD160 2431134eb4e519cdbf44b6b90d1fe538d3637203 mutt-1.5.11-r1.ebuild 5781
-SHA256 d6a72b0856ff2d8ae2c2bd62b74ab59f1de7df68d99e00316db3443639e8147d mutt-1.5.11-r1.ebuild 5781
+EBUILD mutt-1.4.2.1.ebuild 3325 RMD160 d47eb33982b3b243701a7f34ed16d0bad99964e9 SHA1 822440e559fe02631df6830e0c368ef8c7076a00 SHA256 e9b0544f977363fef286f261d54ed9cc9c40dbf71da5be5e169bce35144d98f2
+MD5 0442dc8a023fb362892f0211a76643b0 mutt-1.4.2.1.ebuild 3325
+RMD160 d47eb33982b3b243701a7f34ed16d0bad99964e9 mutt-1.4.2.1.ebuild 3325
+SHA256 e9b0544f977363fef286f261d54ed9cc9c40dbf71da5be5e169bce35144d98f2 mutt-1.4.2.1.ebuild 3325
+EBUILD mutt-1.5.10-r1.ebuild 5577 RMD160 e96b0ad0d90042cd9d9eed36407b4591593a21af SHA1 56558994db7908d92e53ac55167e7e4c6f7ba919 SHA256 9ade915d3fbb4043eb0de244e71676aa7a0f4969dd87a48b5686601d50b43a2f
+MD5 fe66864cfc0e74a02e8eef626307f944 mutt-1.5.10-r1.ebuild 5577
+RMD160 e96b0ad0d90042cd9d9eed36407b4591593a21af mutt-1.5.10-r1.ebuild 5577
+SHA256 9ade915d3fbb4043eb0de244e71676aa7a0f4969dd87a48b5686601d50b43a2f mutt-1.5.10-r1.ebuild 5577
+EBUILD mutt-1.5.11-r1.ebuild 5780 RMD160 5ef7a94a86315765889f5c529422ce84a5a7ce76 SHA1 a916a2323d024fb3ca052a9992bc9c180921a4d9 SHA256 1ab10a4f034636091f6681eeb4dd5d629917daa0a789f31384bc91c536851976
+MD5 d3928473d52712c447ba78bdcd099dca mutt-1.5.11-r1.ebuild 5780
+RMD160 5ef7a94a86315765889f5c529422ce84a5a7ce76 mutt-1.5.11-r1.ebuild 5780
+SHA256 1ab10a4f034636091f6681eeb4dd5d629917daa0a789f31384bc91c536851976 mutt-1.5.11-r1.ebuild 5780
 EBUILD mutt-1.5.11-r2.ebuild 5826 RMD160 9c6ddfed254442886365632db5db43fdcca8bb3a SHA1 f2f01f25c8cd8e26065251432125fadcdb64e773 SHA256 ad541853e34fb961aaf30cf6da3bc1a1637675f7afbd2724ff445ff7c53d2a76
 MD5 4bb02d0ef6c6631248391487f07776b9 mutt-1.5.11-r2.ebuild 5826
 RMD160 9c6ddfed254442886365632db5db43fdcca8bb3a mutt-1.5.11-r2.ebuild 5826
 SHA256 ad541853e34fb961aaf30cf6da3bc1a1637675f7afbd2724ff445ff7c53d2a76 mutt-1.5.11-r2.ebuild 5826
-EBUILD mutt-1.5.11.ebuild 5695 RMD160 55a9927561cc15c242f237ca52cc76361f571d07 SHA1 5f13f323e8846645ebbb586c6a469b5e66e831c7 SHA256 8854f46072ca5d8348f6003aa3df111c7e7345b7ea22983e4b809736b0de7618
-MD5 884f6aca64cbdbc3b1864a945f429413 mutt-1.5.11.ebuild 5695
-RMD160 55a9927561cc15c242f237ca52cc76361f571d07 mutt-1.5.11.ebuild 5695
-SHA256 8854f46072ca5d8348f6003aa3df111c7e7345b7ea22983e4b809736b0de7618 mutt-1.5.11.ebuild 5695
+EBUILD mutt-1.5.11.ebuild 5695 RMD160 a50ed49a3126c350f514270a47e120aa6dfaeee8 SHA1 a5040bb37d391343ee682e770e9287151cb586bd SHA256 591c0fb568306154467fcf38b6fa4542dd9a2f79a4ffd17f481f3a3c88ca7e4b
+MD5 284c581f01a282d8939aaf1250d7461f mutt-1.5.11.ebuild 5695
+RMD160 a50ed49a3126c350f514270a47e120aa6dfaeee8 mutt-1.5.11.ebuild 5695
+SHA256 591c0fb568306154467fcf38b6fa4542dd9a2f79a4ffd17f481f3a3c88ca7e4b mutt-1.5.11.ebuild 5695
 EBUILD mutt-1.5.12.ebuild 4603 RMD160 93f84ebb5f464e563208feca3853694bc873b96f SHA1 aa3c1ca32adf659768fad6fffa6356b1f17f4a01 SHA256 cdba6ab51a4758cf118859a2bf24fb7d4a6ec8cc7e7a27c408ecb3711c9b1e52
 MD5 035bf6f128c26ecd34ac15f001fe582a mutt-1.5.12.ebuild 4603
 RMD160 93f84ebb5f464e563208feca3853694bc873b96f mutt-1.5.12.ebuild 4603
 SHA256 cdba6ab51a4758cf118859a2bf24fb7d4a6ec8cc7e7a27c408ecb3711c9b1e52 mutt-1.5.12.ebuild 4603
-EBUILD mutt-1.5.8-r1.ebuild 4605 RMD160 2d62a278308483538dd88e0a6d7ef033a965cee1 SHA1 08d49171380a7d4005084089039705039a4f5d2b SHA256 2fe8fc6633d708bb12821a3c2a9f94ac330d5270ea978ac59f8cbc17b9117d7c
-MD5 cb2a1c4875a1f091afd9577f4f61d2e8 mutt-1.5.8-r1.ebuild 4605
-RMD160 2d62a278308483538dd88e0a6d7ef033a965cee1 mutt-1.5.8-r1.ebuild 4605
-SHA256 2fe8fc6633d708bb12821a3c2a9f94ac330d5270ea978ac59f8cbc17b9117d7c mutt-1.5.8-r1.ebuild 4605
-EBUILD mutt-1.5.8-r2.ebuild 4961 RMD160 79264460fc65895b8c81742a126dfee2344c6198 SHA1 81831a4d7668870dd5e1a6edcc7286063aee633f SHA256 ad91434fa74b30e2ed15fe17c1a2c2b044526e36fb6797d51e69620be8f68d2c
-MD5 b684c056a91bcad2e4f3d99c9332c1a0 mutt-1.5.8-r2.ebuild 4961
-RMD160 79264460fc65895b8c81742a126dfee2344c6198 mutt-1.5.8-r2.ebuild 4961
-SHA256 ad91434fa74b30e2ed15fe17c1a2c2b044526e36fb6797d51e69620be8f68d2c mutt-1.5.8-r2.ebuild 4961
-EBUILD mutt-1.5.9.ebuild 6268 RMD160 83d0d5965a820a15110d4640bea7f0cd4327e5fb SHA1 df580df21f104e960335994bb4bc4f0df2257642 SHA256 21673d75333ef51f57cae5da0c9b6664be5b67e2f46facd6d0e66d5c4c0b0259
-MD5 8838ca64d9cd8c5e27b83645106b1ddc mutt-1.5.9.ebuild 6268
-RMD160 83d0d5965a820a15110d4640bea7f0cd4327e5fb mutt-1.5.9.ebuild 6268
-SHA256 21673d75333ef51f57cae5da0c9b6664be5b67e2f46facd6d0e66d5c4c0b0259 mutt-1.5.9.ebuild 6268
-MISC ChangeLog 21820 RMD160 ae3b24e0eb512d4fc89bdabcd191759f375e5aa1 SHA1 f3fe789496db5d4f9da6229594e15c7a9d7be9e5 SHA256 6e62ab98d367c5a169396998636f399e44f2ddff0ee348352c7061ecc7b4d012
-MD5 fc54c30d2de500d0fbc8a08231f153d1 ChangeLog 21820
-RMD160 ae3b24e0eb512d4fc89bdabcd191759f375e5aa1 ChangeLog 21820
-SHA256 6e62ab98d367c5a169396998636f399e44f2ddff0ee348352c7061ecc7b4d012 ChangeLog 21820
+EBUILD mutt-1.5.13.ebuild 4301 RMD160 09cdd1441ab14582118b7d6064c4f39d70cf89b4 SHA1 440347cdeb2bfcded35f452460cd6d13618bf17b SHA256 381ee7558b9ab307f2c892ce233d7c93053f89bb9cdbc4d9214db93395b6e33d
+MD5 b1f3b2240eabe83924183f7d62ef99aa mutt-1.5.13.ebuild 4301
+RMD160 09cdd1441ab14582118b7d6064c4f39d70cf89b4 mutt-1.5.13.ebuild 4301
+SHA256 381ee7558b9ab307f2c892ce233d7c93053f89bb9cdbc4d9214db93395b6e33d mutt-1.5.13.ebuild 4301
+EBUILD mutt-1.5.8-r1.ebuild 4597 RMD160 222b7daf5f61f267e41f3fc5640878dbca821022 SHA1 e8b6299df945ff343fe0ad9dbf6c228e58356887 SHA256 575a95b9fae3ec6d98ea88fd9f78e7051a53493a259ccea35188b5c788577059
+MD5 4341f1162d2448007c1391f120b0b7df mutt-1.5.8-r1.ebuild 4597
+RMD160 222b7daf5f61f267e41f3fc5640878dbca821022 mutt-1.5.8-r1.ebuild 4597
+SHA256 575a95b9fae3ec6d98ea88fd9f78e7051a53493a259ccea35188b5c788577059 mutt-1.5.8-r1.ebuild 4597
+EBUILD mutt-1.5.8-r2.ebuild 4953 RMD160 f593b8a4e777df5d14415e50bd09e062b6afc87f SHA1 6d02414a1391ac08a3d2f0a2b4025726508ef279 SHA256 fc7d7f89f4fbc1647ee065b9f6dcd0035892b32132eb8e03fb9cc38572a57aed
+MD5 686e84ed1a2f55dd350786c63a5ae0b7 mutt-1.5.8-r2.ebuild 4953
+RMD160 f593b8a4e777df5d14415e50bd09e062b6afc87f mutt-1.5.8-r2.ebuild 4953
+SHA256 fc7d7f89f4fbc1647ee065b9f6dcd0035892b32132eb8e03fb9cc38572a57aed mutt-1.5.8-r2.ebuild 4953
+EBUILD mutt-1.5.9.ebuild 6261 RMD160 5e6785ef43d9fc1373d997a3569928b8eeabbf20 SHA1 0981e5dddacc7aab9697fabab6a63c6c28b42dde SHA256 015378a3efec08303b3d27bd3a00af690f3dc520e3f5f5b617dfef91e62155cb
+MD5 30320acb4631af3ac69c0f84550c6145 mutt-1.5.9.ebuild 6261
+RMD160 5e6785ef43d9fc1373d997a3569928b8eeabbf20 mutt-1.5.9.ebuild 6261
+SHA256 015378a3efec08303b3d27bd3a00af690f3dc520e3f5f5b617dfef91e62155cb mutt-1.5.9.ebuild 6261
+MISC ChangeLog 22219 RMD160 ff1c4d34fcec3320c8ce0a8cae66aeab43a98475 SHA1 5d89a559d2711e7f159e8201439a123526c21519 SHA256 a699e9d7ced8e9c9e2feffae4cb127984f6387e453bbb6da940a5d8096086fa7
+MD5 73f46701323e8bcd4bf3e04a6cc07845 ChangeLog 22219
+RMD160 ff1c4d34fcec3320c8ce0a8cae66aeab43a98475 ChangeLog 22219
+SHA256 a699e9d7ced8e9c9e2feffae4cb127984f6387e453bbb6da940a5d8096086fa7 ChangeLog 22219
 MISC metadata.xml 348 RMD160 67219e2080107537dc52f7de5c201a8e52ee0270 SHA1 8aa712f8642faf21ab136add0670cba3f8dc15d4 SHA256 a8c434275334e18b2e8c1b68fc88b5a1f6faef5a4344267d7ed708c0794b386d
 MD5 ab8fa36a71860fbc36c89a2c91745d28 metadata.xml 348
 RMD160 67219e2080107537dc52f7de5c201a8e52ee0270 metadata.xml 348
@@ -136,6 +142,9 @@ SHA256 edab047516b025dba487a1ce5a8da5f71c75d4cbd993d50307ac4c5e16b5265e files/di
 MD5 5fb0633ffa6a7322189dc4452e87d425 files/digest-mutt-1.5.12 518
 RMD160 def9a442152526e2e855dc8bf7a4ca54f0dd9fe4 files/digest-mutt-1.5.12 518
 SHA256 64309746568f2c03699ad975a9db071fef8fc95a9bcb4e081d54d921fc33057a files/digest-mutt-1.5.12 518
+MD5 3b282ac21c711571ace7792a326aa732 files/digest-mutt-1.5.13 518
+RMD160 f387b5242f64a563bd837a34af0123debb09a151 files/digest-mutt-1.5.13 518
+SHA256 e79af34a5a8d834a2f5556020b501596f7bdc9a82eaf73896e2e60ebac2a029a files/digest-mutt-1.5.13 518
 MD5 2a6d8631c8e9dc5787f3e81c101b2e35 files/digest-mutt-1.5.8-r1 1915
 RMD160 53c23697d035998f341bfc51c2a3f1101cce6b90 files/digest-mutt-1.5.8-r1 1915
 SHA256 b7f08e26971a5e044dc58eab918fd37ef32f65ae4627183758b452112524f66f files/digest-mutt-1.5.8-r1 1915
@@ -148,7 +157,7 @@ SHA256 cb3e4d84e1f3f26021e75b4b8e6d78f0545615c46b2f1953d9fbbe50fdb7bc63 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFE156lViELBEf1JB0RAkKjAJ9L+jnwXMeb8EUrknLoAu6KYIvPAwCffHVq
-v/iNwipLwf3qTcxqU5In6uM=
-=3gNK
+iD8DBQFE4LeWViELBEf1JB0RAsf8AJ98B947MR88VYduMzHNLtpSOf2/jQCcCUQx
+rCL6IMIlsce6IrE8TgR0pc8=
+=8Bmq
 -----END PGP SIGNATURE-----
diff --git a/mail-client/mutt/files/digest-mutt-1.5.13 b/mail-client/mutt/files/digest-mutt-1.5.13
new file mode 100644
index 000000000000..d0fb93f3637b
--- /dev/null
+++ b/mail-client/mutt/files/digest-mutt-1.5.13
@@ -0,0 +1,6 @@
+MD5 b4fccb735c0277bc6c659eb287d65b13 mutt-1.5.13-gentoo-patches.tar.bz2 53418
+RMD160 67274bef651c1c78d1e6878d8bb17316abf9d30e mutt-1.5.13-gentoo-patches.tar.bz2 53418
+SHA256 b0a8737ab8ec42b5f071eb08356a2572c49f98c73c3bf42396fd481c4650ef1d mutt-1.5.13-gentoo-patches.tar.bz2 53418
+MD5 456a138680a6726f14983cb3e9ff4e22 mutt-1.5.13.tar.gz 3442681
+RMD160 9327b7f928aad78a20c2395629113ac2519bb945 mutt-1.5.13.tar.gz 3442681
+SHA256 e0481690c0caf23b5c88359b2dbac70308f8f138663e8fee482b163562fe8da9 mutt-1.5.13.tar.gz 3442681
diff --git a/mail-client/mutt/mutt-1.4.2.1.ebuild b/mail-client/mutt/mutt-1.4.2.1.ebuild
index 26bf6d64f5de..f27357ca94f7 100644
--- a/mail-client/mutt/mutt-1.4.2.1.ebuild
+++ b/mail-client/mutt/mutt-1.4.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.4.2.1.ebuild,v 1.9 2005/08/17 20:03:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.4.2.1.ebuild,v 1.10 2006/08/14 17:48:48 ferdy Exp $
 
 IUSE="cjk imap mbox nls slang ssl vanilla"
 
@@ -21,7 +21,7 @@ SRC_URI="ftp://ftp.mutt.org/mutt/mutt-${PV}i.tar.gz
 RDEPEND="nls? ( sys-devel/gettext )
 	>=sys-libs/ncurses-5.2
 	ssl? ( >=dev-libs/openssl-0.9.6 )
-	slang? ( >=sys-libs/slang-1.4.2 )"
+	slang? ( =sys-libs/slang-1* )"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
diff --git a/mail-client/mutt/mutt-1.5.10-r1.ebuild b/mail-client/mutt/mutt-1.5.10-r1.ebuild
index acd3ec35de20..978dc90ba22f 100644
--- a/mail-client/mutt/mutt-1.5.10-r1.ebuild
+++ b/mail-client/mutt/mutt-1.5.10-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.10-r1.ebuild,v 1.1 2005/08/17 22:42:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.10-r1.ebuild,v 1.2 2006/08/14 17:48:48 ferdy Exp $
 
 inherit eutils flag-o-matic
 
@@ -87,7 +87,7 @@ src_unpack() {
 		automake --foreign				|| die "automake failed"
 	fi
 
-	WANT_AUTOCONF=2.13 autoconf		|| die "autoconf failed"
+	WANT_AUTOCONF=2.1 autoconf		|| die "autoconf failed"
 }
 
 src_compile() {
diff --git a/mail-client/mutt/mutt-1.5.11-r1.ebuild b/mail-client/mutt/mutt-1.5.11-r1.ebuild
index 56199912435b..a291fefdbe37 100644
--- a/mail-client/mutt/mutt-1.5.11-r1.ebuild
+++ b/mail-client/mutt/mutt-1.5.11-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.11-r1.ebuild,v 1.1 2005/11/26 11:58:58 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.11-r1.ebuild,v 1.2 2006/08/14 17:48:48 ferdy Exp $
 
 inherit eutils flag-o-matic
 
@@ -90,7 +90,7 @@ src_unpack() {
 		automake --foreign				|| die "automake failed"
 	fi
 
-	WANT_AUTOCONF=2.59 autoconf		|| die "autoconf failed"
+	WANT_AUTOCONF=2.5 autoconf		|| die "autoconf failed"
 }
 
 src_compile() {
diff --git a/mail-client/mutt/mutt-1.5.11.ebuild b/mail-client/mutt/mutt-1.5.11.ebuild
index cbba7402f8b8..f4166c9c5677 100644
--- a/mail-client/mutt/mutt-1.5.11.ebuild
+++ b/mail-client/mutt/mutt-1.5.11.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/mutt/mutt-1.5.11.ebuild,v 1.9 2006/02/20 01:29:09 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.11.ebuild,v 1.10 2006/08/14 17:48:48 ferdy Exp $
 
 inherit eutils flag-o-matic
 
@@ -87,7 +87,7 @@ src_unpack() {
 		automake --foreign				|| die "automake failed"
 	fi
 
-	WANT_AUTOCONF=2.59 autoconf		|| die "autoconf failed"
+	WANT_AUTOCONF=2.5 autoconf		|| die "autoconf failed"
 }
 
 src_compile() {
diff --git a/mail-client/mutt/mutt-1.5.13.ebuild b/mail-client/mutt/mutt-1.5.13.ebuild
new file mode 100644
index 000000000000..43860fc9dd4a
--- /dev/null
+++ b/mail-client/mutt/mutt-1.5.13.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.13.ebuild,v 1.1 2006/08/14 17:48:48 ferdy Exp $
+
+inherit eutils flag-o-matic autotools
+
+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
+	)"
+IUSE="berkdb buffysize cjk crypt debug gdbm gnutls gpgme idn imap mbox nls nntp pop sasl smime ssl vanilla"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+RDEPEND="nls? ( sys-devel/gettext )
+	>=sys-libs/ncurses-5.2
+	gdbm?    ( sys-libs/gdbm )
+	!gdbm?   ( berkdb? ( >=sys-libs/db-4 ) )
+	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 )
+	)
+	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"
+
+PATCHDIR="${WORKDIR}"/${P}-gentoo-patches
+
+src_unpack() {
+	unpack ${A} && cd "${S}" || die "unpack failed"
+
+	if ! use vanilla ; then
+		if ! use nntp ; then
+			rm "${PATCHDIR}"/07-vvv.nntp-gentoo.patch
+			rm "${PATCHDIR}"/08-mixmaster_nntp.patch
+		fi
+
+		for p in "${PATCHDIR}"/*.patch ; do
+			epatch "${p}"
+		done
+
+		AT_M4DIR="m4" eautoreconf
+	else
+		eautoconf
+	fi
+}
+
+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_with idn) \
+		--with-curses \
+		--sysconfdir=/etc/${PN} \
+		--with-docdir=/usr/share/doc/${PN}-${PVR} \
+		--with-regex \
+		--disable-fcntl --enable-flock \
+		--enable-nfs-fix --enable-external-dotlock \
+		--with-mixmaster"
+
+	# See Bug #22787
+	unset WANT_AUTOCONF_2_5 WANT_AUTOCONF
+
+	# mutt prioritizes gdbm over bdb, so we will too.
+	# hcache feature requires at least one database is in USE.
+	if use gdbm; then
+		myconf="${myconf} --enable-hcache --with-gdbm --without-bdb"
+	elif use berkdb; then
+		myconf="${myconf} --enable-hcache --with-bdb --without-gdbm"
+	else
+		myconf="${myconf} --disable-hcache --without-gdbm --without-bdb"
+	fi
+
+	# 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 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)"
+	else
+		myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
+	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 mbox; then
+		myconf="${myconf} --with-mailpath=/var/spool/mail"
+	else
+		myconf="${myconf} --with-homespool=Maildir"
+	fi
+
+	if ! use vanilla; then
+		# rr.compressed patch
+		myconf="${myconf} --enable-compressed"
+
+		# nntp patch
+		myconf="${myconf} $(use_enable nntp)"
+	fi
+
+	econf ${myconf} || die "configure failed"
+	emake || die "make failed"
+}
+
+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/mutt
+		newins ${FILESDIR}/Muttrc.mbox Muttrc
+	else
+		insinto /etc/mutt
+		doins ${FILESDIR}/Muttrc
+	fi
+
+	# A newer file is provided by app-misc/mime-types. So we link it.
+	rm ${D}/etc/${PN}/mime.types
+	dosym /etc/mime.types /etc/${PN}/mime.types
+
+	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
+}
+
+pkg_postinst() {
+	echo
+	einfo "If you are new to mutt you may want to take a look at"
+	einfo "the Gentoo QuickStart Guide to Mutt E-Mail:"
+	einfo "   http://www.gentoo.org/doc/en/guide-to-mutt.xml"
+	echo
+}
diff --git a/mail-client/mutt/mutt-1.5.8-r1.ebuild b/mail-client/mutt/mutt-1.5.8-r1.ebuild
index a3feb8497f00..a644dd52d369 100644
--- a/mail-client/mutt/mutt-1.5.8-r1.ebuild
+++ b/mail-client/mutt/mutt-1.5.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.8-r1.ebuild,v 1.11 2005/08/11 22:57:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.8-r1.ebuild,v 1.12 2006/08/14 17:48:48 ferdy Exp $
 
 inherit eutils flag-o-matic
 IUSE="cjk ssl nls slang crypt imap mbox nntp sasl vanilla"
@@ -31,7 +31,7 @@ SRC_URI="ftp://ftp.mutt.org/mutt/devel/mutt-${PV}i.tar.gz
 RDEPEND="nls? ( sys-devel/gettext )
 	>=sys-libs/ncurses-5.2
 	ssl? ( >=dev-libs/openssl-0.9.6 )
-	slang? ( >=sys-libs/slang-1.4.2 )
+	slang? ( =sys-libs/slang-1* )
 	!vanilla? ( sys-libs/gdbm )
 	sasl? ( >=dev-libs/cyrus-sasl-2 )"
 DEPEND="${RDEPEND}
@@ -72,7 +72,7 @@ src_unpack() {
 		autoheader						|| die "autoheader failed"
 		make -C m4 -f Makefile.am.in	|| die "make in m4 failed"
 		automake --foreign				|| die "automake failed"
-		WANT_AUTOCONF=2.13 autoconf		|| die "autoconf failed"
+		WANT_AUTOCONF=2.1 autoconf		|| die "autoconf failed"
 	fi
 }
 
diff --git a/mail-client/mutt/mutt-1.5.8-r2.ebuild b/mail-client/mutt/mutt-1.5.8-r2.ebuild
index a6ce1e70fe6b..582930875591 100644
--- a/mail-client/mutt/mutt-1.5.8-r2.ebuild
+++ b/mail-client/mutt/mutt-1.5.8-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.8-r2.ebuild,v 1.10 2005/08/11 22:57:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.8-r2.ebuild,v 1.11 2006/08/14 17:48:48 ferdy Exp $
 
 inherit eutils flag-o-matic
 IUSE="cjk ssl nls slang crypt imap mbox nntp sasl buffysize vanilla"
@@ -33,7 +33,7 @@ SRC_URI="ftp://ftp.mutt.org/mutt/devel/mutt-${PV}i.tar.gz
 RDEPEND="nls? ( sys-devel/gettext )
 	>=sys-libs/ncurses-5.2
 	ssl? ( >=dev-libs/openssl-0.9.6 )
-	slang? ( >=sys-libs/slang-1.4.2 )
+	slang? ( =sys-libs/slang-1* )
 	!vanilla? ( sys-libs/gdbm )
 	sasl? ( >=dev-libs/cyrus-sasl-2 )"
 DEPEND="${RDEPEND}
@@ -75,7 +75,7 @@ src_unpack() {
 		autoheader						|| die "autoheader failed"
 		emake -C m4 -f Makefile.am.in	|| die "emake in m4 failed"
 		automake --foreign				|| die "automake failed"
-		WANT_AUTOCONF=2.13 autoconf		|| die "autoconf failed"
+		WANT_AUTOCONF=2.1 autoconf		|| die "autoconf failed"
 	fi
 }
 
diff --git a/mail-client/mutt/mutt-1.5.9.ebuild b/mail-client/mutt/mutt-1.5.9.ebuild
index e879fb7f34a9..2b03ae0c76c1 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
+# Copyright 1999-2006 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.9 2005/08/17 20:03:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.9.ebuild,v 1.10 2006/08/14 17:48:48 ferdy Exp $
 
 inherit eutils flag-o-matic
 
@@ -36,7 +36,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
 RDEPEND="nls? ( sys-devel/gettext )
 	>=sys-libs/ncurses-5.2
 	gdbm?    ( sys-libs/gdbm )
-	slang?   ( >=sys-libs/slang-1.4.2 )
+	slang?   ( =sys-libs/slang-1* )
 	imap?    (
 		gnutls?  ( >=net-libs/gnutls-1.0.17 )
 		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
@@ -91,7 +91,7 @@ src_unpack() {
 		automake --foreign				|| die "automake failed"
 	fi
 
-	WANT_AUTOCONF=2.13 autoconf		|| die "autoconf failed"
+	WANT_AUTOCONF=2.1 autoconf		|| die "autoconf failed"
 }
 
 src_compile() {