version bump, security cleanup

(Portage version: 2.1-r1)
 (Unsigned Manifest commit)

11 files changed, 12 insertions, 980 deletions

diff --git a/mail-mta/sendmail/Manifest b/mail-mta/sendmail/Manifest
index 6fabe2f9f417..d6fae30b485f 100644
--- a/mail-mta/sendmail/Manifest
+++ b/mail-mta/sendmail/Manifest
@@ -34,35 +34,13 @@ AUX site.config.m4 453 RMD160 e23f701fb3c4558eb118745d24c03b348ee9e52a SHA1 2384
 MD5 9f4b4fca4930038c7a6dab0d0e80e5b6 files/site.config.m4 453
 RMD160 e23f701fb3c4558eb118745d24c03b348ee9e52a files/site.config.m4 453
 SHA256 4e1e7ff81ba6b27a8f4169414a26e9073f93132841b651c08b3ac2a258ae89d1 files/site.config.m4 453
-DIST sendmail.8.13.3.tar.gz 1969226
-DIST sendmail.8.13.4.tar.gz 1974606
-DIST sendmail.8.13.5.tar.gz 1978185
 DIST sendmail.8.13.6.tar.gz 1986576 RMD160 cbb0649b5dec8e4b4850c76ad4a132a15335df3b SHA1 6c35f4780bd9fc5f8982977ad699752e2ccb26d0 SHA256 68764cf48a6cdab3786791e3a4b0cd19941a18b083d4c53a362e4026f4c72a7a
 DIST sendmail.8.13.7.tar.gz 2010008 RMD160 a1cab6a7f015bf50c1773a67f35b800c751d55ed SHA1 b70f63f5d577e14794d1a37ef5e825f9127ec996 SHA256 4ed72f2cd43e2ab492c91248319c03e224a272a4d683cfc4c3ee484a79471b22
-EBUILD sendmail-8.13.3.ebuild 5993 RMD160 ba0951b38fa7f6e7aef928e4b8b25a26b7794486 SHA1 845df00063fa12ce8f1ce9c8f546d33b293ce6f1 SHA256 061a4a68054ba4203704ef15b833898e1dc56aba332b3f99147ea55c6261d99f
-MD5 e4c3a51c9f021de8b9ec26ec73c59da6 sendmail-8.13.3.ebuild 5993
-RMD160 ba0951b38fa7f6e7aef928e4b8b25a26b7794486 sendmail-8.13.3.ebuild 5993
-SHA256 061a4a68054ba4203704ef15b833898e1dc56aba332b3f99147ea55c6261d99f sendmail-8.13.3.ebuild 5993
-EBUILD sendmail-8.13.4-r1.ebuild 6289 RMD160 d4785e08a41ea1358774617d67a146ebb22f349e SHA1 b38a563141c93e0607ad282e6c5845cf7037ffbe SHA256 ad37527099f43635b89a2cb02a1755794f836f054cc491e2e44c00f9d5021cd6
-MD5 ef6487d3a1283e49903a312338dda797 sendmail-8.13.4-r1.ebuild 6289
-RMD160 d4785e08a41ea1358774617d67a146ebb22f349e sendmail-8.13.4-r1.ebuild 6289
-SHA256 ad37527099f43635b89a2cb02a1755794f836f054cc491e2e44c00f9d5021cd6 sendmail-8.13.4-r1.ebuild 6289
-EBUILD sendmail-8.13.4.ebuild 5847 RMD160 33a0d038ceede922d1d2b037e18f90ad9855905c SHA1 efe0fff11813e0392d7d65a14a845c5b01d0279d SHA256 a77a5d5c23e73c90ac511ea70efc38f8cce7ec3b2136bdf14512911eceb37efb
-MD5 615c6258bab2b8a5728ec91293c8a1a8 sendmail-8.13.4.ebuild 5847
-RMD160 33a0d038ceede922d1d2b037e18f90ad9855905c sendmail-8.13.4.ebuild 5847
-SHA256 a77a5d5c23e73c90ac511ea70efc38f8cce7ec3b2136bdf14512911eceb37efb sendmail-8.13.4.ebuild 5847
-EBUILD sendmail-8.13.5.ebuild 6286 RMD160 40717d9fce99b8c7993e7fc0d838e816310644f1 SHA1 60da3cb9b0e87281f32b673877585da2bb1c6aa5 SHA256 df01f64b876e533e6e5c0598f2618cdc586882c738ced485373f25b4cbb84d03
-MD5 797c3e84ad380ef586e1fa0eb53772c6 sendmail-8.13.5.ebuild 6286
-RMD160 40717d9fce99b8c7993e7fc0d838e816310644f1 sendmail-8.13.5.ebuild 6286
-SHA256 df01f64b876e533e6e5c0598f2618cdc586882c738ced485373f25b4cbb84d03 sendmail-8.13.5.ebuild 6286
+DIST sendmail.8.13.8.tar.gz 2010975 RMD160 a5d333b073d681f056421e836df4067f331a8ac8 SHA1 8e97c10f52efe5204c08f6cb3f90c08e077ac505 SHA256 48262059aec2d2f1cbbb45dcd4eaf5eb3ba02bc29ebc25c15ae2e04b606f0123
 EBUILD sendmail-8.13.6-r1.ebuild 6660 RMD160 542ce103a525eb2a7e5954ae403eb072034fe9c7 SHA1 b5b81ca84543b32b2307659ecf9fa813b0d62aea SHA256 34f86d8f5898f13c357fd72817452301c0dfbc2826839a25ee22d86a3e50e4f3
 MD5 a278d20a10b531150f18a1d58895eb75 sendmail-8.13.6-r1.ebuild 6660
 RMD160 542ce103a525eb2a7e5954ae403eb072034fe9c7 sendmail-8.13.6-r1.ebuild 6660
 SHA256 34f86d8f5898f13c357fd72817452301c0dfbc2826839a25ee22d86a3e50e4f3 sendmail-8.13.6-r1.ebuild 6660
-EBUILD sendmail-8.13.6.ebuild 6601 RMD160 d8589ba092c57df7c260e0f0520f149fb32b4e2b SHA1 bac96d6b227aeba2d2a52798ccd36bea155ba31b SHA256 7e3823b658d15c94a003bf982b2fd0b17e278db85cf8019ffd5c790db197f1e1
-MD5 bbfec85d419149f779a161b5d68b7ef1 sendmail-8.13.6.ebuild 6601
-RMD160 d8589ba092c57df7c260e0f0520f149fb32b4e2b sendmail-8.13.6.ebuild 6601
-SHA256 7e3823b658d15c94a003bf982b2fd0b17e278db85cf8019ffd5c790db197f1e1 sendmail-8.13.6.ebuild 6601
 EBUILD sendmail-8.13.7-r1.ebuild 6709 RMD160 6d7529ad3bec17e6274794e49429d89723a96759 SHA1 62f2dc5823164e982b7894a70e9cc9d0f0458b0e SHA256 6b122d78a3d2f264a2d6c9bcf9f90dbccf21e7ccbde57b0e92708ffd1783759f
 MD5 8fb9091a4662f319493665ae10f84bfb sendmail-8.13.7-r1.ebuild 6709
 RMD160 6d7529ad3bec17e6274794e49429d89723a96759 sendmail-8.13.7-r1.ebuild 6709
@@ -71,29 +49,18 @@ EBUILD sendmail-8.13.7.ebuild 6614 RMD160 ec97a527ed443c79af9dd903bbfb4c981c3183
 MD5 4dde3cf607bc3696e9ae0f1556362109 sendmail-8.13.7.ebuild 6614
 RMD160 ec97a527ed443c79af9dd903bbfb4c981c3183dc sendmail-8.13.7.ebuild 6614
 SHA256 729e63389f1604872361c750ba68d9d93da621dc2fb35cb49890b8b76ee1c410 sendmail-8.13.7.ebuild 6614
-MISC ChangeLog 15179 RMD160 1cc9bd41da1729c177c4e4f468f92ac7a403e45f SHA1 269f524c2182af677d7f68f5a452db7dc1f57615 SHA256 d2c578e4be7886da38b0e19a291522e87392a94354bd305cfd6620f3c0590dce
-MD5 6b8d6d1ec5f9db3249b7563111dfd305 ChangeLog 15179
-RMD160 1cc9bd41da1729c177c4e4f468f92ac7a403e45f ChangeLog 15179
-SHA256 d2c578e4be7886da38b0e19a291522e87392a94354bd305cfd6620f3c0590dce ChangeLog 15179
+EBUILD sendmail-8.13.8.ebuild 6722 RMD160 300518beb21e2e6afce6a209b84e45947fd5ad0e SHA1 33ce3a7a05596c083d8045165dda5b69c31f6ee5 SHA256 f9c296b78376ef020d1e6dee9de135775ee075df1e01c24f0aa10e5e27ebf574
+MD5 78a4568502f92ad1d81768de7d721d78 sendmail-8.13.8.ebuild 6722
+RMD160 300518beb21e2e6afce6a209b84e45947fd5ad0e sendmail-8.13.8.ebuild 6722
+SHA256 f9c296b78376ef020d1e6dee9de135775ee075df1e01c24f0aa10e5e27ebf574 sendmail-8.13.8.ebuild 6722
+MISC ChangeLog 15496 RMD160 e6c6ed21154138a75e5de566f159a4d493f77776 SHA1 2ef892495ef10ee5a3bc8b387dc474ff21526bc5 SHA256 a11aa9d920997e6a7d3b5440f62c6bec2d1449a69e0e09adabb4e30e7b5a48df
+MD5 af5b4202b9fc4ee165d612351bd1a831 ChangeLog 15496
+RMD160 e6c6ed21154138a75e5de566f159a4d493f77776 ChangeLog 15496
+SHA256 a11aa9d920997e6a7d3b5440f62c6bec2d1449a69e0e09adabb4e30e7b5a48df ChangeLog 15496
 MISC metadata.xml 218 RMD160 56a3cc3c6e7bbdc7bcc9c61d70e0c9ecf5a8a7d3 SHA1 0176679ca2ab027b2cf9906dfa76b1fabc3c9795 SHA256 4b38e4e3b2a62cc22bf1ffbedbdf4ff94eab88fb7e116a0b7fc8fc20872d4fac
 MD5 6d7255cf075f705e7706d7f7c2fc4a53 metadata.xml 218
 RMD160 56a3cc3c6e7bbdc7bcc9c61d70e0c9ecf5a8a7d3 metadata.xml 218
 SHA256 4b38e4e3b2a62cc22bf1ffbedbdf4ff94eab88fb7e116a0b7fc8fc20872d4fac metadata.xml 218
-MD5 45c504b2c249bc5724f0029328d56b78 files/digest-sendmail-8.13.3 68
-RMD160 c4445cbf69d759812914b82e6f7e84d386f5cebe files/digest-sendmail-8.13.3 68
-SHA256 8c9c572d731b46673e125a12e3196f9cd300b45e6ab4e0b88c4da84ddb920cd2 files/digest-sendmail-8.13.3 68
-MD5 470e80bc008f602eb5fcc165f9e3546b files/digest-sendmail-8.13.4 68
-RMD160 e8ba510e4fa5a18b3e4b642128e6e840beaf7dfe files/digest-sendmail-8.13.4 68
-SHA256 f3780ebee3bb60abb78aceade2c3a921ac07d84b9c002e7ffc8febdfe0671219 files/digest-sendmail-8.13.4 68
-MD5 470e80bc008f602eb5fcc165f9e3546b files/digest-sendmail-8.13.4-r1 68
-RMD160 e8ba510e4fa5a18b3e4b642128e6e840beaf7dfe files/digest-sendmail-8.13.4-r1 68
-SHA256 f3780ebee3bb60abb78aceade2c3a921ac07d84b9c002e7ffc8febdfe0671219 files/digest-sendmail-8.13.4-r1 68
-MD5 547c158de3942168b8e90f37531675a1 files/digest-sendmail-8.13.5 68
-RMD160 262db725e65cfc854130e2e30d472682e733fa79 files/digest-sendmail-8.13.5 68
-SHA256 7e0020c244c5b7bae3c11c714c7364f06e0cbfcbc7e7c8bf106648531b15cdc3 files/digest-sendmail-8.13.5 68
-MD5 dd902c6e491a05495922109e31335a9d files/digest-sendmail-8.13.6 250
-RMD160 1254e9694df37b8640fd16b66d6c0a01a2ec3a86 files/digest-sendmail-8.13.6 250
-SHA256 574cec2243c264f399c427f71690f0a2cd1f9d65295937f419757883cd32dac9 files/digest-sendmail-8.13.6 250
 MD5 dd902c6e491a05495922109e31335a9d files/digest-sendmail-8.13.6-r1 250
 RMD160 1254e9694df37b8640fd16b66d6c0a01a2ec3a86 files/digest-sendmail-8.13.6-r1 250
 SHA256 574cec2243c264f399c427f71690f0a2cd1f9d65295937f419757883cd32dac9 files/digest-sendmail-8.13.6-r1 250
@@ -103,3 +70,6 @@ SHA256 767e12e7918562da5c2723cf5d73bf33f228ec5c6b0a2abb1815abd67a2fb056 files/di
 MD5 e79bb4d5f23a9704b6e527a2eb671bf1 files/digest-sendmail-8.13.7-r1 250
 RMD160 de17235ed0bfd6d1c8c1bcbb14f5737f64dacf79 files/digest-sendmail-8.13.7-r1 250
 SHA256 767e12e7918562da5c2723cf5d73bf33f228ec5c6b0a2abb1815abd67a2fb056 files/digest-sendmail-8.13.7-r1 250
+MD5 5ecb98b34c459a47326f65ed5d52b408 files/digest-sendmail-8.13.8 250
+RMD160 778a2ba64fda60d5d0d75e440f93b7fa1f1f374d files/digest-sendmail-8.13.8 250
+SHA256 658c5ae34146187a524a95a877c54f87a9937bf64f39e90959f5484d04c6c237 files/digest-sendmail-8.13.8 250
diff --git a/mail-mta/sendmail/files/digest-sendmail-8.13.3 b/mail-mta/sendmail/files/digest-sendmail-8.13.3
deleted file mode 100644
index 58795fed825f..000000000000
--- a/mail-mta/sendmail/files/digest-sendmail-8.13.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2809fbf9c8b067947b650d0128928d05 sendmail.8.13.3.tar.gz 1969226
diff --git a/mail-mta/sendmail/files/digest-sendmail-8.13.4 b/mail-mta/sendmail/files/digest-sendmail-8.13.4
deleted file mode 100644
index 517a9b0b4e1a..000000000000
--- a/mail-mta/sendmail/files/digest-sendmail-8.13.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 61e336750b48b01abaa69b4d7c9473b5 sendmail.8.13.4.tar.gz 1974606
diff --git a/mail-mta/sendmail/files/digest-sendmail-8.13.4-r1 b/mail-mta/sendmail/files/digest-sendmail-8.13.4-r1
deleted file mode 100644
index 517a9b0b4e1a..000000000000
--- a/mail-mta/sendmail/files/digest-sendmail-8.13.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 61e336750b48b01abaa69b4d7c9473b5 sendmail.8.13.4.tar.gz 1974606
diff --git a/mail-mta/sendmail/files/digest-sendmail-8.13.5 b/mail-mta/sendmail/files/digest-sendmail-8.13.5
deleted file mode 100644
index 667f5ac54728..000000000000
--- a/mail-mta/sendmail/files/digest-sendmail-8.13.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f4550d8dcc55771f4a81e999c7d6df20 sendmail.8.13.5.tar.gz 1978185
diff --git a/mail-mta/sendmail/files/digest-sendmail-8.13.6 b/mail-mta/sendmail/files/digest-sendmail-8.13.6
deleted file mode 100644
index 87a3e00f6a5d..000000000000
--- a/mail-mta/sendmail/files/digest-sendmail-8.13.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 484cca51f74b5e562b3cf119ceb2f900 sendmail.8.13.6.tar.gz 1986576
-RMD160 cbb0649b5dec8e4b4850c76ad4a132a15335df3b sendmail.8.13.6.tar.gz 1986576
-SHA256 68764cf48a6cdab3786791e3a4b0cd19941a18b083d4c53a362e4026f4c72a7a sendmail.8.13.6.tar.gz 1986576
diff --git a/mail-mta/sendmail/sendmail-8.13.3.ebuild b/mail-mta/sendmail/sendmail-8.13.3.ebuild
deleted file mode 100644
index 65bb2518b1ec..000000000000
--- a/mail-mta/sendmail/sendmail-8.13.3.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.13.3.ebuild,v 1.11 2005/08/24 08:16:52 lcars Exp $
-
-inherit eutils
-
-DESCRIPTION="Widely-used Mail Transport Agent (MTA)"
-HOMEPAGE="http://www.sendmail.org/"
-SRC_URI="ftp://ftp.sendmail.org/pub/${PN}/${PN}.${PV}.tar.gz"
-
-LICENSE="Sendmail"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 s390 sparc x86"
-IUSE="ssl ldap sasl tcpd mbox milter mailwrapper ipv6"
-
-DEPEND="net-mail/mailbase
-	sys-devel/m4
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.10 )
-	tcpd? ( sys-apps/tcp-wrappers )
-	ssl? ( dev-libs/openssl )
-	ldap? ( net-nds/openldap )
-	>=sys-libs/db-3.2
-	!net-mail/vacation
-	"
-RDEPEND="${DEPEND}
-		>=net-mail/mailbase-0.00
-		!mailwrapper? ( !virtual/mta )
-		mailwrapper? ( >=net-mail/mailwrapper-0.2 )"
-PDEPEND="!mbox? ( mail-filter/procmail )"
-PROVIDE="virtual/mta"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/sendmail-delivered_hdr.patch || die
-
-	confCCOPTS="${CFLAGS}"
-	confMAPDEF="-DMAP_REGEX"
-	conf_sendmail_LIBS=""
-	use sasl && confLIBS="${confLIBS} -lsasl2"  \
-		&& confENVDEF="${confENVDEF} -DSASL=2" \
-		&& confCCOPTS="${confCCOPTS} -I/usr/include/sasl" \
-		&& conf_sendmail_LIBS="${conf_sendmail_LIBS} -lsasl2"
-	use tcpd && confENVDEF="${confENVDEF} -DTCPWRAPPERS" \
-		&& confLIBS="${confLIBS} -lwrap"
-	use ssl && confENVDEF="${confENVDEF} -DSTARTTLS -D_FFR_DEAL_WITH_ERROR_SSL" \
-		&& confLIBS="${confLIBS} -lssl -lcrypto" \
-		&& conf_sendmail_LIBS="${conf_sendmail_LIBS} -lssl -lcrypto"
-	use ldap && confMAPDEF="${confMAPDEF} -DLDAPMAP" \
-		&& confLIBS="${confLIBS} -lldap -llber"
-	use milter && confENVDEF="${confENVDEF} -DMILTER"
-	use ipv6 && confENVDEF="${confENVDEF} -DNETINET6"
-	sed -e "s:@@confCCOPTS@@:${confCCOPTS}:" \
-		-e "s/@@confMAPDEF@@/${confMAPDEF}/" \
-		-e "s/@@confENVDEF@@/${confENVDEF}/" \
-		-e "s/@@confLIBS@@/${confLIBS}/" \
-		-e "s/@@conf_sendmail_LIBS@@/${conf_sendmail_LIBS}/" \
-		${FILESDIR}/site.config.m4 > ${S}/devtools/Site/site.config.m4
-}
-
-src_compile() {
-	sh Build || die "compilation failed in main Build script"
-
-	if use milter
-	then
-	    pushd libmilter
-		sh Build || die "libmilter compilation failed"
-		popd
-	fi
-}
-
-src_install () {
-	OBJDIR="obj.`uname -s`.`uname -r`.`arch`"
-	dodir /etc/pam.d /usr/bin /usr/lib
-	dodir /usr/share/man/man{1,5,8} /usr/sbin /var/log /usr/share/sendmail-cf
-	dodir /var/spool/{mqueue,clientmqueue} /etc/conf.d
-	keepdir /var/spool/{clientmqueue,mqueue}
-	for dir in libsmutil sendmail mailstats praliases smrsh makemap vacation editmap
-	do
-		make DESTDIR=${D} MANROOT=/usr/share/man/man \
-			SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
-			MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
-			LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
-			MSPQOWN=root CFOWN=root CFGRP=root \
-			install -C ${OBJDIR}/${dir} \
-			|| die "install failed"
-	done
-	for dir in rmail mail.local
-	do
-		make DESTDIR=${D} MANROOT=/usr/share/man/man \
-			SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
-			MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
-			LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
-			MSPQOWN=root CFOWN=root CFGRP=root \
-			force-install -C ${OBJDIR}/${dir} \
-			|| die "install failed"
-	done
-
-	if use milter
-	then
-	    dodir /usr/include/libmilter
-		make DESTDIR=${D} MANROOT=/usr/share/man/man \
-			SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
-			MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
-			LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
-			MSPQOWN=root CFOWN=root CFGRP=root \
-			install -C ${OBJDIR}/libmilter \
-			|| die "install failed"
-	fi
-
-	fowners root:smmsp /usr/sbin/sendmail
-	fperms 2555 /usr/sbin/sendmail
-	fowners smmsp:smmsp /var/spool/clientmqueue
-	fperms 770 /var/spool/clientmqueue
-	fperms 700 /var/spool/mqueue
-	dosym /usr/sbin/sendmail /usr/lib/sendmail
-	dosym /usr/sbin/makemap /usr/bin/makemap
-	dodoc FAQ LICENSE KNOWNBUGS README RELEASE_NOTES doc/op/op.ps
-	newdoc sendmail/README README.sendmail
-	newdoc sendmail/SECURITY SECURITY
-	newdoc sendmail/TUNING TUNING
-	newdoc smrsh/README README.smrsh
-
-	if use milter
-	then
-		newdoc libmilter/README README.libmilter
-	fi
-
-	newdoc cf/README README.cf
-	newdoc cf/cf/README README.install-cf
-	cp -pPR cf/* ${D}/usr/share/sendmail-cf
-	insinto /etc/mail
-	if use mbox
-	then
-		doins ${FILESDIR}/sendmail.mc
-	else
-		newins ${FILESDIR}/sendmail-procmail.mc sendmail.mc
-	fi
-	m4 ${D}/usr/share/sendmail-cf/m4/cf.m4 ${D}/etc/mail/sendmail.mc \
-		> ${D}/etc/mail/sendmail.cf
-	echo "# local-host-names - include all aliases for your machine here" \
-		> ${D}/etc/mail/local-host-names
-	cat <<- EOF > ${D}/etc/mail/trusted-users
-		# trusted-users - users that can send mail as others without a warning
-		# apache, mailman, majordomo, uucp are good candidates
-	EOF
-	cat <<- EOF > ${D}/etc/mail/access
-		# Check the /usr/share/doc/sendmail/README.cf file for a description
-		# of the format of this file. (search for access_db in that file)
-		# The /usr/share/doc/sendmail/README.cf is part of the sendmail-doc
-		# package.
-		#
-
-	EOF
-	cat <<- EOF > ${D}/etc/conf.d/sendmail
-		# Config file for /etc/init.d/sendmail
-		# add start-up options here
-		SENDMAIL_OPTS="-bd -q30m -L sm-mta" # default daemon mode
-		CLIENTMQUEUE_OPTS="-Ac -q30m -L sm-cm" # clientmqueue
-		KILL_OPTS="" # add -9/-15/your favorite evil SIG level here
-
-	EOF
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/sendmail
-	keepdir /usr/adm/sm.bin
-
-	if use mailwrapper
-	then
-		mv ${D}/usr/sbin/sendmail ${D}/usr/sbin/sendmail.sendmail
-		insinto /etc/mail
-		doins ${FILESDIR}/mailer.conf
-		dosed 's/} sendmail/} sendmail.sendmail/' /etc/init.d/sendmail
-	fi
-
-}
-
-pkg_preinst() {
-	if ! groupmod smmsp; then
-		groupadd smmsp || die "problem adding group smmsp"
-	fi
-}
-
-pkg_postinst() {
-	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
-	then
-		einfo
-		einfo "Since you emerged sendmail without mailwrapper in USE,"
-		einfo "you probably want to 'emerge -C mailwrapper' now."
-		einfo
-	fi
-}
diff --git a/mail-mta/sendmail/sendmail-8.13.4-r1.ebuild b/mail-mta/sendmail/sendmail-8.13.4-r1.ebuild
deleted file mode 100644
index 1f0f74292012..000000000000
--- a/mail-mta/sendmail/sendmail-8.13.4-r1.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.13.4-r1.ebuild,v 1.7 2005/08/24 08:16:52 lcars Exp $
-
-inherit eutils mailer
-
-DESCRIPTION="Widely-used Mail Transport Agent (MTA)"
-HOMEPAGE="http://www.sendmail.org/"
-SRC_URI="ftp://ftp.sendmail.org/pub/${PN}/${PN}.${PV}.tar.gz"
-
-LICENSE="Sendmail"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha ~ia64 ~s390 ~amd64 ~ppc64"
-IUSE="ssl ldap sasl tcpd mbox mailwrapper ipv6"
-
-DEPEND="net-mail/mailbase
-	sys-devel/m4
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.10 )
-	tcpd? ( sys-apps/tcp-wrappers )
-	ssl? ( dev-libs/openssl )
-	ldap? ( net-nds/openldap )
-	>=sys-libs/db-3.2
-	!net-mail/vacation
-	"
-RDEPEND="${DEPEND}
-		>=net-mail/mailbase-0.00"
-PDEPEND="!mbox? ( mail-filter/procmail )"
-PROVIDE="virtual/mta"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/sendmail-delivered_hdr.patch || die
-
-	confCCOPTS="${CFLAGS}"
-	confMAPDEF="-DMAP_REGEX"
-	conf_sendmail_LIBS=""
-	use sasl && confLIBS="${confLIBS} -lsasl2"  \
-		&& confENVDEF="${confENVDEF} -DSASL=2" \
-		&& confCCOPTS="${confCCOPTS} -I/usr/include/sasl" \
-		&& conf_sendmail_LIBS="${conf_sendmail_LIBS} -lsasl2"
-	use tcpd && confENVDEF="${confENVDEF} -DTCPWRAPPERS" \
-		&& confLIBS="${confLIBS} -lwrap"
-	use ssl && confENVDEF="${confENVDEF} -DSTARTTLS -D_FFR_DEAL_WITH_ERROR_SSL" \
-		&& confLIBS="${confLIBS} -lssl -lcrypto" \
-		&& conf_sendmail_LIBS="${conf_sendmail_LIBS} -lssl -lcrypto"
-	use ldap && confMAPDEF="${confMAPDEF} -DLDAPMAP" \
-		&& confLIBS="${confLIBS} -lldap -llber"
-	use ipv6 && confENVDEF="${confENVDEF} -DNETINET6"
-	sed -e "s:@@confCCOPTS@@:${confCCOPTS}:" \
-		-e "s/@@confMAPDEF@@/${confMAPDEF}/" \
-		-e "s/@@confENVDEF@@/${confENVDEF}/" \
-		-e "s/@@confLIBS@@/${confLIBS}/" \
-		-e "s/@@conf_sendmail_LIBS@@/${conf_sendmail_LIBS}/" \
-		${FILESDIR}/site.config.m4 > ${S}/devtools/Site/site.config.m4
-}
-
-src_compile() {
-	sh Build || die "compilation failed in main Build script"
-	pushd libmilter
-	sh Build || die "libmilter compilation failed"
-	popd
-}
-
-src_install () {
-	OBJDIR="obj.`uname -s`.`uname -r`.`arch`"
-	dodir /usr/bin /usr/lib
-	dodir /usr/share/man/man{1,5,8} /usr/sbin /var/log /usr/share/sendmail-cf
-	dodir /var/spool/{mqueue,clientmqueue} /etc/conf.d
-	keepdir /var/spool/{clientmqueue,mqueue}
-	for dir in libsmutil sendmail mailstats praliases smrsh makemap vacation editmap
-	do
-		make DESTDIR=${D} MANROOT=/usr/share/man/man \
-			SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
-			MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
-			LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
-			MSPQOWN=root CFOWN=root CFGRP=root \
-			install -C ${OBJDIR}/${dir} \
-			|| die "install failed"
-	done
-	for dir in rmail mail.local
-	do
-		make DESTDIR=${D} MANROOT=/usr/share/man/man \
-			SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
-			MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
-			LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
-			MSPQOWN=root CFOWN=root CFGRP=root \
-			force-install -C ${OBJDIR}/${dir} \
-			|| die "install failed"
-	done
-
-	dodir /usr/include/libmilter
-		make DESTDIR=${D} MANROOT=/usr/share/man/man \
-			SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
-			MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
-			LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
-			MSPQOWN=root CFOWN=root CFGRP=root \
-			install -C ${OBJDIR}/libmilter \
-			|| die "install failed"
-
-	fowners root:smmsp /usr/sbin/sendmail
-	fperms 2555 /usr/sbin/sendmail
-	fowners smmsp:smmsp /var/spool/clientmqueue
-	fperms 770 /var/spool/clientmqueue
-	fperms 700 /var/spool/mqueue
-	dosym /usr/sbin/makemap /usr/bin/makemap
-	dodoc FAQ LICENSE KNOWNBUGS README RELEASE_NOTES doc/op/op.ps
-	newdoc sendmail/README README.sendmail
-	newdoc sendmail/SECURITY SECURITY
-	newdoc sendmail/TUNING TUNING
-	newdoc smrsh/README README.smrsh
-	newdoc libmilter/README README.libmilter
-
-	newdoc cf/README README.cf
-	newdoc cf/cf/README README.install-cf
-	cp -pPR cf/* ${D}/usr/share/sendmail-cf
-	insinto /etc/mail
-	if use mbox
-	then
-		doins ${FILESDIR}/sendmail.mc
-	else
-		newins ${FILESDIR}/sendmail-procmail.mc sendmail.mc
-	fi
-	m4 ${D}/usr/share/sendmail-cf/m4/cf.m4 ${D}/etc/mail/sendmail.mc \
-		> ${D}/etc/mail/sendmail.cf
-	echo "include(\`/usr/share/sendmail-cf/m4/cf.m4')dnl" \
-		> ${D}/etc/mail/submit.mc
-	cat ${D}/usr/share/sendmail-cf/cf/submit.mc >> ${D}/etc/mail/submit.mc
-	echo "# local-host-names - include all aliases for your machine here" \
-		> ${D}/etc/mail/local-host-names
-	cat <<- EOF > ${D}/etc/mail/trusted-users
-		# trusted-users - users that can send mail as others without a warning
-		# apache, mailman, majordomo, uucp are good candidates
-	EOF
-	cat <<- EOF > ${D}/etc/mail/access
-		# Check the /usr/share/doc/sendmail/README.cf file for a description
-		# of the format of this file. (search for access_db in that file)
-		# The /usr/share/doc/sendmail/README.cf is part of the sendmail-doc
-		# package.
-		#
-
-	EOF
-	cat <<- EOF > ${D}/etc/conf.d/sendmail
-		# Config file for /etc/init.d/sendmail
-		# add start-up options here
-		SENDMAIL_OPTS="-bd -q30m -L sm-mta" # default daemon mode
-		CLIENTMQUEUE_OPTS="-Ac -q30m -L sm-cm" # clientmqueue
-		KILL_OPTS="" # add -9/-15/your favorite evil SIG level here
-
-	EOF
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/sendmail
-	keepdir /usr/adm/sm.bin
-
-	if use mailwrapper
-	then
-		mv ${D}/usr/sbin/sendmail ${D}/usr/sbin/sendmail.sendmail
-		rm ${D}/usr/bin/mailq
-		rm ${D}/usr/bin/newaliases
-		mv ${D}/usr/share/man/man8/sendmail.8 \
-			${D}/usr/share/man/man8/sendmail-sendmail.8
-		mv ${D}/usr/share/man/man1/mailq.1 \
-			${D}/usr/share/man/man1/mailq-sendmail.1
-		mv ${D}/usr/share/man/man1/newaliases.1 \
-			${D}/usr/share/man/man1/newaliases-sendmail.1
-		mv ${D}/usr/share/man/man5/aliases.5 \
-			${D}/usr/share/man/man5/aliases-sendmail.5
-		dosed 's/} sendmail/} sendmail.sendmail/' /etc/init.d/sendmail
-		dosed 's/sbin\/sendmail/sbin\/sendmail.sendmail/' /etc/init.d/sendmail
-		mailer_install_conf
-	fi
-
-}
-
-pkg_setup() {
-	einfo "checking for smmsp group...    create if missing."
-	enewgroup smmsp 209 || die "problem adding group smmsp"
-	einfo "checking for smmsp user...     create if missing."
-	enewuser smmsp 209 -1 /var/spool/mqueue smmsp \
-		|| die "problem adding user smmsp"
-}
diff --git a/mail-mta/sendmail/sendmail-8.13.4.ebuild b/mail-mta/sendmail/sendmail-8.13.4.ebuild
deleted file mode 100644
index 652911760185..000000000000
--- a/mail-mta/sendmail/sendmail-8.13.4.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.13.4.ebuild,v 1.11 2005/08/24 08:16:52 lcars Exp $
-
-inherit eutils
-
-DESCRIPTION="Widely-used Mail Transport Agent (MTA)"
-HOMEPAGE="http://www.sendmail.org/"
-SRC_URI="ftp://ftp.sendmail.org/pub/${PN}/${PN}.${PV}.tar.gz"
-
-LICENSE="Sendmail"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 s390 sparc x86"
-IUSE="ssl ldap sasl tcpd mbox mailwrapper ipv6"
-
-DEPEND="net-mail/mailbase
-	sys-devel/m4
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.10 )
-	tcpd? ( sys-apps/tcp-wrappers )
-	ssl? ( dev-libs/openssl )
-	ldap? ( net-nds/openldap )
-	>=sys-libs/db-3.2
-	!net-mail/vacation
-	"
-RDEPEND="${DEPEND}
-		>=net-mail/mailbase-0.00
-		!mailwrapper? ( !virtual/mta )
-		mailwrapper? ( >=net-mail/mailwrapper-0.2 )"
-PDEPEND="!mbox? ( mail-filter/procmail )"
-PROVIDE="virtual/mta"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/sendmail-delivered_hdr.patch || die
-
-	confCCOPTS="${CFLAGS}"
-	confMAPDEF="-DMAP_REGEX"
-	conf_sendmail_LIBS=""
-	use sasl && confLIBS="${confLIBS} -lsasl2"  \
-		&& confENVDEF="${confENVDEF} -DSASL=2" \
-		&& confCCOPTS="${confCCOPTS} -I/usr/include/sasl" \
-		&& conf_sendmail_LIBS="${conf_sendmail_LIBS} -lsasl2"
-	use tcpd && confENVDEF="${confENVDEF} -DTCPWRAPPERS" \
-		&& confLIBS="${confLIBS} -lwrap"
-	use ssl && confENVDEF="${confENVDEF} -DSTARTTLS -D_FFR_DEAL_WITH_ERROR_SSL" \
-		&& confLIBS="${confLIBS} -lssl -lcrypto" \
-		&& conf_sendmail_LIBS="${conf_sendmail_LIBS} -lssl -lcrypto"
-	use ldap && confMAPDEF="${confMAPDEF} -DLDAPMAP" \
-		&& confLIBS="${confLIBS} -lldap -llber"
-	use ipv6 && confENVDEF="${confENVDEF} -DNETINET6"
-	sed -e "s:@@confCCOPTS@@:${confCCOPTS}:" \
-		-e "s/@@confMAPDEF@@/${confMAPDEF}/" \
-		-e "s/@@confENVDEF@@/${confENVDEF}/" \
-		-e "s/@@confLIBS@@/${confLIBS}/" \
-		-e "s/@@conf_sendmail_LIBS@@/${conf_sendmail_LIBS}/" \
-		${FILESDIR}/site.config.m4 > ${S}/devtools/Site/site.config.m4
-}
-
-src_compile() {
-	sh Build || die "compilation failed in main Build script"
-	pushd libmilter
-	sh Build || die "libmilter compilation failed"
-	popd
-}
-
-src_install () {
-	OBJDIR="obj.`uname -s`.`uname -r`.`arch`"
-	dodir /etc/pam.d /usr/bin /usr/lib
-	dodir /usr/share/man/man{1,5,8} /usr/sbin /var/log /usr/share/sendmail-cf
-	dodir /var/spool/{mqueue,clientmqueue} /etc/conf.d
-	keepdir /var/spool/{clientmqueue,mqueue}
-	for dir in libsmutil sendmail mailstats praliases smrsh makemap vacation editmap
-	do
-		make DESTDIR=${D} MANROOT=/usr/share/man/man \
-			SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
-			MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
-			LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
-			MSPQOWN=root CFOWN=root CFGRP=root \
-			install -C ${OBJDIR}/${dir} \
-			|| die "install failed"
-	done
-	for dir in rmail mail.local
-	do
-		make DESTDIR=${D} MANROOT=/usr/share/man/man \
-			SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
-			MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
-			LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
-			MSPQOWN=root CFOWN=root CFGRP=root \
-			force-install -C ${OBJDIR}/${dir} \
-			|| die "install failed"
-	done
-
-	dodir /usr/include/libmilter
-		make DESTDIR=${D} MANROOT=/usr/share/man/man \
-			SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
-			MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
-			LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
-			MSPQOWN=root CFOWN=root CFGRP=root \
-			install -C ${OBJDIR}/libmilter \
-			|| die "install failed"
-
-	fowners root:smmsp /usr/sbin/sendmail
-	fperms 2555 /usr/sbin/sendmail
-	fowners smmsp:smmsp /var/spool/clientmqueue
-	fperms 770 /var/spool/clientmqueue
-	fperms 700 /var/spool/mqueue
-	dosym /usr/sbin/sendmail /usr/lib/sendmail
-	dosym /usr/sbin/makemap /usr/bin/makemap
-	dodoc FAQ LICENSE KNOWNBUGS README RELEASE_NOTES doc/op/op.ps
-	newdoc sendmail/README README.sendmail
-	newdoc sendmail/SECURITY SECURITY
-	newdoc sendmail/TUNING TUNING
-	newdoc smrsh/README README.smrsh
-	newdoc libmilter/README README.libmilter
-
-	newdoc cf/README README.cf
-	newdoc cf/cf/README README.install-cf
-	cp -pPR cf/* ${D}/usr/share/sendmail-cf
-	insinto /etc/mail
-	if use mbox
-	then
-		doins ${FILESDIR}/sendmail.mc
-	else
-		newins ${FILESDIR}/sendmail-procmail.mc sendmail.mc
-	fi
-	m4 ${D}/usr/share/sendmail-cf/m4/cf.m4 ${D}/etc/mail/sendmail.mc \
-		> ${D}/etc/mail/sendmail.cf
-	echo "# local-host-names - include all aliases for your machine here" \
-		> ${D}/etc/mail/local-host-names
-	cat <<- EOF > ${D}/etc/mail/trusted-users
-		# trusted-users - users that can send mail as others without a warning
-		# apache, mailman, majordomo, uucp are good candidates
-	EOF
-	cat <<- EOF > ${D}/etc/mail/access
-		# Check the /usr/share/doc/sendmail/README.cf file for a description
-		# of the format of this file. (search for access_db in that file)
-		# The /usr/share/doc/sendmail/README.cf is part of the sendmail-doc
-		# package.
-		#
-
-	EOF
-	cat <<- EOF > ${D}/etc/conf.d/sendmail
-		# Config file for /etc/init.d/sendmail
-		# add start-up options here
-		SENDMAIL_OPTS="-bd -q30m -L sm-mta" # default daemon mode
-		CLIENTMQUEUE_OPTS="-Ac -q30m -L sm-cm" # clientmqueue
-		KILL_OPTS="" # add -9/-15/your favorite evil SIG level here
-
-	EOF
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/sendmail
-	keepdir /usr/adm/sm.bin
-
-	if use mailwrapper
-	then
-		mv ${D}/usr/sbin/sendmail ${D}/usr/sbin/sendmail.sendmail
-		insinto /etc/mail
-		doins ${FILESDIR}/mailer.conf
-		dosed 's/} sendmail/} sendmail.sendmail/' /etc/init.d/sendmail
-	fi
-
-}
-
-pkg_preinst() {
-	if ! groupmod smmsp; then
-		groupadd smmsp || die "problem adding group smmsp"
-	fi
-}
-
-pkg_postinst() {
-	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
-	then
-		einfo
-		einfo "Since you emerged sendmail without mailwrapper in USE,"
-		einfo "you probably want to 'emerge -C mailwrapper' now."
-		einfo
-	fi
-}
diff --git a/mail-mta/sendmail/sendmail-8.13.5.ebuild b/mail-mta/sendmail/sendmail-8.13.5.ebuild
deleted file mode 100644
index 2dd0bfe3bcbd..000000000000
--- a/mail-mta/sendmail/sendmail-8.13.5.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.13.5.ebuild,v 1.1 2005/09/17 10:22:13 lcars Exp $
-
-inherit eutils mailer
-
-DESCRIPTION="Widely-used Mail Transport Agent (MTA)"
-HOMEPAGE="http://www.sendmail.org/"
-SRC_URI="ftp://ftp.sendmail.org/pub/${PN}/${PN}.${PV}.tar.gz"
-
-LICENSE="Sendmail"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha ~ia64 ~s390 ~amd64 ~ppc64"
-IUSE="ssl ldap sasl tcpd mbox mailwrapper ipv6"
-
-DEPEND="net-mail/mailbase
-	sys-devel/m4
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.10 )
-	tcpd? ( sys-apps/tcp-wrappers )
-	ssl? ( dev-libs/openssl )
-	ldap? ( net-nds/openldap )
-	>=sys-libs/db-3.2
-	!net-mail/vacation
-	"
-RDEPEND="${DEPEND}
-		>=net-mail/mailbase-0.00"
-PDEPEND="!mbox? ( mail-filter/procmail )"
-PROVIDE="virtual/mta"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/sendmail-delivered_hdr.patch || die
-
-	confCCOPTS="${CFLAGS}"
-	confMAPDEF="-DMAP_REGEX"
-	conf_sendmail_LIBS=""
-	use sasl && confLIBS="${confLIBS} -lsasl2"  \
-		&& confENVDEF="${confENVDEF} -DSASL=2" \
-		&& confCCOPTS="${confCCOPTS} -I/usr/include/sasl" \
-		&& conf_sendmail_LIBS="${conf_sendmail_LIBS} -lsasl2"
-	use tcpd && confENVDEF="${confENVDEF} -DTCPWRAPPERS" \
-		&& confLIBS="${confLIBS} -lwrap"
-	use ssl && confENVDEF="${confENVDEF} -DSTARTTLS -D_FFR_DEAL_WITH_ERROR_SSL" \
-		&& confLIBS="${confLIBS} -lssl -lcrypto" \
-		&& conf_sendmail_LIBS="${conf_sendmail_LIBS} -lssl -lcrypto"
-	use ldap && confMAPDEF="${confMAPDEF} -DLDAPMAP" \
-		&& confLIBS="${confLIBS} -lldap -llber"
-	use ipv6 && confENVDEF="${confENVDEF} -DNETINET6"
-	sed -e "s:@@confCCOPTS@@:${confCCOPTS}:" \
-		-e "s/@@confMAPDEF@@/${confMAPDEF}/" \
-		-e "s/@@confENVDEF@@/${confENVDEF}/" \
-		-e "s/@@confLIBS@@/${confLIBS}/" \
-		-e "s/@@conf_sendmail_LIBS@@/${conf_sendmail_LIBS}/" \
-		${FILESDIR}/site.config.m4 > ${S}/devtools/Site/site.config.m4
-}
-
-src_compile() {
-	sh Build || die "compilation failed in main Build script"
-	pushd libmilter
-	sh Build || die "libmilter compilation failed"
-	popd
-}
-
-src_install () {
-	OBJDIR="obj.`uname -s`.`uname -r`.`arch`"
-	dodir /usr/bin /usr/lib
-	dodir /usr/share/man/man{1,5,8} /usr/sbin /var/log /usr/share/sendmail-cf
-	dodir /var/spool/{mqueue,clientmqueue} /etc/conf.d
-	keepdir /var/spool/{clientmqueue,mqueue}
-	for dir in libsmutil sendmail mailstats praliases smrsh makemap vacation editmap
-	do
-		make DESTDIR=${D} MANROOT=/usr/share/man/man \
-			SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
-			MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
-			LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
-			MSPQOWN=root CFOWN=root CFGRP=root \
-			install -C ${OBJDIR}/${dir} \
-			|| die "install failed"
-	done
-	for dir in rmail mail.local
-	do
-		make DESTDIR=${D} MANROOT=/usr/share/man/man \
-			SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
-			MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
-			LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
-			MSPQOWN=root CFOWN=root CFGRP=root \
-			force-install -C ${OBJDIR}/${dir} \
-			|| die "install failed"
-	done
-
-	dodir /usr/include/libmilter
-		make DESTDIR=${D} MANROOT=/usr/share/man/man \
-			SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
-			MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
-			LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
-			MSPQOWN=root CFOWN=root CFGRP=root \
-			install -C ${OBJDIR}/libmilter \
-			|| die "install failed"
-
-	fowners root:smmsp /usr/sbin/sendmail
-	fperms 2555 /usr/sbin/sendmail
-	fowners smmsp:smmsp /var/spool/clientmqueue
-	fperms 770 /var/spool/clientmqueue
-	fperms 700 /var/spool/mqueue
-	dosym /usr/sbin/makemap /usr/bin/makemap
-	dodoc FAQ LICENSE KNOWNBUGS README RELEASE_NOTES doc/op/op.ps
-	newdoc sendmail/README README.sendmail
-	newdoc sendmail/SECURITY SECURITY
-	newdoc sendmail/TUNING TUNING
-	newdoc smrsh/README README.smrsh
-	newdoc libmilter/README README.libmilter
-
-	newdoc cf/README README.cf
-	newdoc cf/cf/README README.install-cf
-	cp -pPR cf/* ${D}/usr/share/sendmail-cf
-	insinto /etc/mail
-	if use mbox
-	then
-		doins ${FILESDIR}/sendmail.mc
-	else
-		newins ${FILESDIR}/sendmail-procmail.mc sendmail.mc
-	fi
-	m4 ${D}/usr/share/sendmail-cf/m4/cf.m4 ${D}/etc/mail/sendmail.mc \
-		> ${D}/etc/mail/sendmail.cf
-	echo "include(\`/usr/share/sendmail-cf/m4/cf.m4')dnl" \
-		> ${D}/etc/mail/submit.mc
-	cat ${D}/usr/share/sendmail-cf/cf/submit.mc >> ${D}/etc/mail/submit.mc
-	echo "# local-host-names - include all aliases for your machine here" \
-		> ${D}/etc/mail/local-host-names
-	cat <<- EOF > ${D}/etc/mail/trusted-users
-		# trusted-users - users that can send mail as others without a warning
-		# apache, mailman, majordomo, uucp are good candidates
-	EOF
-	cat <<- EOF > ${D}/etc/mail/access
-		# Check the /usr/share/doc/sendmail/README.cf file for a description
-		# of the format of this file. (search for access_db in that file)
-		# The /usr/share/doc/sendmail/README.cf is part of the sendmail-doc
-		# package.
-		#
-
-	EOF
-	cat <<- EOF > ${D}/etc/conf.d/sendmail
-		# Config file for /etc/init.d/sendmail
-		# add start-up options here
-		SENDMAIL_OPTS="-bd -q30m -L sm-mta" # default daemon mode
-		CLIENTMQUEUE_OPTS="-Ac -q30m -L sm-cm" # clientmqueue
-		KILL_OPTS="" # add -9/-15/your favorite evil SIG level here
-
-	EOF
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/sendmail
-	keepdir /usr/adm/sm.bin
-
-	if use mailwrapper
-	then
-		mv ${D}/usr/sbin/sendmail ${D}/usr/sbin/sendmail.sendmail
-		rm ${D}/usr/bin/mailq
-		rm ${D}/usr/bin/newaliases
-		mv ${D}/usr/share/man/man8/sendmail.8 \
-			${D}/usr/share/man/man8/sendmail-sendmail.8
-		mv ${D}/usr/share/man/man1/mailq.1 \
-			${D}/usr/share/man/man1/mailq-sendmail.1
-		mv ${D}/usr/share/man/man1/newaliases.1 \
-			${D}/usr/share/man/man1/newaliases-sendmail.1
-		mv ${D}/usr/share/man/man5/aliases.5 \
-			${D}/usr/share/man/man5/aliases-sendmail.5
-		dosed 's/} sendmail/} sendmail.sendmail/' /etc/init.d/sendmail
-		dosed 's/sbin\/sendmail/sbin\/sendmail.sendmail/' /etc/init.d/sendmail
-		mailer_install_conf
-	fi
-
-}
-
-pkg_setup() {
-	einfo "checking for smmsp group...    create if missing."
-	enewgroup smmsp 209 || die "problem adding group smmsp"
-	einfo "checking for smmsp user...     create if missing."
-	enewuser smmsp 209 -1 /var/spool/mqueue smmsp \
-		|| die "problem adding user smmsp"
-}
diff --git a/mail-mta/sendmail/sendmail-8.13.6.ebuild b/mail-mta/sendmail/sendmail-8.13.6.ebuild
deleted file mode 100644
index 5dd0c1cd4915..000000000000
--- a/mail-mta/sendmail/sendmail-8.13.6.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.13.6.ebuild,v 1.1 2006/03/22 18:45:00 lcars Exp $
-
-inherit eutils
-
-DESCRIPTION="Widely-used Mail Transport Agent (MTA)"
-HOMEPAGE="http://www.sendmail.org/"
-SRC_URI="ftp://ftp.sendmail.org/pub/${PN}/${PN}.${PV}.tar.gz"
-
-LICENSE="Sendmail"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 s390 sparc x86"
-IUSE="ssl ldap sasl tcpd mbox mailwrapper ipv6"
-
-DEPEND="net-mail/mailbase
-	sys-devel/m4
-	sasl? ( >=dev-libs/cyrus-sasl-2.1.10 )
-	tcpd? ( sys-apps/tcp-wrappers )
-	ssl? ( dev-libs/openssl )
-	ldap? ( net-nds/openldap )
-	>=sys-libs/db-3.2
-	!net-mail/vacation
-	"
-RDEPEND="${DEPEND}
-		>=net-mail/mailbase-0.00
-		!mailwrapper? ( !virtual/mta )
-		mailwrapper? ( >=net-mail/mailwrapper-0.2 )"
-PDEPEND="!mbox? ( mail-filter/procmail )"
-PROVIDE="virtual/mta"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/sendmail-delivered_hdr.patch || die
-
-	confCCOPTS="${CFLAGS}"
-	confMAPDEF="-DMAP_REGEX"
-	conf_sendmail_LIBS=""
-	use sasl && confLIBS="${confLIBS} -lsasl2"  \
-		&& confENVDEF="${confENVDEF} -DSASL=2" \
-		&& confCCOPTS="${confCCOPTS} -I/usr/include/sasl" \
-		&& conf_sendmail_LIBS="${conf_sendmail_LIBS} -lsasl2"
-	use tcpd && confENVDEF="${confENVDEF} -DTCPWRAPPERS" \
-		&& confLIBS="${confLIBS} -lwrap"
-	use ssl && confENVDEF="${confENVDEF} -DSTARTTLS -D_FFR_DEAL_WITH_ERROR_SSL" \
-		&& confLIBS="${confLIBS} -lssl -lcrypto" \
-		&& conf_sendmail_LIBS="${conf_sendmail_LIBS} -lssl -lcrypto"
-	use ldap && confMAPDEF="${confMAPDEF} -DLDAPMAP" \
-		&& confLIBS="${confLIBS} -lldap -llber"
-	use ipv6 && confENVDEF="${confENVDEF} -DNETINET6"
-	sed -e "s:@@confCCOPTS@@:${confCCOPTS}:" \
-		-e "s/@@confMAPDEF@@/${confMAPDEF}/" \
-		-e "s/@@confENVDEF@@/${confENVDEF}/" \
-		-e "s/@@confLIBS@@/${confLIBS}/" \
-		-e "s/@@conf_sendmail_LIBS@@/${conf_sendmail_LIBS}/" \
-		${FILESDIR}/site.config.m4 > ${S}/devtools/Site/site.config.m4
-}
-
-src_compile() {
-	sh Build || die "compilation failed in main Build script"
-	pushd libmilter
-	sh Build || die "libmilter compilation failed"
-	popd
-}
-
-src_install () {
-	OBJDIR="obj.`uname -s`.`uname -r`.`arch`"
-	dodir /usr/bin /usr/lib
-	dodir /usr/share/man/man{1,5,8} /usr/sbin /var/log /usr/share/sendmail-cf
-	dodir /var/spool/{mqueue,clientmqueue} /etc/conf.d
-	keepdir /var/spool/{clientmqueue,mqueue}
-	for dir in libsmutil sendmail mailstats praliases smrsh makemap vacation editmap
-	do
-		make DESTDIR=${D} MANROOT=/usr/share/man/man \
-			SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
-			MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
-			LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
-			MSPQOWN=root CFOWN=root CFGRP=root \
-			install -C ${OBJDIR}/${dir} \
-			|| die "install failed"
-	done
-	for dir in rmail mail.local
-	do
-		make DESTDIR=${D} MANROOT=/usr/share/man/man \
-			SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
-			MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
-			LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
-			MSPQOWN=root CFOWN=root CFGRP=root \
-			force-install -C ${OBJDIR}/${dir} \
-			|| die "install failed"
-	done
-
-	dodir /usr/include/libmilter
-		make DESTDIR=${D} MANROOT=/usr/share/man/man \
-			SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
-			MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
-			LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
-			MSPQOWN=root CFOWN=root CFGRP=root \
-			install -C ${OBJDIR}/libmilter \
-			|| die "install failed"
-
-	fowners root:smmsp /usr/sbin/sendmail
-	fperms 2555 /usr/sbin/sendmail
-	fowners smmsp:smmsp /var/spool/clientmqueue
-	fperms 770 /var/spool/clientmqueue
-	fperms 700 /var/spool/mqueue
-	dosym /usr/sbin/makemap /usr/bin/makemap
-	dodoc FAQ LICENSE KNOWNBUGS README RELEASE_NOTES doc/op/op.ps
-	newdoc sendmail/README README.sendmail
-	newdoc sendmail/SECURITY SECURITY
-	newdoc sendmail/TUNING TUNING
-	newdoc smrsh/README README.smrsh
-	newdoc libmilter/README README.libmilter
-
-	newdoc cf/README README.cf
-	newdoc cf/cf/README README.install-cf
-	cp -pPR cf/* ${D}/usr/share/sendmail-cf
-	insinto /etc/mail
-	if use mbox
-	then
-		doins ${FILESDIR}/sendmail.mc
-	else
-		newins ${FILESDIR}/sendmail-procmail.mc sendmail.mc
-	fi
-	m4 ${D}/usr/share/sendmail-cf/m4/cf.m4 ${D}/etc/mail/sendmail.mc \
-		> ${D}/etc/mail/sendmail.cf
-	echo "include(\`/usr/share/sendmail-cf/m4/cf.m4')dnl" \
-		> ${D}/etc/mail/submit.mc
-	cat ${D}/usr/share/sendmail-cf/cf/submit.mc >> ${D}/etc/mail/submit.mc
-	echo "# local-host-names - include all aliases for your machine here" \
-		> ${D}/etc/mail/local-host-names
-	cat <<- EOF > ${D}/etc/mail/trusted-users
-		# trusted-users - users that can send mail as others without a warning
-		# apache, mailman, majordomo, uucp are good candidates
-	EOF
-	cat <<- EOF > ${D}/etc/mail/access
-		# Check the /usr/share/doc/sendmail/README.cf file for a description
-		# of the format of this file. (search for access_db in that file)
-		# The /usr/share/doc/sendmail/README.cf is part of the sendmail-doc
-		# package.
-		#
-
-	EOF
-	cat <<- EOF > ${D}/etc/conf.d/sendmail
-		# Config file for /etc/init.d/sendmail
-		# add start-up options here
-		SENDMAIL_OPTS="-bd -q30m -L sm-mta" # default daemon mode
-		CLIENTMQUEUE_OPTS="-Ac -q30m -L sm-cm" # clientmqueue
-		KILL_OPTS="" # add -9/-15/your favorite evil SIG level here
-
-	EOF
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/sendmail
-	keepdir /usr/adm/sm.bin
-
-	if use mailwrapper
-	then
-		mv ${D}/usr/sbin/sendmail ${D}/usr/sbin/sendmail.sendmail
-		insinto /etc/mail
-		doins ${FILESDIR}/mailer.conf
-		rm ${D}/usr/bin/mailq
-		rm ${D}/usr/bin/newaliases
-		mv ${D}/usr/share/man/man8/sendmail.8 \
-			${D}/usr/share/man/man8/sendmail-sendmail.8
-		mv ${D}/usr/share/man/man1/mailq.1 \
-			${D}/usr/share/man/man1/mailq-sendmail.1
-		mv ${D}/usr/share/man/man1/newaliases.1 \
-			${D}/usr/share/man/man1/newaliases-sendmail.1
-		mv ${D}/usr/share/man/man5/aliases.5 \
-			${D}/usr/share/man/man5/aliases-sendmail.5
-		dosed 's/} sendmail/} sendmail.sendmail/' /etc/init.d/sendmail
-		dosed 's/sbin\/sendmail/sbin\/sendmail.sendmail/' /etc/init.d/sendmail
-	fi
-
-}
-
-pkg_setup() {
-	einfo "checking for smmsp group...    create if missing."
-	enewgroup smmsp 209 || die "problem adding group smmsp"
-	einfo "checking for smmsp user...     create if missing."
-	enewuser smmsp 209 -1 /var/spool/mqueue smmsp \
-		|| die "problem adding user smmsp"
-}
-
-pkg_postinst() {
-	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
-	then
-		einfo
-		einfo "Since you emerged sendmail without mailwrapper in USE,"
-		einfo "you probably want to 'emerge -C mailwrapper' now."
-		einfo
-	fi
-}