Remove packages that were masked.

26 files changed, 0 insertions, 1139 deletions

diff --git a/mail-client/exmh/ChangeLog b/mail-client/exmh/ChangeLog
deleted file mode 100644
index 0cdebe3e45c4..000000000000
--- a/mail-client/exmh/ChangeLog
+++ /dev/null
@@ -1,73 +0,0 @@
-# ChangeLog for mail-client/exmh
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/exmh/ChangeLog,v 1.13 2007/02/08 13:02:37 flameeyes Exp $
-
-  08 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
-  Regenerate digest in Manifest2 format.
-
-  23 Nov 2005; Luis Medinas <metalgod@gentoo.org> exmh-2.7.0.ebuild:
-  Added ~amd64 keyword. Closes bug #109740.
-
-  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> exmh-2.7.0.ebuild:
-  Stable on ppc.
-
-  17 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> exmh-2.7.0.ebuild:
-  Stable on sparc
-
-  14 Dec 2004; Andrej Kacian <ticho@gentoo.org> exmh-2.7.0.ebuild:
-  Stable on x86.
-
-  25 Sep 2004; Jason Wever <weeve@gentoo.org> exmh-2.6.3-r1.ebuild:
-  Stable on sparc.
-
-*exmh-2.7.0 (23 Sep 2004)
-
-  23 Sep 2004; Andrej Kacian <ticho@gentoo.org> +files/exmh-2.7.0-conf.patch,
-  exmh-2.6.3-r1.ebuild, exmh-2.6.3.ebuild, +exmh-2.7.0.ebuild:
-  Version bump. Closes bug #58257, reported by Anders Eriksson
-  <aeriksson@fastmail.fm>. Use ${PV} in patch names for epatch.
-
-  23 Sep 2004; Andrej Kacian <ticho@gentoo.org> exmh-2.6.3-r1.ebuild,
-  exmh-2.6.3.ebuild:
-  Stable on x86. Use epatch instead of patch in 2.6.3.
-
-*exmh-2.6.3-r1 (08 Aug 2004)
-
-  08 Aug 2004; Tom Knight <tomk@gentoo.org> +exmh-2.5-r1.ebuild,
-  exmh-2.5.ebuild, +exmh-2.6.3-r1.ebuild:
-  Added docs and config file to fix bug #30959, tidied up ebuilds
-
-  03 Jun 2004; David Holm <dholm@gentoo.org> exmh-2.6.3.ebuild:
-  Added to ~ppc.
-
-*exmh-2.6.3 (29 May 2004)
-
-  29 May 2004; Seemant Kulleen <seemant@gentoo.org> +metadata.xml,
-  +files/exmh-2.5-conf.patch, +files/exmh-2.6.3-conf.patch, +exmh-2.5.ebuild,
-  +exmh-2.6.3.ebuild:
-  Moved from net-mail/exmh to mail-client/exmh.
-
-  22 Feb 2004; Aron Griffis <agriffis@gentoo.org> exmh-2.5.ebuild,
-  exmh-2.6.3.ebuild:
-  Remove arm keywords
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
-
-*exmh-2.6.3 (31 Jul 2003)
-
-  31 Jul 2003; Ryan Phillips <rphillips@gentoo.org> exmh-2.6.3.ebuild :
-  updated version and added net-mail/metamail deps
- 
-*exmh-2.5 (31 May 2002)
-
-  31 Jul 2003; Ryan Phillips <rphillips@gentoo.org> exmh-2.5.ebuild :
-  Added net-mail/metamail to deps
-  
-  31 May 2002; Ryan Phillips <rphillips@gentoo.org> ChangeLog :
-
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
-
diff --git a/mail-client/exmh/Manifest b/mail-client/exmh/Manifest
deleted file mode 100644
index 4e76510631ab..000000000000
--- a/mail-client/exmh/Manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-AUX exmh-2.5-conf.patch 3161 RMD160 b0bbf5b86c7c3f8060424b317fd8199fbecab3bd SHA1 b08d89e53f9ea7a00c6cf56d5a685bb658d50317 SHA256 f1778e021294ad7cf98306d984c8f0108a9d4fbdc8f166149027674aa8197521
-AUX exmh-2.6.3-conf.patch 2876 RMD160 90974d7f3ce5541a1f0223d058e3be837da063fb SHA1 5f44fb13252e21ba299fe61aaf96d098ada58730 SHA256 2ac8479b126c284d244524af4cd935c95082d28d135d6f29465c2a48aacd8a01
-AUX exmh-2.7.0-conf.patch 2876 RMD160 ba02fab18868f28112fd838fab80f74468e7e258 SHA1 b45db724f2f4d5dd89c6fbba98821c335da0855a SHA256 225beea522b821274a0ca87446f2f24ffc2ee7ea9d28f13ba7e8608c9b2405b6
-DIST exmh-2.5.tar.gz 867121 RMD160 22e02034d15d318429edb9b63d5b851ff497311d SHA1 eb24358ae4f12b940b7ad5af64c7cf1f10e9e7fa SHA256 a1de22fc650036f0f79c7154fa1749dc5dfff9d5e0a55b2c9b079d211852496d
-DIST exmh-2.6.3.tar.gz 910556 RMD160 3ccb20b27bed115b73e55351ef6633d30044b551 SHA1 3d41d4c735b7248cb10937950ea2adb0e3f4033c SHA256 f8c9c1a437193ac101a9417d274c92a3c575d6c9e47bc10d657246d264deb03c
-DIST exmh-2.7.0.tar.gz 1061945 RMD160 05d6237e56334bdd00b8a869ffd7fd336601899d SHA1 0bc9a453175de3b091b02edd4d08d9ed774bf873 SHA256 b0196e040580d86ae3ba626dfa5345510bfccc430938fbcdaa5dcda1c2d4ce8e
-EBUILD exmh-2.5-r1.ebuild 1345 RMD160 618eb7d263e1212a23ed2b30d325d7a7c2c74aeb SHA1 b4973ddb2f31c96e141c75f5c0b412d014eb290b SHA256 2e2472e504fa765dacfcbbcfb14687b925bba094c4ff0a63928e9cfb01b375fa
-EBUILD exmh-2.5.ebuild 1265 RMD160 e21c11f958ee58c8c1529cebd45167d08c6d3eb5 SHA1 c13858f72864977f7a034336f53c69c3c468c6ea SHA256 74df1b8cf1af84a957e609c03b3d62c8ff01cc9adfcf9b0f645a17c62224bc2a
-EBUILD exmh-2.6.3-r1.ebuild 1389 RMD160 fa58682333de4061c28e37a39b22f84e07594bf1 SHA1 f300e85ee11d354eb62b0201d1e55ec3d58fcaa9 SHA256 000a48be33bf63ce73ca6477c86b97d12a6584a6473b9f1e30b5e49293cef7bc
-EBUILD exmh-2.6.3.ebuild 1274 RMD160 a413b16c85e7c6d9be28d3c8bceaed5f777ce819 SHA1 4a1d67ceb31df312fe9e70531e2a337ead971a9d SHA256 0f8e460643f2308c9fa12ad25a4797532f5320fa82b4e811b794b33a9e3ec39d
-EBUILD exmh-2.7.0.ebuild 1393 RMD160 16ed591ff996bfbcd4f6278ca9f6e5c49887c5ce SHA1 6264eac4aee2607b446d88925c986818b94e753d SHA256 98d1aa8fb9e044470d3f3e66b28aee62d626160134b46cac474de1701c60da91
-MISC ChangeLog 2673 RMD160 06d9ab24e67c8b1e5430ebd45fe45b134a6bb152 SHA1 fe250176b7d08c4499e6c65cb0939e68a685215d SHA256 56cf132759c27c601b45349515fe7c3b4c3d67e97d9a4e197f89c0e0d0324588
-MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
diff --git a/mail-client/exmh/exmh-2.5-r1.ebuild b/mail-client/exmh/exmh-2.5-r1.ebuild
deleted file mode 100644
index 58cdde0d8c94..000000000000
--- a/mail-client/exmh/exmh-2.5-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/exmh/exmh-2.5-r1.ebuild,v 1.2 2005/07/09 15:41:36 swegener Exp $
-
-inherit eutils
-DESCRIPTION="An X user interface for MH mail"
-SRC_URI="ftp://ftp.scriptics.com/pub/tcl/${PN}/${P}.tar.gz"
-HOMEPAGE="http://beedub.com/exmh/"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="~x86 ~sparc"
-IUSE="crypt"
-
-DEPEND="mail-client/nmh
-	dev-tcltk/expect
-	net-mail/mailbase
-	net-mail/metamail
-	crypt? ( app-crypt/gnupg )
-	>=dev-lang/tcl-8.2
-	>=dev-lang/tk-8.2"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	for i in *.MASTER; do cp $i ${i%%.MASTER}; done
-	mv exmh.l exmh.1
-	epatch ${FILESDIR}/${P}-conf.patch
-	cd misc
-	rm -rf RPM *tar* *gbuffy*
-	for i in *
-	do
-		mv $i $i.orig
-		sed -e "s:/usr/local/bin:/usr/bin:" $i.orig > $i
-		mv $i $i.orig
-		sed -e "s:/usr/local/nmh/bin:/usr/bin:" $i.orig > $i
-		mv $i $i.orig
-		sed -e "s:/usr/local/nmh/lib:/usr/bin:" $i.orig > $i
-		rm $i.orig
-	done
-}
-
-src_compile() {
-	echo 'auto_mkindex ./lib *.tcl' | tclsh
-}
-
-src_install() {
-	into /usr
-	dobin exmh exmh-bg exmh-async ftp.expect
-
-	doman exmh.1
-
-	dodoc COPYRIGHT exmh.CHANGES exmh.README misc/*
-
-	insinto /usr/lib/${P}
-	doins lib/*
-
-	insinto /usr/lib/${P}/bitmaps
-	doins lib/bitmaps/*
-
-	insinto /usr/lib/${P}/html
-	doins lib/html/*
-}
diff --git a/mail-client/exmh/exmh-2.5.ebuild b/mail-client/exmh/exmh-2.5.ebuild
deleted file mode 100644
index 172bfa876e42..000000000000
--- a/mail-client/exmh/exmh-2.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/exmh/exmh-2.5.ebuild,v 1.5 2005/07/09 15:41:36 swegener Exp $
-
-inherit eutils
-DESCRIPTION="An X user interface for MH mail"
-SRC_URI="ftp://ftp.scriptics.com/pub/tcl/${PN}/${P}.tar.gz"
-HOMEPAGE="http://beedub.com/exmh/"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 sparc"
-IUSE="crypt"
-
-DEPEND="mail-client/nmh
-	dev-tcltk/expect
-	net-mail/mailbase
-	net-mail/metamail
-	crypt? ( app-crypt/gnupg )
-	>=dev-lang/tcl-8.2
-	>=dev-lang/tk-8.2"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	for i in *.MASTER; do cp $i ${i%%.MASTER}; done
-	mv exmh.l exmh.1
-	epatch ${FILESDIR}/${P}-conf.patch
-	cd misc
-	rm -rf RPM *tar* *gbuffy*
-	for i in *
-	do
-		mv $i $i.orig
-		sed -e "s:/usr/local/bin:/usr/bin:" $i.orig > $i
-		mv $i $i.orig
-		sed -e "s:/usr/local/nmh/bin:/usr/bin:" $i.orig > $i
-		mv $i $i.orig
-		sed -e "s:/usr/local/nmh/lib:/usr/bin:" $i.orig > $i
-		rm $i.orig
-	done
-}
-
-src_compile() {
-	echo 'auto_mkindex ./lib *.tcl' | tclsh
-}
-
-src_install() {
-	into /usr
-	dobin exmh exmh-bg exmh-async ftp.expect
-
-	doman exmh.1
-
-	dodoc COPYRIGHT exmh.CHANGES exmh.README misc/*
-
-	dodir /usr/lib/${P}
-	install -m 644 lib/* ${D}/usr/lib/${P}
-}
diff --git a/mail-client/exmh/exmh-2.6.3-r1.ebuild b/mail-client/exmh/exmh-2.6.3-r1.ebuild
deleted file mode 100644
index 00860181f583..000000000000
--- a/mail-client/exmh/exmh-2.6.3-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/exmh/exmh-2.6.3-r1.ebuild,v 1.5 2005/07/09 15:41:36 swegener Exp $
-
-inherit eutils
-DESCRIPTION="An X user interface for MH mail"
-SRC_URI="ftp://ftp.scriptics.com/pub/tcl/${PN}/${P}.tar.gz"
-HOMEPAGE="http://beedub.com/exmh/"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 sparc ~ppc"
-IUSE="crypt"
-
-DEPEND="mail-client/nmh
-	dev-tcltk/expect
-	net-mail/mailbase
-	net-mail/metamail
-	crypt? ( app-crypt/gnupg )
-	>=dev-lang/tcl-8.2
-	>=dev-lang/tk-8.2"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	for i in *.MASTER; do cp $i ${i%%.MASTER}; done
-	mv exmh.l exmh.1
-	epatch ${FILESDIR}/${P}-conf.patch
-	cd misc
-	rm -rf RPM *tar* *gbuffy*
-	for i in *
-	do
-		mv $i $i.orig
-		sed -e "s:/usr/local/bin:/usr/bin:" $i.orig > $i
-		mv $i $i.orig
-		sed -e "s:/usr/local/nmh/bin:/usr/bin:" $i.orig > $i
-		mv $i $i.orig
-		sed -e "s:/usr/local/nmh/lib:/usr/bin:" $i.orig > $i
-		rm $i.orig
-	done
-}
-
-src_compile() {
-	echo 'auto_mkindex ./lib *.tcl' | tclsh
-}
-
-src_install() {
-	into /usr
-	dobin exmh exmh-bg exmh-async ftp.expect
-
-	doman exmh.1
-
-	dodoc COPYRIGHT exmh.CHANGES exmh.README misc/*
-
-	insinto /usr/lib/${P}
-	doins lib/*
-
-	insinto /usr/lib/${P}/bitmaps
-	doins lib/bitmaps/*
-
-	insinto /usr/lib/${P}/html
-	doins lib/html/*
-
-	insinto /etc
-	doins gentoo/exmh.conf
-}
diff --git a/mail-client/exmh/exmh-2.6.3.ebuild b/mail-client/exmh/exmh-2.6.3.ebuild
deleted file mode 100644
index e8cba2ef9b4f..000000000000
--- a/mail-client/exmh/exmh-2.6.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/exmh/exmh-2.6.3.ebuild,v 1.7 2005/07/09 15:41:36 swegener Exp $
-
-inherit eutils
-
-DESCRIPTION="An X user interface for MH mail"
-SRC_URI="ftp://ftp.scriptics.com/pub/tcl/${PN}/${P}.tar.gz"
-HOMEPAGE="http://beedub.com/exmh/"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 ~sparc ~ppc"
-IUSE="crypt"
-
-DEPEND="mail-client/nmh
-	dev-tcltk/expect
-	net-mail/mailbase
-	net-mail/metamail
-	crypt? ( app-crypt/gnupg )
-	>=dev-lang/tcl-8.2
-	>=dev-lang/tk-8.2"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	for i in *.MASTER; do cp $i ${i%%.MASTER}; done
-	mv exmh.l exmh.1
-	epatch ${FILESDIR}/${P}-conf.patch
-	cd misc
-	rm -rf RPM *tar* *gbuffy*
-	for i in *
-	do
-		mv $i $i.orig
-		sed -e "s:/usr/local/bin:/usr/bin:" $i.orig > $i
-		mv $i $i.orig
-		sed -e "s:/usr/local/nmh/bin:/usr/bin:" $i.orig > $i
-		mv $i $i.orig
-		sed -e "s:/usr/local/nmh/lib:/usr/bin:" $i.orig > $i
-		rm $i.orig
-	done
-}
-
-src_compile() {
-	echo 'auto_mkindex ./lib *.tcl' | tclsh
-}
-
-src_install() {
-	into /usr
-	dobin exmh exmh-bg exmh-async ftp.expect
-
-	doman exmh.1
-
-	dodoc COPYRIGHT exmh.CHANGES exmh.README misc/*
-
-	dodir /usr/lib/${P}
-	install -m 644 lib/* ${D}/usr/lib/${P}
-}
diff --git a/mail-client/exmh/exmh-2.7.0.ebuild b/mail-client/exmh/exmh-2.7.0.ebuild
deleted file mode 100644
index 68d727fadcc4..000000000000
--- a/mail-client/exmh/exmh-2.7.0.ebuild
+++ /dev/null
@@ -1,68 +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/exmh/exmh-2.7.0.ebuild,v 1.6 2005/11/23 00:43:22 metalgod Exp $
-
-inherit eutils
-
-DESCRIPTION="An X user interface for MH mail"
-SRC_URI="ftp://ftp.scriptics.com/pub/tcl/${PN}/${P}.tar.gz"
-HOMEPAGE="http://beedub.com/exmh/"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="~amd64 ppc sparc x86"
-IUSE="crypt"
-
-DEPEND="mail-client/nmh
-	dev-tcltk/expect
-	net-mail/mailbase
-	net-mail/metamail
-	crypt? ( app-crypt/gnupg )
-	>=dev-lang/tcl-8.2
-	>=dev-lang/tk-8.2"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	for i in *.MASTER; do cp $i ${i%%.MASTER}; done
-	mv exmh.l exmh.1
-	epatch ${FILESDIR}/${P}-conf.patch
-	cd misc
-	rm -rf RPM *tar* *gbuffy*
-	for i in *
-	do
-		mv $i $i.orig
-		sed -e "s:/usr/local/bin:/usr/bin:" $i.orig > $i
-		mv $i $i.orig
-		sed -e "s:/usr/local/nmh/bin:/usr/bin:" $i.orig > $i
-		mv $i $i.orig
-		sed -e "s:/usr/local/nmh/lib:/usr/bin:" $i.orig > $i
-		rm $i.orig
-	done
-}
-
-src_compile() {
-	echo 'auto_mkindex ./lib *.tcl' | tclsh
-}
-
-src_install() {
-	into /usr
-	dobin exmh exmh-bg exmh-async ftp.expect
-
-	doman exmh.1
-
-	dodoc COPYRIGHT exmh.CHANGES exmh.README misc/*
-
-	insinto /usr/lib/${P}
-	doins lib/*
-
-	insinto /usr/lib/${P}/bitmaps
-	doins lib/bitmaps/*
-
-	insinto /usr/lib/${P}/html
-	doins lib/html/*
-
-	insinto /etc
-	doins gentoo/exmh.conf
-}
diff --git a/mail-client/exmh/files/exmh-2.5-conf.patch b/mail-client/exmh/files/exmh-2.5-conf.patch
deleted file mode 100644
index 96489601444b..000000000000
--- a/mail-client/exmh/files/exmh-2.5-conf.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-diff -urN exmh-2.5/exmh exmh-2.5.conf/exmh
---- exmh-2.5/exmh	Thu May 23 10:20:22 2002
-+++ exmh-2.5.conf/exmh	Thu May 23 10:17:46 2002
-@@ -1,4 +1,4 @@
--#!wish -f
-+#!/usr/bin/wish -f
- #
- # TK interface to the MH Mail utility
- # Brent Welch <welch@acm.org>
-@@ -17,6 +17,34 @@
- 
- # The following lines are patched by exmh.install
- #CONFIGURATION
-+set wish /usr/bin/wish
-+set exmh(version) {version 2.5 07/13/2001}
-+set exmh(name) exmh
-+set exmh(maintainer) welch@acm.org
-+set mh_path /usr/bin
-+set exmh(slocal) /usr/bin/slocal
-+set mime(dir) /usr/bin
-+set mailcap_default /etc/mailcap
-+set mimetypes_default /etc/mime.types
-+set exmh(expect) /usr/bin/expect
-+set exmh(expectk) /usr/bin/expectk
-+set faces(dir) /usr/lib/faces
-+set faces(set,user) {local users usenix misc}
-+set faces(set,unknown) {domains unknown}
-+set faces(set,news) news
-+set faces(defaultDomain) eng.sun.com
-+set faces(suffix) {xpm gif xbm}
-+set pgp(pgp,path) /usr/bin
-+set pgp(pgp5,path) /usr/bin
-+set pgp(gpg,path) /usr/bin
-+set pgp(pgp6,path) /usr/bin
-+set glimpse(path) /usr/bin
-+set sound(cmd) /usr/bin/play
-+set exmh(library) /usr/lib/exmh-2.5
-+set install(dir,bin) /usr/bin
-+set install(dir,man) /usr/share/man/man1
-+set install(dir,lib) /usr/lib/exmh-2.5
-+
- #END CONFIGURATION
- 
- if [catch {file join a b}] {
-diff -urN exmh-2.5/exmh-async exmh-2.5.conf/exmh-async
---- exmh-2.5/exmh-async	Thu May 23 10:20:22 2002
-+++ exmh-2.5.conf/exmh-async	Thu May 23 09:55:34 2002
-@@ -1,4 +1,4 @@
--#!wish -f
-+#!/usr/bin/wish -f
- #
- # async editor frontend for exmh
- # Arg1: invoking interpreter's name (from [winfo name .])
-diff -urN exmh-2.5/exmh-bg exmh-2.5.conf/exmh-bg
---- exmh-2.5/exmh-bg	Thu May 23 10:20:22 2002
-+++ exmh-2.5.conf/exmh-bg	Thu May 23 10:18:18 2002
-@@ -1,4 +1,4 @@
--#!wish -f
-+#!/usr/bin/wish -f
- #
- # Background processing script for exmh.
- # This does stuff and then sends messages to the background module
-@@ -17,6 +17,34 @@
- # any specification.
- 
- #CONFIGURATION
-+set wish /usr/bin/wish
-+set exmh(version) {version 2.5 07/13/2001}
-+set exmh(name) exmh
-+set exmh(maintainer) welch@acm.org
-+set mh_path /usr/bin
-+set exmh(slocal) /usr/bin/slocal
-+set mime(dir) /usr/bin
-+set mailcap_default /etc/mailcap
-+set mimetypes_default /etc/mime.types
-+set exmh(expect) /usr/bin/expect
-+set exmh(expectk) /usr/bin/expectk
-+set faces(dir) /usr/lib/faces
-+set faces(set,user) {local users usenix misc}
-+set faces(set,unknown) {domains unknown}
-+set faces(set,news) news
-+set faces(defaultDomain) eng.sun.com
-+set faces(suffix) {xpm gif xbm}
-+set pgp(pgp,path) /usr/bin
-+set pgp(pgp5,path) /usr/bin
-+set pgp(gpg,path) /usr/bin
-+set pgp(pgp6,path) /usr/bin
-+set glimpse(path) /usr/bin
-+set sound(cmd) /usr/bin/play
-+set exmh(library) /usr/lib/exmh-2.5
-+set install(dir,bin) /usr/bin
-+set install(dir,man) /usr/share/man/man1
-+set install(dir,lib) /usr/lib/exmh-2.5
-+
- #END CONFIGURATION
- 
- wm withdraw .
-diff -urN exmh-2.5/ftp.expect exmh-2.5.conf/ftp.expect
---- exmh-2.5/ftp.expect	Thu May 23 10:20:22 2002
-+++ exmh-2.5.conf/ftp.expect	Thu May 23 09:55:34 2002
-@@ -1,6 +1,6 @@
- #!/bin/sh
- # \
--exec expect -f
-+exec /usr/bin/expect -f
- 
- set site [lindex $argv 0]
- set dir [lindex $argv 1]
diff --git a/mail-client/exmh/files/exmh-2.6.3-conf.patch b/mail-client/exmh/files/exmh-2.6.3-conf.patch
deleted file mode 100644
index 2cf64afa0001..000000000000
--- a/mail-client/exmh/files/exmh-2.6.3-conf.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -urN exmh-2.6.3/exmh exmh-2.6.3-gentoo/exmh
---- exmh-2.6.3/exmh	2003-04-19 12:41:21.000000000 +0200
-+++ exmh-2.6.3-gentoo/exmh	2003-04-19 12:34:08.000000000 +0200
-@@ -1,4 +1,4 @@
--#!wish -f
-+#!/usr/bin/wish -f
- #
- # TK interface to the MH Mail utility
- # Brent Welch <welch@acm.org>
-@@ -17,6 +17,8 @@
- 
- # The following lines are patched by exmh.install
- #CONFIGURATION
-+source /etc/exmh.conf
-+set exmh(version) "version 2.6.3 04/02/2003 (gentoo $exmh(gentoo-config-version))"
- #END CONFIGURATION
- 
- if [catch {file join a b}] {
-diff -urN exmh-2.6.3/exmh-bg exmh-2.6.3-gentoo/exmh-bg
---- exmh-2.6.3/exmh-bg	2003-04-19 12:41:21.000000000 +0200
-+++ exmh-2.6.3-gentoo/exmh-bg	2003-04-19 12:34:29.000000000 +0200
-@@ -1,4 +1,4 @@
--#!wish -f
-+#!/usr/bin/wish -f
- #
- # Background processing script for exmh.
- # This does stuff and then sends messages to the background module
-@@ -17,6 +17,8 @@
- # any specification.
- 
- #CONFIGURATION
-+source /etc/exmh.conf
-+set exmh(version) "version 2.6.3 04/02/2003 (gentoo $exmh(gentoo-config-version))"
- #END CONFIGURATION
- 
- wm withdraw .
-diff -urN exmh-2.6.3/exmh-strip exmh-2.6.3-gentoo/exmh-strip
---- exmh-2.6.3/exmh-strip	2003-04-19 12:41:21.000000000 +0200
-+++ exmh-2.6.3-gentoo/exmh-strip	2003-04-19 12:33:58.000000000 +0200
-@@ -1,4 +1,4 @@
--#!wish
-+#!/usr/bin/wish -f
- #
- # Utility to strip out attachments from MIME messages.
- # They are replaced with references to the external files.
-@@ -41,6 +41,8 @@
- # any specification.
- 
- #CONFIGURATION
-+source /etc/exmh.conf
-+set exmh(version) "version 2.6.3 04/02/2003 (gentoo $exmh(gentoo-config-version))"
- #END CONFIGURATION
- 
- if {[catch {wm withdraw .}]} {
-diff -urN exmh-2.6.3/gentoo/exmh.conf exmh-2.6.3-gentoo/gentoo/exmh.conf
---- exmh-2.6.3/gentoo/exmh.conf	1970-01-01 01:00:00.000000000 +0100
-+++ exmh-2.6.3-gentoo/gentoo/exmh.conf	2003-04-19 15:04:01.000000000 +0200
-@@ -0,0 +1,29 @@
-+# /etc/exmh.conf - configuration file for exmh
-+# this is sourced by exmh, so please use tcl syntax
-+set wish /usr/bin/wish
-+set exmh(gentoo-config-version) {2.6.3}
-+set exmh(name) exmh
-+set exmh(maintainer) welch@acm.org
-+set mh_path /usr/bin
-+set exmh(slocal) /usr/bin/slocal
-+set mime(dir) /usr/bin
-+set mailcap_default /etc/mailcap
-+set mimetypes_default /etc/mime.types
-+set exmh(expect) /usr/bin/expect
-+set exmh(expectk) /usr/expectk
-+set faces(dir) /usr/lib/faces
-+set faces(set,user) {local users usenix misc}
-+set faces(set,unknown) {domains unknown}
-+set faces(set,news) news
-+set faces(defaultDomain) panasas.com
-+set faces(suffix) {xpm gif xbm}
-+set pgp(pgp,path) /usr/bin
-+set pgp(pgp5,path) /usr/bin
-+set pgp(gpg,path) /usr/bin
-+set pgp(pgp6,path) /usr/bin
-+set glimpse(path) /usr/bin
-+set sound(cmd) {/usr/bin/play -v 38}
-+set exmh(library) /usr/lib/exmh-2.6.3
-+set install(dir,bin) /usr/bin
-+set install(dir,man) /usr/share/man/manl
-+set install(dir,lib) /usr/lib/exmh-2.6.3
diff --git a/mail-client/exmh/files/exmh-2.7.0-conf.patch b/mail-client/exmh/files/exmh-2.7.0-conf.patch
deleted file mode 100644
index 452096d831b2..000000000000
--- a/mail-client/exmh/files/exmh-2.7.0-conf.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -urN exmh-2.7.0/exmh exmh-2.7.0-gentoo/exmh
---- exmh-2.7.0/exmh	2003-04-19 12:41:21.000000000 +0200
-+++ exmh-2.7.0-gentoo/exmh	2003-04-19 12:34:08.000000000 +0200
-@@ -1,4 +1,4 @@
--#!wish -f
-+#!/usr/bin/wish -f
- #
- # TK interface to the MH Mail utility
- # Brent Welch <welch@acm.org>
-@@ -17,6 +17,8 @@
- 
- # The following lines are patched by exmh.install
- #CONFIGURATION
-+source /etc/exmh.conf
-+set exmh(version) "version 2.7.0 04/02/2003 (gentoo $exmh(gentoo-config-version))"
- #END CONFIGURATION
- 
- if [catch {file join a b}] {
-diff -urN exmh-2.7.0/exmh-bg exmh-2.7.0-gentoo/exmh-bg
---- exmh-2.7.0/exmh-bg	2003-04-19 12:41:21.000000000 +0200
-+++ exmh-2.7.0-gentoo/exmh-bg	2003-04-19 12:34:29.000000000 +0200
-@@ -1,4 +1,4 @@
--#!wish -f
-+#!/usr/bin/wish -f
- #
- # Background processing script for exmh.
- # This does stuff and then sends messages to the background module
-@@ -17,6 +17,8 @@
- # any specification.
- 
- #CONFIGURATION
-+source /etc/exmh.conf
-+set exmh(version) "version 2.7.0 04/02/2003 (gentoo $exmh(gentoo-config-version))"
- #END CONFIGURATION
- 
- wm withdraw .
-diff -urN exmh-2.7.0/exmh-strip exmh-2.7.0-gentoo/exmh-strip
---- exmh-2.7.0/exmh-strip	2003-04-19 12:41:21.000000000 +0200
-+++ exmh-2.7.0-gentoo/exmh-strip	2003-04-19 12:33:58.000000000 +0200
-@@ -1,4 +1,4 @@
--#!wish
-+#!/usr/bin/wish -f
- #
- # Utility to strip out attachments from MIME messages.
- # They are replaced with references to the external files.
-@@ -41,6 +41,8 @@
- # any specification.
- 
- #CONFIGURATION
-+source /etc/exmh.conf
-+set exmh(version) "version 2.7.0 04/02/2003 (gentoo $exmh(gentoo-config-version))"
- #END CONFIGURATION
- 
- if {[catch {wm withdraw .}]} {
-diff -urN exmh-2.7.0/gentoo/exmh.conf exmh-2.7.0-gentoo/gentoo/exmh.conf
---- exmh-2.7.0/gentoo/exmh.conf	1970-01-01 01:00:00.000000000 +0100
-+++ exmh-2.7.0-gentoo/gentoo/exmh.conf	2003-04-19 15:04:01.000000000 +0200
-@@ -0,0 +1,29 @@
-+# /etc/exmh.conf - configuration file for exmh
-+# this is sourced by exmh, so please use tcl syntax
-+set wish /usr/bin/wish
-+set exmh(gentoo-config-version) {2.7.0}
-+set exmh(name) exmh
-+set exmh(maintainer) welch@acm.org
-+set mh_path /usr/bin
-+set exmh(slocal) /usr/bin/slocal
-+set mime(dir) /usr/bin
-+set mailcap_default /etc/mailcap
-+set mimetypes_default /etc/mime.types
-+set exmh(expect) /usr/bin/expect
-+set exmh(expectk) /usr/expectk
-+set faces(dir) /usr/lib/faces
-+set faces(set,user) {local users usenix misc}
-+set faces(set,unknown) {domains unknown}
-+set faces(set,news) news
-+set faces(defaultDomain) panasas.com
-+set faces(suffix) {xpm gif xbm}
-+set pgp(pgp,path) /usr/bin
-+set pgp(pgp5,path) /usr/bin
-+set pgp(gpg,path) /usr/bin
-+set pgp(pgp6,path) /usr/bin
-+set glimpse(path) /usr/bin
-+set sound(cmd) {/usr/bin/play -v 38}
-+set exmh(library) /usr/lib/exmh-2.7.0
-+set install(dir,bin) /usr/bin
-+set install(dir,man) /usr/share/man/manl
-+set install(dir,lib) /usr/lib/exmh-2.7.0
diff --git a/mail-client/exmh/metadata.xml b/mail-client/exmh/metadata.xml
deleted file mode 100644
index 51f94e3fbe0e..000000000000
--- a/mail-client/exmh/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>net-mail</herd>
-</pkgmetadata>
diff --git a/mail-client/nmh/ChangeLog b/mail-client/nmh/ChangeLog
deleted file mode 100644
index 68e4e3876fee..000000000000
--- a/mail-client/nmh/ChangeLog
+++ /dev/null
@@ -1,123 +0,0 @@
-# ChangeLog for mail-client/nmh
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/nmh/ChangeLog,v 1.24 2009/09/23 17:54:29 patrick Exp $
-
-  23 Sep 2009; Patrick Lauer <patrick@gentoo.org> nmh-1.1-r1.ebuild,
-  nmh-1.3-r1.ebuild:
-  Remove virtual/libc
-
-  09 Dec 2008; Jeremy Olexa <darkside@gentoo.org> -nmh-1.0.4-r3.ebuild,
-  -nmh-1.1.ebuild, nmh-1.1-r1.ebuild:
-  (non maintainer commit) Remove old and apply file locking call to configure.
-  bug #153840 by David Fellows
-
-*nmh-1.3-r1 (09 Dec 2008)
-
-  09 Dec 2008; Jeremy Olexa <darkside@gentoo.org> -nmh-1.3.ebuild,
-  +nmh-1.3-r1.ebuild:
-  (non maintainer commit) making liblockfile an explicit dep instead of
-  automagic, bug #250340
-
-*nmh-1.3 (05 Dec 2008)
-
-  05 Dec 2008; Jeremy Olexa <darkside@gentoo.org>
-  +files/nmh-1.3-inc-login.patch, +files/nmh-1.3-install.patch,
-  +files/nmh-1.3-m_getfld.patch, +nmh-1.3.ebuild:
-  (non-maintainer commit) version bump for bug #224807
-
-  08 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
-  Regenerate digest in Manifest2 format.
-
-  23 Nov 2005; Luis Medinas <metalgod@gentoo.org> nmh-1.1-r1.ebuild:
-  Added ~amd64 keyword. Closes bug #109737.
-
-  02 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> nmh-1.1-r1.ebuild:
-  Stable on ppc.
-
-  29 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org> nmh-1.1-r1.ebuild:
-  Stable on sparc
-
-  26 Sep 2005; Andrej Kacian <ticho@gentoo.org> nmh-1.1-r1.ebuild:
-  Stable on x86.
-
-  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
-  Converted to UTF-8, fixed encoding screwups
-
-  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> nmh-1.1.ebuild:
-  Stable on ppc.
-
-*nmh-1.1-r1 (24 Dec 2004)
-
-  24 Dec 2004; Andrej Kacian <ticho@gentoo.org>
-  +files/nmh-1.1-annotate-fix.patch, +nmh-1.1-r1.ebuild:
-  Apply patch to fix reply annotation. Closes #69688, reported by Adam Jones
-  <jaybuhner77@yahoo.com>.
-
-  25 Sep 2004; Jason Wever <weeve@gentoo.org> nmh-1.1.ebuild:
-  Stable on sparc.
-
-  23 Sep 2004; Andrej Kacian <ticho@gentoo.org> nmh-1.1.ebuild:
-  Stable on x86.
-
-  07 Aug 2004; Tom Knight <tomk@gentoo.org> nmh-1.1.ebuild:
-  SRC_URI and HOMEPAGE have changed
-
-*nmh-1.1 (30 Jul 2004)
-
-  30 Jul 2004; Tuan Van <langthang@gentoo.org>
-  +files/nmh-1.1-configure-vitest.patch, +files/nmh-1.1-inc-login.patch,
-  +files/nmh-1.1-install.patch, +files/nmh-1.1-m_getfld.patch,
-  +nmh-1.1.ebuild:
-  Version bump. Thanks to Jonathan Kraut, Claes Nästén, Aaron Peterson,  
-  Sam Yates have contributed in bug #22173.
-
-  27 Jul 2004; Gustavo Zacarias <gustavoz@gentoo.org> nmh-1.0.4-r3.ebuild:
-  Stable on x86 & sparc wrt #57886
-
-  27 Jul 2004; Tuan Van <langthang@gentoo.org>
-  +files/nmh-1.0.4-configure-vitest.patch, nmh-1.0.4-r3.ebuild:
-  add patch to fix access violation.
-
-*nmh-1.0.4-r3 (27 Jul 2004)
-
-  27 Jul 2004; Tuan Van <langthang@gentoo.org>
-  +files/nmh-1.0.4-m_getfld.patch, +nmh-1.0.4-r3.ebuild:
-  Revision bump, added patch wrt bug #57886.
-
-  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> nmh-1.0.4-r2.ebuild:
-  virtual/glibc -> virtual/libc
-
-  03 Jun 2004; David Holm <dholm@gentoo.org> nmh-1.0.4-r2.ebuild:
-  Added to ~ppc.
-
-*nmh-1.0.4-r2 (29 May 2004)
-
-  29 May 2004; Seemant Kulleen <seemant@gentoo.org> +metadata.xml,
-  +nmh-1.0.4-r2.ebuild:
-  Moved from net-mail/nmh to mail-client/nmh.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-*nmh-1.0.4-r2 (1 June 2002)
-
-  1 June 2002; Martin Schlemmer <azarah@gentoo.org> :
-
-  Resolve bug #2338.  Seems without a valid /usr/bin/vi, this sandbox
-  violation accured.  Should be fixed in some better way.
-
-*nmh-1.0.4-r1 (3 May 2002)
-
-  3 May 2002; Matthew Kennedy <mkennedy@gentoo.org> ChangeLog,
-  nmh-1.0.4-r1.ebuild, files/digest-nmh-1.0.4-r1 :
-
-  Ebuild clean up. Dependency fix.
-
-*nmh-1.0.4 (1 Feb 2002)
-
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
diff --git a/mail-client/nmh/Manifest b/mail-client/nmh/Manifest
deleted file mode 100644
index fa4e5396616f..000000000000
--- a/mail-client/nmh/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-AUX nmh-1.0.4-configure-vitest.patch 356 RMD160 6f331ceac4e207bae93160fb1bcfd8a83fadaa7e SHA1 b570422215f9433413184d0ab24e557a0e0d01c8 SHA256 a8f116d20a3bbb16dcba52af76859459323ea963224e82bd401fa04289b2c3e2
-AUX nmh-1.0.4-m_getfld.patch 375 RMD160 a8fd4f439b4350f183282405d2b41c76413b4b27 SHA1 cf15e5a8b1d881f459606b93535d815e4922b189 SHA256 8b8aa3f3631143c3e08d6081179bb3b1226152e9eb02405a43a524b59edad842
-AUX nmh-1.1-annotate-fix.patch 443 RMD160 d5f4eabaa5c496c98de5f619c950c3c0877dab79 SHA1 1a5d906c5b0f4abca51abe93b504708410b70385 SHA256 6cdfc4ff0920ac18b0a9373dbb3b17665aeb6922f0d6b15a1242b3b107c9e120
-AUX nmh-1.1-configure-vitest.patch 332 RMD160 5c378df3457a09bbd9397f7cdeb5a87e2ce72b87 SHA1 4febe906dfc7a130a477629a4e7cef8bb4459d8a SHA256 838bd3677f2e8b00870bbdc6b1b26abec9229af40f857a3ce0449e4463d37fde
-AUX nmh-1.1-inc-login.patch 552 RMD160 170404bd7e9baa74676c72c3e5b0cdd8fa19453f SHA1 79a30eadfd63f2b4fd9aeeac9c2f329769cfb26b SHA256 98abf15246e5afc969e3681f5a3501281cd7705561f3a4cd300c6b4f80c73830
-AUX nmh-1.1-install.patch 1077 RMD160 65ce0ed4cb946f2c30955a90c503ad1cbdc4a567 SHA1 63c0925f8d7249907f060b6a5ecbe92c5fd3bae2 SHA256 c5fa488cf9c46b10de1b8972141e67a5143ef8ec5d0f6340ab71cbddc1b37453
-AUX nmh-1.1-m_getfld.patch 571 RMD160 45813d23f8c9fefe0e5fc3e1789f100d5b2a4648 SHA1 066b553da2d6f4d9d79198f7ed80de1093e6a8d1 SHA256 5f38d9feebbe8ebbf53d9b3fdf1fa6c0b8da914f5721206e4a49a6875fe0d989
-AUX nmh-1.3-inc-login.patch 625 RMD160 e5f6edd8fd49c3baff074aeab949401a9580c48e SHA1 3ddc61705f2bb9f75e5cba9d721ac6d743305367 SHA256 83015653f6b21241285a0c36c496bb42d188005a09caf8363e73683b6d0d543a
-AUX nmh-1.3-install.patch 493 RMD160 265cc0038b1c0e5586c4e1169b4ff8e4b00ed407 SHA1 66083fe3241ad40e17512c1f18e7535838054aa5 SHA256 8477686bdf9675c096e034f7d2a9812b06d30d50e3a59f72df5b01d37853d278
-AUX nmh-1.3-m_getfld.patch 627 RMD160 d47738a9f1c3f99350ff9433201ade5b9713307a SHA1 274495b527598904f307954c7ab42f881fd692d4 SHA256 5ef443b0d0ad3de47d3ee96abdd82479f1efa01fd2820ca77680705cc6e93889
-DIST nmh-1.1.tar.gz 808466 RMD160 20127d220b6de6531ff772bd03fec09a284a1b4c SHA1 3f906fcc48aa299c9a78f88679df963fcbeb121e SHA256 a0709e88188623e0ca7ff81a96836578ad617d42a9fa32aeda8ea47f0bac8967
-DIST nmh-1.3.tar.gz 847614 RMD160 a862789cc8edb28c0fc3295bd12787440797da92 SHA1 65b52b7db727c391cae7af60ee0b888cbdc2718a SHA256 9f16848424489b5a9f7c1402c87665dc56dcadecf6e5c44fb608aef0d1b03b47
-EBUILD nmh-1.1-r1.ebuild 1674 RMD160 7c7e7217fe955b8e2a6f7bbc1ab3411ff1ddc85f SHA1 f407532ce865ae1a1e7f306461a791eecde49e75 SHA256 f2faa01902f3b54e702edfc4e96e204b712ead075bf55a045fecec8073b11b13
-EBUILD nmh-1.3-r1.ebuild 1446 RMD160 3ba8f72a39a53d31b1ab3f3e7cfe00c9a6898dff SHA1 74565d79ccd5d834ae66ba0bab019789be428c5e SHA256 d77531a7762bd5de77767f34f7d777f25d370e918261b9488c4e20ad289db310
-MISC ChangeLog 4259 RMD160 2d4a8a8a70952ca9a0c1926ce80e45abf48dbe0e SHA1 838da987dee5d828a79b225adb1d3db55e226763 SHA256 7aba4d435d98dddd1f0e167a7b3693c4c5fd28ce8752b70708b103702e20febc
-MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
diff --git a/mail-client/nmh/files/nmh-1.0.4-configure-vitest.patch b/mail-client/nmh/files/nmh-1.0.4-configure-vitest.patch
deleted file mode 100644
index c2e893aa6118..000000000000
--- a/mail-client/nmh/files/nmh-1.0.4-configure-vitest.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2004-07-27 10:27:50.396850896 -0700
-+++ configure	2004-07-27 10:28:32.788406400 -0700
-@@ -1676,7 +1676,7 @@
- if eval "test \"`echo '$''{'nmh_cv_attvibug'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
--  if echo 'r /nonexist-file
-+  if echo 'r ./nonexist-file
- q' | ex > /dev/null 2>&1
- then
-         nmh_cv_attvibug=no
diff --git a/mail-client/nmh/files/nmh-1.0.4-m_getfld.patch b/mail-client/nmh/files/nmh-1.0.4-m_getfld.patch
deleted file mode 100644
index eb0d7677c236..000000000000
--- a/mail-client/nmh/files/nmh-1.0.4-m_getfld.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- sbr/m_getfld.orig.c	2004-07-26 22:07:25.169562740 -0700
-+++ sbr/m_getfld.c	2004-07-26 22:09:39.377799518 -0700
-@@ -727,9 +727,10 @@
- 	register char pc = *pat++;
- 
- 	for(;;) {
--		while (pc != *str++)
--			if (str > es)
--				return 0;
-+		while (str <= es && pc != *str)
-+			str++;
-+		if (str++ > es)
-+			return 0;
- 
- 		sp = str; pp = pat;
- 		while (pp < ep && *sp++ == *pp)
diff --git a/mail-client/nmh/files/nmh-1.1-annotate-fix.patch b/mail-client/nmh/files/nmh-1.1-annotate-fix.patch
deleted file mode 100644
index a379c9345a08..000000000000
--- a/mail-client/nmh/files/nmh-1.1-annotate-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -bur nmh/uip/sendsbr.c nmh-fixed/uip/sendsbr.c
---- nmh/uip/sendsbr.c	2003-10-24 22:17:40.000000000 +0200
-+++ nmh-fixed/uip/sendsbr.c	2004-12-24 15:00:09.352367464 +0100
-@@ -1020,7 +1020,7 @@
- 	if (is_selected(mp, msgnum)) {
- 	    if (debugsw)
- 		advise (NULL, "annotate message %d", msgnum);
--	    annotate (m_name (msgnum), annotext, cp, inplace, 1, 0, 0);
-+	    annotate (m_name (msgnum), annotext, cp, inplace, 1, -1, 0);
- 	}
-     }
- 
diff --git a/mail-client/nmh/files/nmh-1.1-configure-vitest.patch b/mail-client/nmh/files/nmh-1.1-configure-vitest.patch
deleted file mode 100644
index 874094ab1930..000000000000
--- a/mail-client/nmh/files/nmh-1.1-configure-vitest.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2004-07-30 19:20:50.532346778 -0700
-+++ configure	2004-07-30 19:21:31.831339678 -0700
-@@ -3434,7 +3434,7 @@
- if test "${nmh_cv_attvibug+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  if echo 'r /nonexist-file
-+  if echo 'r ./nonexist-file
- q' | ex > /dev/null
- then
-         nmh_cv_attvibug=no
diff --git a/mail-client/nmh/files/nmh-1.1-inc-login.patch b/mail-client/nmh/files/nmh-1.1-inc-login.patch
deleted file mode 100644
index d7c08908bfe0..000000000000
--- a/mail-client/nmh/files/nmh-1.1-inc-login.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- uip/inc.c.orig	2003-10-24 13:17:38.000000000 -0700
-+++ uip/inc.c	2004-07-30 19:33:26.699430580 -0700
-@@ -486,8 +486,7 @@
-      * a POP server?
-      */
-     if (inc_type == INC_POP) {
--	if (user == NULL)
--	    user = getusername ();
-+
- 	if ( strcmp( POPSERVICE, "kpop" ) == 0 ) {
- 	    kpop = 1;
- 	}
-@@ -496,6 +495,12 @@
- 	else
- 	    ruserpass (host, &user, &pass);
- 
-+	/* 
-+	 * Do this _after_ ruserpass, otherwise the login field will be unusable
-+	 */
-+	if (user == NULL)
-+	    user = getusername ();
-+
- 	/*
- 	 * initialize POP connection
- 	 */
diff --git a/mail-client/nmh/files/nmh-1.1-install.patch b/mail-client/nmh/files/nmh-1.1-install.patch
deleted file mode 100644
index 5109a5bda3cb..000000000000
--- a/mail-client/nmh/files/nmh-1.1-install.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -rc nmh.orig/uip/Makefile.in nmh/uip/Makefile.in
-*** nmh.orig/uip/Makefile.in	2003-10-25 05:17:38.000000000 +0900
---- nmh/uip/Makefile.in	2004-05-26 20:05:11.937450072 +0900
-***************
-*** 266,277 ****
-  	rm -f $(bindir)/folders
-  	rm -f $(bindir)/prev
-  	rm -f $(bindir)/next
-! 	rm -f $(libdir)/install-mh
-  	$(LN) $(bindir)/flist  $(bindir)/flists
-  	$(LN) $(bindir)/folder $(bindir)/folders
-  	$(LN) $(bindir)/show   $(bindir)/prev
-  	$(LN) $(bindir)/show   $(bindir)/next
-! 	$(LN) $(bindir)/install-mh   $(libdir)/install-mh
-  
-  # install misc support binaries
-  install-misc:
---- 266,277 ----
-  	rm -f $(bindir)/folders
-  	rm -f $(bindir)/prev
-  	rm -f $(bindir)/next
-! 	if [ "$(libdir)" != "$(bindir)" ]; then rm -f $(libdir)/install-mh; fi
-  	$(LN) $(bindir)/flist  $(bindir)/flists
-  	$(LN) $(bindir)/folder $(bindir)/folders
-  	$(LN) $(bindir)/show   $(bindir)/prev
-  	$(LN) $(bindir)/show   $(bindir)/next
-! 	if [ "$(libdir)" != "$(bindir)" ]; then $(LN) $(bindir)/install-mh   $(libdir)/install-mh; fi
-  
-  # install misc support binaries
-  install-misc:
diff --git a/mail-client/nmh/files/nmh-1.1-m_getfld.patch b/mail-client/nmh/files/nmh-1.1-m_getfld.patch
deleted file mode 100644
index 546274709b9b..000000000000
--- a/mail-client/nmh/files/nmh-1.1-m_getfld.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- sbr/m_getfld.orig.c	2004-07-25 13:18:04.570397179 -0700
-+++ sbr/m_getfld.c	2004-07-25 13:25:36.471839770 -0700
-@@ -730,18 +730,18 @@
- 	register char *ep = pat + patln;
- 	register char pc = *pat++;
- 
--	for(;;) {
--		while (pc != *str++)
--			if (str > es)
--				return 0;
-+	for(;str <= es; str++) {
-+		if (pc != *str)
-+			continue;
- 		if (str > es+1)
- 			return 0;
--		sp = str; pp = pat;
-+		sp = str+1; pp = pat;
- 		while (pp < ep && *sp++ == *pp)
- 			pp++;
- 		if (pp >= ep) 
--			return ((unsigned char *)--str);
-+			return ((unsigned char *)str);
- 	}
-+	return 0;
- }
- 
- 
diff --git a/mail-client/nmh/files/nmh-1.3-inc-login.patch b/mail-client/nmh/files/nmh-1.3-inc-login.patch
deleted file mode 100644
index f1a4f1c513ca..000000000000
--- a/mail-client/nmh/files/nmh-1.3-inc-login.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- nmh-1.3/uip/inc.c.~1~	2007-11-04 03:54:34.000000000 -0800
-+++ nmh-1.3/uip/inc.c	2008-11-28 10:24:03.044265843 -0800
-@@ -496,8 +496,7 @@ main (int argc, char **argv)
-      * a POP server?
-      */
-     if (inc_type == INC_POP) {
--	if (user == NULL)
--	    user = getusername ();
-+
- 	if ( strcmp( POPSERVICE, "kpop" ) == 0 ) {
- 	    kpop = 1;
- 	}
-@@ -506,6 +505,12 @@ main (int argc, char **argv)
- 	else
- 	    ruserpass (host, &user, &pass);
- 
-+	/* 
-+	 * Do this _after_ ruserpass, otherwise the login field will be unusable
-+	 */
-+	if (user == NULL)
-+	    user = getusername ();
-+
- 	/*
- 	 * initialize POP connection
- 	 */
diff --git a/mail-client/nmh/files/nmh-1.3-install.patch b/mail-client/nmh/files/nmh-1.3-install.patch
deleted file mode 100644
index 370455caf71a..000000000000
--- a/mail-client/nmh/files/nmh-1.3-install.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- nmh-1.3/uip/Makefile.in.~1~	2005-12-24 09:17:38.000000000 -0800
-+++ nmh-1.3/uip/Makefile.in	2008-11-28 10:50:48.613075060 -0800
-@@ -267,7 +267,6 @@ install-lcmds:
- 	rm -f $(DESTDIR)$(bindir)/folders
- 	rm -f $(DESTDIR)$(bindir)/prev
- 	rm -f $(DESTDIR)$(bindir)/next
--	rm -f $(DESTDIR)$(libdir)/install-mh
- 	$(LN) $(DESTDIR)$(bindir)/flist  $(DESTDIR)$(bindir)/flists
- 	$(LN) $(DESTDIR)$(bindir)/folder $(DESTDIR)$(bindir)/folders
- 	$(LN) $(DESTDIR)$(bindir)/show   $(DESTDIR)$(bindir)/prev
diff --git a/mail-client/nmh/files/nmh-1.3-m_getfld.patch b/mail-client/nmh/files/nmh-1.3-m_getfld.patch
deleted file mode 100644
index b99f480db74a..000000000000
--- a/mail-client/nmh/files/nmh-1.3-m_getfld.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- nmh-1.3/sbr/m_getfld.c.~1~	2008-04-05 11:41:37.000000000 -0700
-+++ nmh-1.3/sbr/m_getfld.c	2008-11-28 10:25:34.768265994 -0800
-@@ -731,18 +731,18 @@ matchc(int patln, char *pat, int strln, 
- 	register char *ep = pat + patln;
- 	register char pc = *pat++;
- 
--	for(;;) {
--		while (pc != *str++)
--			if (str > es)
--				return 0;
-+	for(;str <= es; str++) {
-+		if (pc != *str)
-+			continue;
- 		if (str > es+1)
- 			return 0;
--		sp = str; pp = pat;
-+		sp = str+1; pp = pat;
- 		while (pp < ep && *sp++ == *pp)
- 			pp++;
- 		if (pp >= ep) 
--			return ((unsigned char *)--str);
-+			return ((unsigned char *)str);
- 	}
-+	return 0;
- }
- 
- 
diff --git a/mail-client/nmh/metadata.xml b/mail-client/nmh/metadata.xml
deleted file mode 100644
index 51f94e3fbe0e..000000000000
--- a/mail-client/nmh/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>net-mail</herd>
-</pkgmetadata>
diff --git a/mail-client/nmh/nmh-1.1-r1.ebuild b/mail-client/nmh/nmh-1.1-r1.ebuild
deleted file mode 100644
index 6975fc9632dc..000000000000
--- a/mail-client/nmh/nmh-1.1-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/nmh/nmh-1.1-r1.ebuild,v 1.7 2009/09/23 17:54:29 patrick Exp $
-
-inherit eutils
-DESCRIPTION="New MH mail reader"
-SRC_URI="http://savannah.nongnu.org/download/nmh/${P}.tar.gz"
-HOMEPAGE="http://www.nongnu.org/nmh/"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="~amd64 ppc sparc x86"
-IUSE=""
-
-DEPEND="=sys-libs/db-1.85*
-	>=sys-libs/ncurses-5.2"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-
-	[ -z "${EDITOR}" ] && export EDITOR="prompter"
-	[ -z "${PAGER}" ] && export PAGER="/usr/bin/more"
-
-	# Patches from bug #22173.
-	epatch ${FILESDIR}/${P}-inc-login.patch || die "epatch failed"
-	epatch ${FILESDIR}/${P}-install.patch || die "epatch failed"
-	# vi test access violation patch
-	epatch ${FILESDIR}/${P}-configure-vitest.patch || die "epatch failed"
-	# bug #57886
-	epatch ${FILESDIR}/${P}-m_getfld.patch || die "epatch failed"
-	# bug #69688
-	epatch ${FILESDIR}/${P}-annotate-fix.patch || die "epatch failed"
-
-	# Redifining libdir to be bindir so the support binaries get installed
-	# correctly.  Since no libraries are installed with nmh, this does not
-	# pose a problem at this time.
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--with-editor=${EDITOR} \
-		--with-pager=${PAGER} \
-		--enable-nmh-pop \
-		--with-locking=lockf \
-		--sysconfdir=/etc/nmh \
-		--libdir=/usr/bin || die
-	make || die
-}
-
-src_install() {
-	make prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		libdir=${D}/usr/bin \
-		etcdir=${D}/etc/nmh install || die
-	dodoc COMPLETION-TCSH COMPLETION-ZSH TODO FAQ DIFFERENCES \
-		MAIL.FILTERING Changelog* COPYRIGHT
-}
diff --git a/mail-client/nmh/nmh-1.3-r1.ebuild b/mail-client/nmh/nmh-1.3-r1.ebuild
deleted file mode 100644
index ee715e003119..000000000000
--- a/mail-client/nmh/nmh-1.3-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/nmh/nmh-1.3-r1.ebuild,v 1.2 2009/09/23 17:54:29 patrick Exp $
-
-inherit eutils
-DESCRIPTION="New MH mail reader"
-SRC_URI="http://savannah.nongnu.org/download/nmh/${P}.tar.gz"
-HOMEPAGE="http://www.nongnu.org/nmh/"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND="|| ( sys-libs/gdbm =sys-libs/db-1.85* )
-	>=sys-libs/ncurses-5.2
-	net-libs/liblockfile"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Patches from bug #22173.
-	epatch "${FILESDIR}"/${P}-inc-login.patch
-	epatch "${FILESDIR}"/${P}-install.patch
-	# bug #57886
-	epatch "${FILESDIR}"/${P}-m_getfld.patch
-}
-
-src_compile() {
-	[ -z "${EDITOR}" ] && export EDITOR="prompter"
-	[ -z "${PAGER}" ] && export PAGER="/usr/bin/more"
-
-	# Redefining libdir to be bindir so the support binaries get installed
-	# correctly.  Since no libraries are installed with nmh, this does not
-	# pose a problem at this time.
-	econf \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--with-editor=${EDITOR} \
-		--with-pager=${PAGER} \
-		--enable-nmh-pop \
-		--sysconfdir=/etc/nmh \
-		--libdir=/usr/bin \
-		|| die
-	emake -j1 || die
-}
-
-src_install() {
-	emake -j1 prefix="${D}"/usr \
-		mandir="${D}"/usr/share/man \
-		libdir="${D}"/usr/bin \
-		etcdir="${D}"/etc/nmh install || die
-	dodoc ChangeLog DATE MACHINES README
-}