remove old ebuilds

Package-Manager: portage-2.0.51.22-r2

11 files changed, 3 insertions, 805 deletions

diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 6f530e69c4da..a233631b9130 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -3,33 +3,23 @@ Hash: SHA1
 
 MD5 eb716d2f49b35cab14d5008d89fc29fc mutt-1.5.9.ebuild 5626
 MD5 6da429d49028d773f2a5a907b34ab9c2 mutt-1.5.8-r2.ebuild 4602
-MD5 778c46506f03eea15be9616869de3168 mutt-1.5.6.ebuild 4232
 MD5 f46d05fe0172cb035a01f40d25242d30 metadata.xml 253
-MD5 30bbaee56f61cacb2163c15394753e08 mutt-1.5.6-r5.ebuild 4723
 MD5 191c453d0768bcf24bd98f3eab54fdf4 ChangeLog 16580
 MD5 47c429a9de6aa7dc6d211b511897de59 mutt-1.4.2.1.ebuild 3355
-MD5 92b52e95eb927d89b6b9e82db333c062 mutt-1.5.6-r3.ebuild 4582
-MD5 45ccbdc90388a20fc2dca31f9372b027 mutt-1.5.6-r2.ebuild 4624
-MD5 562f5b6009dbb9e68c869d2eedaeedde mutt-1.5.6-r4.ebuild 4575
 MD5 7640c13a30bab5830fca372180f540b1 mutt-1.5.8-r1.ebuild 4246
-MD5 6cba9546cde7ee8a8e67b44d27b62366 files/digest-mutt-1.5.6 367
 MD5 6064ff5a3d1a71ccdb48f88872feb3a3 files/Muttrc 667
 MD5 3f1450d2a3bdb1e595bf5820239364cc files/digest-mutt-1.5.9 659
 MD5 25e242fd402f42d5bd5230dbe9ea68a6 files/slang.patch 493
-MD5 b991ce8de06ca0dbfbd1fbe1dc6fe1f1 files/digest-mutt-1.5.6-r2 523
 MD5 7f8dd20237497b4bba89df29f400bd6d files/muttng-20050809-nodoc.patch 566
 MD5 74ddaf505ea8bd19fbeb1330a23506ea files/8patch-1.5.6.dyc.source_stat 1531
-MD5 a3b8d5ca6c4f009d4a07b6463e44820c files/digest-mutt-1.5.6-r4 508
 MD5 30ce590d0284ffb0896857714c6a47d4 files/Muttrc.mbox 486
-MD5 6022a3af0a556ca2678495fde468d23f files/digest-mutt-1.5.6-r3 514
-MD5 bbcce3c6f8bd265e1449c0631ea896b6 files/digest-mutt-1.5.6-r5 585
 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+9XOBXaUFmZvwyMRAoOHAJ49h0DPUkfup0ssTZussc45xoUGXgCfcWIf
-5O7eN3fZpLw4Y4MrWM5hGyU=
-=qy6r
+iD8DBQFC+9Y1BXaUFmZvwyMRAvu1AJ9p2AqZb2auUhPkGCahGOfuzPPynQCbBjYM
+oiuTPPFhCZ0CX5GJtCmZSSA=
+=U7Sq
 -----END PGP SIGNATURE-----
diff --git a/mail-client/mutt/files/digest-mutt-1.5.6 b/mail-client/mutt/files/digest-mutt-1.5.6
deleted file mode 100644
index 40aa16b70976..000000000000
--- a/mail-client/mutt/files/digest-mutt-1.5.6
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 aa1433635d7c86beba1675a3408b0324 mutt-1.5.6i.tar.gz 2910730
-MD5 dbbde55d5865c76822bc13baa6dd6293 patch-1.5.5.1.cd.edit_threads.9.5-gentoo.bz2 6890
-MD5 0d57a62f17c93eb1d2eff60e070933b3 patch-1.5.6.rr.compressed.gz 10077
-MD5 1ea285e44d0fe45eb841559914b57170 patch-1.5.6.dw.mbox-hook.1 6445
-MD5 c3a4b9868bcaa0f8e79caa8429ba43fa patch-1.5.6.vvv.nntp-gentoo.bz2 83489
diff --git a/mail-client/mutt/files/digest-mutt-1.5.6-r2 b/mail-client/mutt/files/digest-mutt-1.5.6-r2
deleted file mode 100644
index 6d82df26e18f..000000000000
--- a/mail-client/mutt/files/digest-mutt-1.5.6-r2
+++ /dev/null
@@ -1,7 +0,0 @@
-MD5 aa1433635d7c86beba1675a3408b0324 mutt-1.5.6i.tar.gz 2910730
-MD5 dbbde55d5865c76822bc13baa6dd6293 patch-1.5.5.1.cd.edit_threads.9.5-gentoo.bz2 6890
-MD5 0d57a62f17c93eb1d2eff60e070933b3 patch-1.5.6.rr.compressed.gz 10077
-MD5 1ea285e44d0fe45eb841559914b57170 patch-1.5.6.dw.mbox-hook.1 6445
-MD5 4f66ba09feaee08cf96aad42879477e5 patch-1.5.6.vvv.nntp-gentoo-r2-fixed.bz2 83484
-MD5 b901329a115d23ff8e6db8cfd1a0d39e mutt-cvs-maildir-header-cache.16 23431
-MD5 758dff57c494e86ac885ef2ecb736f11 patch-1.5.6.dw.pgp-timeout.1 1448
diff --git a/mail-client/mutt/files/digest-mutt-1.5.6-r3 b/mail-client/mutt/files/digest-mutt-1.5.6-r3
deleted file mode 100644
index e76e0b1074d8..000000000000
--- a/mail-client/mutt/files/digest-mutt-1.5.6-r3
+++ /dev/null
@@ -1,7 +0,0 @@
-MD5 aa1433635d7c86beba1675a3408b0324 mutt-1.5.6i.tar.gz 2910730
-MD5 dbbde55d5865c76822bc13baa6dd6293 patch-1.5.5.1.cd.edit_threads.9.5-gentoo.bz2 6890
-MD5 0d57a62f17c93eb1d2eff60e070933b3 patch-1.5.6.rr.compressed.gz 10077
-MD5 1ea285e44d0fe45eb841559914b57170 patch-1.5.6.dw.mbox-hook.1 6445
-MD5 4f66ba09feaee08cf96aad42879477e5 patch-1.5.6.vvv.nntp-gentoo-r2-fixed.bz2 83484
-MD5 009f71d84cb9daf5a16b1c26776e35dd patch-1.5.6.tg.hcache.0 34811
-MD5 758dff57c494e86ac885ef2ecb736f11 patch-1.5.6.dw.pgp-timeout.1 1448
diff --git a/mail-client/mutt/files/digest-mutt-1.5.6-r4 b/mail-client/mutt/files/digest-mutt-1.5.6-r4
deleted file mode 100644
index d1f77c0b224e..000000000000
--- a/mail-client/mutt/files/digest-mutt-1.5.6-r4
+++ /dev/null
@@ -1,7 +0,0 @@
-MD5 aa1433635d7c86beba1675a3408b0324 mutt-1.5.6i.tar.gz 2910730
-MD5 dbbde55d5865c76822bc13baa6dd6293 patch-1.5.5.1.cd.edit_threads.9.5-gentoo.bz2 6890
-MD5 0d57a62f17c93eb1d2eff60e070933b3 patch-1.5.6.rr.compressed.gz 10077
-MD5 1ea285e44d0fe45eb841559914b57170 patch-1.5.6.dw.mbox-hook.1 6445
-MD5 01df0aa75ff09cfd8e7e4c2e9e26318f patch-1.5.6.vvv.nntp-gentoo-r3.bz2 83360
-MD5 bb4f3a9529e3fc14594ee2d4cf6f523f patch-1.5.6.tg.hcache.8 37794
-MD5 758dff57c494e86ac885ef2ecb736f11 patch-1.5.6.dw.pgp-timeout.1 1448
diff --git a/mail-client/mutt/files/digest-mutt-1.5.6-r5 b/mail-client/mutt/files/digest-mutt-1.5.6-r5
deleted file mode 100644
index 3acf749cede8..000000000000
--- a/mail-client/mutt/files/digest-mutt-1.5.6-r5
+++ /dev/null
@@ -1,8 +0,0 @@
-MD5 aa1433635d7c86beba1675a3408b0324 mutt-1.5.6i.tar.gz 2910730
-MD5 dbbde55d5865c76822bc13baa6dd6293 patch-1.5.5.1.cd.edit_threads.9.5-gentoo.bz2 6890
-MD5 0d57a62f17c93eb1d2eff60e070933b3 patch-1.5.6.rr.compressed.gz 10077
-MD5 1ea285e44d0fe45eb841559914b57170 patch-1.5.6.dw.mbox-hook.1 6445
-MD5 01df0aa75ff09cfd8e7e4c2e9e26318f patch-1.5.6.vvv.nntp-gentoo-r3.bz2 83360
-MD5 068e8c331756e0fc007d240456ff7d85 patch-1.5.6.tg.hcache.11 38888
-MD5 758dff57c494e86ac885ef2ecb736f11 patch-1.5.6.dw.pgp-timeout.1 1448
-MD5 f2d3e1322e1bfb38ae9722c50c599bf9 patch-1.5.6.ddm.pgp-auto-decode.1 4536
diff --git a/mail-client/mutt/mutt-1.5.6-r2.ebuild b/mail-client/mutt/mutt-1.5.6-r2.ebuild
deleted file mode 100644
index 2281f0e58f7b..000000000000
--- a/mail-client/mutt/mutt-1.5.6-r2.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# 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.6-r2.ebuild,v 1.18 2005/04/28 21:47:35 agriffis Exp $
-
-inherit eutils flag-o-matic
-IUSE="cjk ssl nls slang crypt imap mbox nntp vanilla"
-
-edit_threads_patch="patch-1.5.5.1.cd.edit_threads.9.5-gentoo.bz2"
-compressed_patch="patch-${PV}.rr.compressed.gz"
-nntp_patch="patch-${PV}.vvv.nntp-gentoo-r2-fixed.bz2"
-mbox_hook_patch="patch-${PV}.dw.mbox-hook.1"
-maildir_header_cache_patch="mutt-cvs-maildir-header-cache.16"
-pgp_timeout_patch="patch-${PV}.dw.pgp-timeout.1"
-
-DESCRIPTION="a small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org"
-SRC_URI="ftp://ftp.mutt.org/mutt/devel/mutt-${PV}i.tar.gz
-	!vanilla? (
-		mirror://gentoo/${edit_threads_patch}
-		http://mutt.kiev.ua/download/${P}/${compressed_patch}
-		http://www.woolridge.ca/mutt/patches/${mbox_hook_patch}
-		nntp? ( mirror://gentoo/${nntp_patch} )
-		http://wwwcip.informatik.uni-erlangen.de/~sithglan/mutt/${maildir_header_cache_patch}
-		http://www.woolridge.ca/mutt/patches/${pgp_timeout_patch}
-	)"
-#	nntp? ( http://mutt.kiev.ua/download/${P}/${nntp_patch} )
-#	http://cedricduval.free.fr/mutt/patches/download/${edit_threads_patch}
-
-RDEPEND="nls? ( sys-devel/gettext )
-	>=sys-libs/ncurses-5.2
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	slang? ( >=sys-libs/slang-1.4.2 )
-	!vanilla? ( sys-libs/gdbm )"
-DEPEND="${RDEPEND}
-	net-mail/mailbase
-	!vanilla? ( sys-devel/automake sys-devel/autoconf )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~sparc alpha ~hppa ia64 ~amd64 ~mips ppc64 ppc-macos"
-
-
-pkg_setup() {
-	if ! use imap; then
-		echo
-		einfo
-		einfo "NOTE: The USE variable 'imap' is not in your USE flags."
-		einfo "For imap support in mutt, you will need to restart the build with USE=imap"
-		einfo
-		echo
-	fi
-}
-
-src_unpack() {
-	unpack ${P}i.tar.gz && cd ${S} || die "unpack failed"
-	if ! use vanilla; then
-		epatch ${DISTDIR}/${compressed_patch}
-		epatch ${DISTDIR}/${edit_threads_patch}
-		epatch ${DISTDIR}/${mbox_hook_patch}
-		epatch ${DISTDIR}/${maildir_header_cache_patch}
-		epatch ${DISTDIR}/${pgp_timeout_patch}
-		use nntp && epatch ${DISTDIR}/${nntp_patch}
-
-		# The following steps are necessary for the nntp patch and the
-		# maildir_header_cache_patch
-		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"
-	fi
-
-	# Fix a slang problem that is already fixed in upstream cvs
-	epatch ${FILESDIR}/slang.patch
-
-	# Fix ability to read from a subprocess with source script.sh|
-	# Bug #42738 (25 Feb 2004 agriffis)
-	epatch ${FILESDIR}/8patch-1.5.6.dyc.source_stat
-}
-
-src_compile() {
-	local myconf="
-		$(use_enable nls) \
-		$(use_with ssl) \
-		$(use_enable imap) \
-		$(use_enable crypt pgp) \
-		$(use_enable cjk default-japanese) \
-		--sysconfdir=/etc/mutt \
-		--with-docdir=/usr/share/doc/mutt-${PVR} \
-		--with-regex --enable-pop --enable-nfs-fix \
-		--disable-fcntl --enable-flock --enable-external-dotlock"
-
-	# See Bug #22787
-	unset WANT_AUTOCONF_2_5 WANT_AUTOCONF
-
-	# See Bug #11170
-	case ${ARCH} in
-		alpha|ppc) replace-flags "-O[3-9]" "-O2" ;;
-	esac
-
-	if use slang; then
-		myconf="${myconf} --with-slang"
-		ewarn "If you want a transparent background,"
-		ewarn "please merge mutt 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
-
-	if ! use vanilla; then
-		# imap part of edit_threads patch
-		myconf="${myconf} $(use_enable imap imap-edit-threads)"
-
-		# rr.compressed patch
-		myconf="${myconf} --enable-compressed"
-
-		# nntp patch
-		myconf="${myconf} $(use_enable nntp)"
-
-		# maildir_header_cache_patch
-		myconf="${myconf} --enable-hcache"
-	fi
-
-	econf ${myconf}
-	make || die "make 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/mutt
-		newins ${FILESDIR}/Muttrc.mbox Muttrc
-	else
-		insinto /etc/mutt
-		doins ${FILESDIR}/Muttrc
-	fi
-
-	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
-}
-
-pkg_postinst() {
-	einfo "The USE variable 'imap' is not set by default on most architectures."
-	einfo "To enable imap support in mutt, make sure you have USE=imap"
-}
diff --git a/mail-client/mutt/mutt-1.5.6-r3.ebuild b/mail-client/mutt/mutt-1.5.6-r3.ebuild
deleted file mode 100644
index 01eeb185f843..000000000000
--- a/mail-client/mutt/mutt-1.5.6-r3.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# 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.6-r3.ebuild,v 1.10 2005/04/28 21:47:35 agriffis Exp $
-
-inherit eutils flag-o-matic
-IUSE="cjk ssl nls slang crypt imap mbox nntp vanilla"
-
-edit_threads_patch="patch-1.5.5.1.cd.edit_threads.9.5-gentoo.bz2"
-compressed_patch="patch-${PV}.rr.compressed.gz"
-nntp_patch="patch-${PV}.vvv.nntp-gentoo-r2-fixed.bz2"
-mbox_hook_patch="patch-${PV}.dw.mbox-hook.1"
-header_cache_patch="patch-${PV}.tg.hcache.0"
-pgp_timeout_patch="patch-${PV}.dw.pgp-timeout.1"
-
-DESCRIPTION="a small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org"
-SRC_URI="ftp://ftp.mutt.org/mutt/devel/mutt-${PV}i.tar.gz
-	!vanilla? (
-		mirror://gentoo/${edit_threads_patch}
-		http://mutt.kiev.ua/download/${P}/${compressed_patch}
-		http://www.woolridge.ca/mutt/patches/${mbox_hook_patch}
-		nntp? ( mirror://gentoo/${nntp_patch} )
-		http://wwwcip.informatik.uni-erlangen.de/~sithglan/mutt/${header_cache_patch}
-		http://www.woolridge.ca/mutt/patches/${pgp_timeout_patch}
-	)"
-#	nntp? ( http://mutt.kiev.ua/download/${P}/${nntp_patch} )
-#	http://cedricduval.free.fr/mutt/patches/download/${edit_threads_patch}
-
-RDEPEND="nls? ( sys-devel/gettext )
-	>=sys-libs/ncurses-5.2
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	slang? ( >=sys-libs/slang-1.4.2 )
-	!vanilla? ( sys-libs/gdbm )"
-DEPEND="${RDEPEND}
-	net-mail/mailbase
-	!vanilla? ( sys-devel/automake sys-devel/autoconf )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha hppa ia64 amd64 ~mips ~ppc64 ~ppc-macos"
-
-
-pkg_setup() {
-	if ! use imap; then
-		echo
-		einfo
-		einfo "NOTE: The USE variable 'imap' is not in your USE flags."
-		einfo "For imap support in mutt, you will need to restart the build with USE=imap"
-		einfo
-		echo
-	fi
-}
-
-src_unpack() {
-	unpack ${P}i.tar.gz && cd ${S} || die "unpack failed"
-	if ! use vanilla; then
-		epatch ${DISTDIR}/${compressed_patch}
-		epatch ${DISTDIR}/${edit_threads_patch}
-		epatch ${DISTDIR}/${mbox_hook_patch}
-		epatch ${DISTDIR}/${header_cache_patch}
-		epatch ${DISTDIR}/${pgp_timeout_patch}
-		use nntp && epatch ${DISTDIR}/${nntp_patch}
-
-		# The following steps are necessary for the nntp patch and the
-		# header_cache_patch
-		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"
-	fi
-
-	# Fix a slang problem that is already fixed in upstream cvs
-	epatch ${FILESDIR}/slang.patch
-
-	# Fix ability to read from a subprocess with source script.sh|
-	# Bug #42738 (25 Feb 2004 agriffis)
-	epatch ${FILESDIR}/8patch-1.5.6.dyc.source_stat
-}
-
-src_compile() {
-	local myconf="
-		$(use_enable nls) \
-		$(use_with ssl) \
-		$(use_enable imap) \
-		$(use_enable crypt pgp) \
-		$(use_enable cjk default-japanese) \
-		--sysconfdir=/etc/mutt \
-		--with-docdir=/usr/share/doc/mutt-${PVR} \
-		--with-regex --enable-pop --enable-nfs-fix \
-		--disable-fcntl --enable-flock --enable-external-dotlock"
-
-	# See Bug #22787
-	unset WANT_AUTOCONF_2_5 WANT_AUTOCONF
-
-	# See Bug #11170
-	case ${ARCH} in
-		alpha|ppc) replace-flags "-O[3-9]" "-O2" ;;
-	esac
-
-	if use slang; then
-		myconf="${myconf} --with-slang"
-		ewarn "If you want a transparent background,"
-		ewarn "please merge mutt 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
-
-	if ! use vanilla; then
-		# imap part of edit_threads patch
-		myconf="${myconf} $(use_enable imap imap-edit-threads)"
-
-		# rr.compressed patch
-		myconf="${myconf} --enable-compressed"
-
-		# nntp patch
-		myconf="${myconf} $(use_enable nntp)"
-
-		# maildir_header_cache_patch
-		myconf="${myconf} --enable-hcache"
-	fi
-
-	econf ${myconf}
-	make || die "make 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/mutt
-		newins ${FILESDIR}/Muttrc.mbox Muttrc
-	else
-		insinto /etc/mutt
-		doins ${FILESDIR}/Muttrc
-	fi
-
-	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
-}
-
-pkg_postinst() {
-	einfo "The USE variable 'imap' is not set by default on most architectures."
-	einfo "To enable imap support in mutt, make sure you have USE=imap"
-}
diff --git a/mail-client/mutt/mutt-1.5.6-r4.ebuild b/mail-client/mutt/mutt-1.5.6-r4.ebuild
deleted file mode 100644
index b8e3858f8e9c..000000000000
--- a/mail-client/mutt/mutt-1.5.6-r4.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# 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.6-r4.ebuild,v 1.10 2005/02/25 15:09:41 agriffis Exp $
-
-inherit eutils flag-o-matic
-IUSE="cjk ssl nls slang crypt imap mbox nntp vanilla"
-
-edit_threads_patch="patch-1.5.5.1.cd.edit_threads.9.5-gentoo.bz2"
-compressed_patch="patch-${PV}.rr.compressed.gz"
-nntp_patch="patch-${PV}.vvv.nntp-gentoo-r3.bz2"
-mbox_hook_patch="patch-${PV}.dw.mbox-hook.1"
-header_cache_patch="patch-${PV}.tg.hcache.8"
-pgp_timeout_patch="patch-${PV}.dw.pgp-timeout.1"
-
-DESCRIPTION="a small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org"
-SRC_URI="ftp://ftp.mutt.org/mutt/devel/mutt-${PV}i.tar.gz
-	!vanilla? (
-		mirror://gentoo/${edit_threads_patch}
-		http://mutt.kiev.ua/download/${P}/${compressed_patch}
-		http://www.woolridge.ca/mutt/patches/${mbox_hook_patch}
-		nntp? ( mirror://gentoo/${nntp_patch} )
-		http://wwwcip.informatik.uni-erlangen.de/~sithglan/mutt/${header_cache_patch}
-		http://www.woolridge.ca/mutt/patches/${pgp_timeout_patch}
-	)"
-#	nntp? ( http://mutt.kiev.ua/download/${P}/${nntp_patch} )
-#	http://cedricduval.free.fr/mutt/patches/download/${edit_threads_patch}
-
-RDEPEND="nls? ( sys-devel/gettext )
-	>=sys-libs/ncurses-5.2
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	slang? ( >=sys-libs/slang-1.4.2 )
-	!vanilla? ( sys-libs/gdbm )"
-DEPEND="${RDEPEND}
-	net-mail/mailbase
-	!vanilla? ( sys-devel/automake sys-devel/autoconf )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha hppa ia64 amd64 mips ~ppc64 ~ppc-macos"
-
-
-pkg_setup() {
-	if ! use imap; then
-		echo
-		einfo
-		einfo "NOTE: The USE variable 'imap' is not in your USE flags."
-		einfo "For imap support in mutt, you will need to restart the build with USE=imap"
-		einfo
-		echo
-	fi
-}
-
-src_unpack() {
-	unpack ${P}i.tar.gz && cd ${S} || die "unpack failed"
-	if ! use vanilla; then
-		epatch ${DISTDIR}/${compressed_patch}
-		epatch ${DISTDIR}/${edit_threads_patch}
-		epatch ${DISTDIR}/${mbox_hook_patch}
-		epatch ${DISTDIR}/${header_cache_patch}
-		epatch ${DISTDIR}/${pgp_timeout_patch}
-		use nntp && epatch ${DISTDIR}/${nntp_patch}
-
-		# The following steps are necessary for the nntp patch and the
-		# header_cache_patch
-		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"
-	fi
-
-	# Fix a slang problem that is already fixed in upstream cvs
-	epatch ${FILESDIR}/slang.patch
-
-	# Fix ability to read from a subprocess with source script.sh|
-	# Bug #42738 (25 Feb 2004 agriffis)
-	epatch ${FILESDIR}/8patch-1.5.6.dyc.source_stat
-}
-
-src_compile() {
-	local myconf="
-		$(use_enable nls) \
-		$(use_with ssl) \
-		$(use_enable imap) \
-		$(use_enable crypt pgp) \
-		$(use_enable cjk default-japanese) \
-		--sysconfdir=/etc/mutt \
-		--with-docdir=/usr/share/doc/mutt-${PVR} \
-		--with-regex --enable-pop --enable-nfs-fix \
-		--disable-fcntl --enable-flock --enable-external-dotlock"
-
-	# See Bug #22787
-	unset WANT_AUTOCONF_2_5 WANT_AUTOCONF
-
-	# See Bug #11170
-	case ${ARCH} in
-		alpha|ppc) replace-flags "-O[3-9]" "-O2" ;;
-	esac
-
-	if use slang; then
-		myconf="${myconf} --with-slang"
-		ewarn "If you want a transparent background,"
-		ewarn "please merge mutt 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
-
-	if ! use vanilla; then
-		# imap part of edit_threads patch
-		myconf="${myconf} $(use_enable imap imap-edit-threads)"
-
-		# rr.compressed patch
-		myconf="${myconf} --enable-compressed"
-
-		# nntp patch
-		myconf="${myconf} $(use_enable nntp)"
-
-		# maildir_header_cache_patch
-		myconf="${myconf} --enable-hcache"
-	fi
-
-	econf ${myconf}
-	make || die "make 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/mutt
-		newins ${FILESDIR}/Muttrc.mbox Muttrc
-	else
-		insinto /etc/mutt
-		doins ${FILESDIR}/Muttrc
-	fi
-
-	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
-}
-
-pkg_postinst() {
-	einfo "The USE variable 'imap' is not set by default on most architectures."
-	einfo "To enable imap support in mutt, make sure you have USE=imap"
-}
diff --git a/mail-client/mutt/mutt-1.5.6-r5.ebuild b/mail-client/mutt/mutt-1.5.6-r5.ebuild
deleted file mode 100644
index 6af22b7b2159..000000000000
--- a/mail-client/mutt/mutt-1.5.6-r5.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# 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.6-r5.ebuild,v 1.6 2005/03/17 09:03:11 hansmi Exp $
-
-inherit eutils flag-o-matic
-IUSE="cjk ssl nls slang crypt imap mbox nntp vanilla"
-
-edit_threads_patch="patch-1.5.5.1.cd.edit_threads.9.5-gentoo.bz2"
-compressed_patch="patch-${PV}.rr.compressed.gz"
-nntp_patch="patch-${PV}.vvv.nntp-gentoo-r3.bz2"
-mbox_hook_patch="patch-${PV}.dw.mbox-hook.1"
-header_cache_patch="patch-${PV}.tg.hcache.11"
-pgp_timeout_patch="patch-${PV}.dw.pgp-timeout.1"
-auto_decode_patch="patch-${PV}.ddm.pgp-auto-decode.1"
-
-DESCRIPTION="a small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org"
-SRC_URI="ftp://ftp.mutt.org/mutt/devel/mutt-${PV}i.tar.gz
-	!vanilla? (
-		mirror://gentoo/${edit_threads_patch}
-		http://mutt.kiev.ua/download/${P}/${compressed_patch}
-		http://www.woolridge.ca/mutt/patches/${mbox_hook_patch}
-		nntp? ( mirror://gentoo/${nntp_patch} )
-		http://wwwcip.informatik.uni-erlangen.de/~sithglan/mutt/${header_cache_patch}
-		http://www.woolridge.ca/mutt/patches/${pgp_timeout_patch}
-		http://www.pizzashack.org/mutt/${auto_decode_patch}
-	)"
-#	nntp? ( http://mutt.kiev.ua/download/${P}/${nntp_patch} )
-#	http://cedricduval.free.fr/mutt/patches/download/${edit_threads_patch}
-
-RDEPEND="nls? ( sys-devel/gettext )
-	>=sys-libs/ncurses-5.2
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	slang? ( >=sys-libs/slang-1.4.2 )
-	!vanilla? ( sys-libs/gdbm )"
-DEPEND="${RDEPEND}
-	net-mail/mailbase
-	!vanilla? ( sys-devel/automake sys-devel/autoconf )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha ~hppa ia64 amd64 ~mips ppc64 ~ppc-macos"
-
-
-pkg_setup() {
-	if ! use imap; then
-		echo
-		einfo
-		einfo "NOTE: The USE variable 'imap' is not in your USE flags."
-		einfo "For imap support in mutt, you will need to restart the build with USE=imap"
-		einfo
-		echo
-	fi
-}
-
-src_unpack() {
-	unpack ${P}i.tar.gz && cd ${S} || die "unpack failed"
-	if ! use vanilla; then
-		epatch ${DISTDIR}/${compressed_patch}
-		epatch ${DISTDIR}/${edit_threads_patch}
-		epatch ${DISTDIR}/${mbox_hook_patch}
-		epatch ${DISTDIR}/${header_cache_patch}
-		epatch ${DISTDIR}/${pgp_timeout_patch}
-		epatch ${DISTDIR}/${auto_decode_patch}
-		use nntp && epatch ${DISTDIR}/${nntp_patch}
-
-		# The following steps are necessary for the nntp patch and the
-		# header_cache_patch
-		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"
-	fi
-
-	# Fix a slang problem that is already fixed in upstream cvs
-	epatch ${FILESDIR}/slang.patch
-
-	# Fix ability to read from a subprocess with source script.sh|
-	# Bug #42738 (25 Feb 2004 agriffis)
-	epatch ${FILESDIR}/8patch-1.5.6.dyc.source_stat
-}
-
-src_compile() {
-	local myconf="
-		$(use_enable nls) \
-		$(use_with ssl) \
-		$(use_enable imap) \
-		$(use_enable crypt pgp) \
-		$(use_enable cjk default-japanese) \
-		--sysconfdir=/etc/mutt \
-		--with-docdir=/usr/share/doc/mutt-${PVR} \
-		--with-regex --enable-pop --enable-nfs-fix \
-		--disable-fcntl --enable-flock --enable-external-dotlock"
-
-	# See Bug #22787
-	unset WANT_AUTOCONF_2_5 WANT_AUTOCONF
-
-	# See Bug #11170
-	case ${ARCH} in
-		alpha|ppc) replace-flags "-O[3-9]" "-O2" ;;
-	esac
-
-	if use slang; then
-		myconf="${myconf} --with-slang"
-		ewarn "If you want a transparent background,"
-		ewarn "please merge mutt 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
-
-	if ! use vanilla; then
-		# imap part of edit_threads patch
-		myconf="${myconf} $(use_enable imap imap-edit-threads)"
-
-		# rr.compressed patch
-		myconf="${myconf} --enable-compressed"
-
-		# nntp patch
-		myconf="${myconf} $(use_enable nntp)"
-
-		# maildir_header_cache_patch
-		myconf="${myconf} --enable-hcache"
-	fi
-
-	econf ${myconf}
-	make || die "make 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/mutt
-		newins ${FILESDIR}/Muttrc.mbox Muttrc
-	else
-		insinto /etc/mutt
-		doins ${FILESDIR}/Muttrc
-	fi
-
-	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
-}
-
-pkg_postinst() {
-	einfo "The USE variable 'imap' is not set by default on most architectures."
-	einfo "To enable imap support in mutt, make sure you have USE=imap"
-}
diff --git a/mail-client/mutt/mutt-1.5.6.ebuild b/mail-client/mutt/mutt-1.5.6.ebuild
deleted file mode 100644
index e95007a63aaa..000000000000
--- a/mail-client/mutt/mutt-1.5.6.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# 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.6.ebuild,v 1.8 2005/01/01 11:58:30 corsair Exp $
-
-inherit eutils flag-o-matic
-IUSE="cjk ssl nls slang crypt imap mbox nntp vanilla"
-
-edit_threads_patch="patch-1.5.5.1.cd.edit_threads.9.5-gentoo.bz2"
-compressed_patch="patch-${PV}.rr.compressed.gz"
-nntp_patch="patch-${PV}.vvv.nntp-gentoo.bz2"
-mbox_hook_patch="patch-${PV}.dw.mbox-hook.1"
-
-DESCRIPTION="a small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org"
-SRC_URI="ftp://ftp.mutt.org/mutt/devel/mutt-${PV}i.tar.gz
-	mirror://gentoo/${edit_threads_patch}
-	http://mutt.kiev.ua/download/${P}/${compressed_patch}
-	http://www.woolridge.ca/mutt/patches/${mbox_hook_patch}
-	nntp? ( mirror://gentoo/${nntp_patch} )"
-#	nntp? ( http://mutt.kiev.ua/download/${P}/${nntp_patch} )
-#	http://cedricduval.free.fr/mutt/patches/download/${edit_threads_patch}
-
-RDEPEND="nls? ( sys-devel/gettext )
-	>=sys-libs/ncurses-5.2
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	slang? ( >=sys-libs/slang-1.4.2 )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	net-mail/mailbase
-	!vanilla? ( nntp? ( sys-devel/automake sys-devel/autoconf ) )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha hppa ia64 amd64 mips ppc64"
-
-
-pkg_setup() {
-	if ! use imap; then
-		echo
-		einfo
-		einfo "NOTE: The USE variable 'imap' is not in your USE flags."
-		einfo "For imap support in mutt, you will need to restart the build with USE=imap"
-		echo
-	fi
-}
-
-src_unpack() {
-	unpack ${P}i.tar.gz && cd ${S} || die "unpack failed"
-	if ! use vanilla; then
-		epatch ${DISTDIR}/${compressed_patch}
-		epatch ${DISTDIR}/${edit_threads_patch}
-		epatch ${DISTDIR}/${mbox_hook_patch}
-		if use nntp; then
-			epatch ${DISTDIR}/${nntp_patch}
-			# I don't know how much of this is truly necessary, but it
-			# was all in the ebuild proposed in bug 23196
-			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"
-			autoconf						|| die "autoconf failed"
-		fi
-	fi
-
-	# Fix a slang problem that is already fixed in upstream cvs
-	epatch ${FILESDIR}/slang.patch
-
-	# Fix ability to read from a subprocess with source script.sh|
-	# Bug #42738 (25 Feb 2004 agriffis)
-	epatch ${FILESDIR}/8patch-1.5.6.dyc.source_stat
-}
-
-src_compile() {
-	local myconf="
-		$(use_enable nls) \
-		$(use_with ssl) \
-		$(use_enable imap) \
-		$(use_enable crypt pgp) \
-		$(use_enable cjk default-japanese) \
-		--sysconfdir=/etc/mutt \
-		--with-docdir=/usr/share/doc/mutt-${PVR} \
-		--with-regex --enable-pop --enable-nfs-fix \
-		--disable-fcntl --enable-flock --enable-external-dotlock"
-
-	# See Bug #22787
-	unset WANT_AUTOCONF_2_5 WANT_AUTOCONF
-
-	# See Bug #11170
-	case ${ARCH} in
-		alpha|ppc) replace-flags "-O[3-9]" "-O2" ;;
-	esac
-
-	if use slang; then
-		myconf="${myconf} --with-slang"
-		ewarn "If you want a transparent background,"
-		ewarn "please merge mutt 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
-
-	if ! use vanilla; then
-		# imap part of edit_threads patch
-		myconf="${myconf} $(use_enable imap imap-edit-threads)"
-
-		# rr.compressed patch
-		myconf="${myconf} --enable-compressed"
-
-		# nntp patch
-		myconf="${myconf} $(use_enable nntp)"
-	fi
-
-	econf ${myconf}
-	sed -i -e 's/README.UPGRADE//' doc/Makefile || die "sed failed"
-	make || die "make 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/mutt
-		newins ${FILESDIR}/Muttrc.mbox Muttrc
-	else
-		insinto /etc/mutt
-		doins ${FILESDIR}/Muttrc
-	fi
-
-	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
-}
-
-pkg_postinst() {
-	einfo "The USE variable 'imap' is not set by default on most architectures."
-	einfo "To enable imap support in mutt, make sure you have USE=imap"
-}