Fix regression bug introduced by the new site.config.m4 (#283277).

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

13 files changed, 28 insertions, 1088 deletions

diff --git a/mail-mta/sendmail/ChangeLog b/mail-mta/sendmail/ChangeLog
index d69107f09844..358f309c22ef 100644
--- a/mail-mta/sendmail/ChangeLog
+++ b/mail-mta/sendmail/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-mta/sendmail
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/ChangeLog,v 1.82 2009/08/22 21:41:23 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/ChangeLog,v 1.83 2009/08/31 18:13:37 mrness Exp $
+
+  31 Aug 2009; Alin Năstac <mrness@gentoo.org>
+  -files/errata-8.13.7-1.patch, -files/errata-8.13.7-2.patch,
+  -files/sendmail-CVE-2006-1173.patch, -sendmail-8.13.6-r1.ebuild,
+  -sendmail-8.13.7.ebuild, -sendmail-8.13.7-r1.ebuild,
+  -sendmail-8.13.8.ebuild, sendmail-8.14.0.ebuild, sendmail-8.14.1.ebuild,
+  sendmail-8.14.2.ebuild, -sendmail-8.14.3.ebuild:
+  Fix regression bug introduced by the new site.config.m4 (#283277).
 
 *sendmail-8.14.3-r1 (22 Aug 2009)
 
diff --git a/mail-mta/sendmail/Manifest b/mail-mta/sendmail/Manifest
index d766a19a703a..eab274562235 100644
--- a/mail-mta/sendmail/Manifest
+++ b/mail-mta/sendmail/Manifest
@@ -1,38 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX errata-8.13.7-1.patch 428 RMD160 2ca5313cdc21569f10bd85c7a96d5ac86d5da862 SHA1 586ba29dae6d24433ec1d8ff5992b42e63c3d886 SHA256 a308384cbb3d829c1990dde5a453b9a1c06c0696ff85965946ffec73232f1b3e
-AUX errata-8.13.7-2.patch 554 RMD160 e9fb7716126c61fc27874001a89088b394828ec5 SHA1 61d9b87effac3498adb8049d19ceca5e52bb8444 SHA256 e387011e5c3d183259ba0ed933b313e4a24eaf3a17f2b6e60debfe8cbbfbff04
 AUX libmilter-sharedlib.patch 2825 RMD160 ee9e9a58b704aa619ae8c2f96438cfe6f868f413 SHA1 930223b6289558caefb293911849378d9105be39 SHA256 3670dd0ae715b6ceb48525700943cf39d362144e80d6c8e6f5154de5d57fe721
 AUX mailer.conf 1306 RMD160 7f752b3b88208eda71f96de6621e050a684b8fdb SHA1 a2704751d866367f969554841af8f637766db528 SHA256 f07e22401ff9fae449bfb093dfc608b6f8e71af1c7c3790d89a71af9a1411a44
 AUX sendmail 701 RMD160 991eb44041ac33d04693a838b7e976a7cca14e61 SHA1 ac6991b5d77b428ba58b6a3a4aa8ba0834ffbfaa SHA256 c95de55fbd5334ec54f17efe69a33c242a9ba28cd76f11cc3c7ff8418cf49acb
-AUX sendmail-CVE-2006-1173.patch 1486 RMD160 33a6bf2dcf1bf6cd9d2702bc9705ceb80fbe09f0 SHA1 440e4ee461ffff34e78eef8e4e233373177b5d7d SHA256 9c58001d52682e1e54e39494c65864fafe3e1989e730056173bd8d39e48c4cf9
 AUX sendmail-delivered_hdr.patch 341 RMD160 a190574a57c643233c0d23e8b69dbf3cd3943f41 SHA1 17d034625524438dc98a2a7a14a7bfe2fb047420 SHA256 bfe354d1047c66ea857e56cb374f583eb779c8f4ccc92ea766e916ec358cd77c
 AUX sendmail-procmail.mc 357 RMD160 e912a3d2f91fc60e0856e1a537b9a9851788172f SHA1 536e5b842ef280f2abd86ee0f8f5987a885350b7 SHA256 8da4cc39758ff1668d7bf7c3713914cb44ef8d084ab822629316ee3caae90856
 AUX sendmail.mc 299 RMD160 cb659c515cc2b5de750b645fbcfb7a8a60ad60ae SHA1 c93483684c46356cd1d09899517539c5406b5bd0 SHA256 fbf4f2bf7826cabf2072f6c113b3616c1dffd580864d708e344b5f334f1a8a38
 AUX site.config.m4 564 RMD160 5e27f44c72947cdb4f00aaed618691db5a1c9489 SHA1 df71882eb8b19f7779ae349d07665849aa6c2781 SHA256 3a7d586f8dfc24f7ed53621c04374aeca91153ded80cf17411ce417a45aade44
-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
-DIST sendmail.8.13.8.tar.gz 2010975 RMD160 a5d333b073d681f056421e836df4067f331a8ac8 SHA1 8e97c10f52efe5204c08f6cb3f90c08e077ac505 SHA256 48262059aec2d2f1cbbb45dcd4eaf5eb3ba02bc29ebc25c15ae2e04b606f0123
 DIST sendmail.8.14.0.tar.gz 2056927 RMD160 2095840c732fb843011c335d2c1f918b9ffdf4e4 SHA1 fd93987ffe081303eef964e0746e344c04881ca9 SHA256 dc2f8663d6e1e8c08029f3501779680e5a61a86017cf2085ec5dc295f2295977
 DIST sendmail.8.14.1.tar.gz 2061959 RMD160 180c90e9a64e8896798ed6b9cf883d481e11f5ac SHA1 327a77a3b5a55810f2addae7dfd6cfd95645f476 SHA256 73143bee92ef961498e053f7ec47dca27bb8c450e4974cc69519f24c768ec32e
 DIST sendmail.8.14.2.tar.gz 2064346 RMD160 9db665f955b5a2b5d83adad4c3dfd483c6e0b9be SHA1 2b92a1d439374249ef6bf024cfb8072902c5682a SHA256 7be1c533ab0b3c841a8b28954c79bd2e4474b9a212163b0f20cd30e255d06e3a
 DIST sendmail.8.14.3.tar.gz 2069209 RMD160 5423360ce908c985827cf6524a6de87e3451c27a SHA1 814c54c3917aa6b0981b5ea99fb34e0c02f31489 SHA256 5cc69cdc055b587cbedad4efbf17c1dfc52a6ae18ec83a3d2e83e5f5fcdc119b
-EBUILD sendmail-8.13.6-r1.ebuild 6641 RMD160 e9cc85791d4cefce8cb820bc17ea0a4127d6a884 SHA1 f39f4426108c6f7b6a83e1da73b05d619f1bc71e SHA256 b3148fbeca9699b8ff21673a1bde252847579ae20c616d3fb634e1021bb59e57
-EBUILD sendmail-8.13.7-r1.ebuild 6684 RMD160 fb4369543cd2402681e9c4e2b43eeb8d2280ec8e SHA1 73150f1d6a779aa9569f0cdb13cf9cd789a00346 SHA256 4c488f5cef9a4699233dafa44d1a1f5d8c7fb77638991cbe5951f89faceee0b4
-EBUILD sendmail-8.13.7.ebuild 6590 RMD160 cbc9258a0aaa764843da30b0996ae0f0acea59d5 SHA1 aa3a96ddf8e52bea4447dda789ee24048265fef6 SHA256 36d7cc88472a06ab15c9904cbc7e752620a80ed7564d4888b3baadd664c1ec3c
-EBUILD sendmail-8.13.8.ebuild 6700 RMD160 e114ad1f04a14f465f7c90237848a7a80f9aa09a SHA1 10acbb69fe77335fa115a50c20e02237cced819e SHA256 929337a114339cd9b74ecf6565c99d8e8896cecf1b625e5471f99f19aa356108
-EBUILD sendmail-8.14.0.ebuild 6699 RMD160 cbb20359863bbe66e3b28bdf1dd7c8d7c6102156 SHA1 aaa85bf761663c98f743d397cddd1650622d5b73 SHA256 de704080ecf447a900af24019277879795ea10741bc38fc6adedce996375ceae
-EBUILD sendmail-8.14.1.ebuild 6709 RMD160 8a78a23aa9e37d2f15ccce4eb35c31bf487cea16 SHA1 b67fdca54f60ea573ac3449144208cb9c6e1601c SHA256 a444ece752a6e6c66af81da9974ab1b3ec18b179c08f7c2f84db05db1aa50b56
-EBUILD sendmail-8.14.2.ebuild 6709 RMD160 0c4f376fddd606dc383882a94e5013ea2eaccf6b SHA1 fbe96a01c7a54e9e3b396f6f6106957a889b4a2c SHA256 faa96d34d4a60ff612eb2f0ce8a72b37d65900583b9125dd0e783cca153b2918
+EBUILD sendmail-8.14.0.ebuild 6750 RMD160 784ff8129381a86b7e03426709105e24e3ed4bc2 SHA1 203a07a47d5fd7a7916163e7ff857c26979f1a00 SHA256 347cb5c5c2253a3d187a1b54c846a75cf92476de9f0c800f72a7c9bb72512b33
+EBUILD sendmail-8.14.1.ebuild 6760 RMD160 f8f4129fdba3521fadd864b09ce047a0e23146e7 SHA1 8f3546c15efaebc25d110ba237e5cad0ec0ad372 SHA256 c6fdf8bb82df57c8dc73ae1eec0abba9a9fbfa67efdc3b0826a6443d4bda986e
+EBUILD sendmail-8.14.2.ebuild 6760 RMD160 77e0773bbc7c14383aae9ea4af61c6938ef90e7b SHA1 51c02b51fd51996433315c08cadeef675cfa6a1c SHA256 68b17f8b7423e5562130fbaaf394d38855f9e16c5032c3b4da10fef9713d4564
 EBUILD sendmail-8.14.3-r1.ebuild 7486 RMD160 994916daa4beca766cbd41b81353f6829cb1f460 SHA1 b075f14580ef503f5935ee2774bee35feb63c170 SHA256 d645394f0337805c571f12dec71fe9c9f07b2e2a0d7353f75a28fd0f06d0ff91
-EBUILD sendmail-8.14.3.ebuild 6711 RMD160 d48b7269777391eccb074b457069460f9ffda9e7 SHA1 4b36a1a693a6ab586ea29f62a3624268d4c75019 SHA256 8fbaa6142676fdc885a74c3aacf3e3413faa7dd2e359db465e4ddaf35fb4e91f
-MISC ChangeLog 18642 RMD160 f4644b2a67dddddad42ff45f6ffafb5e793f6605 SHA1 06b22f08a3c39d9047e5e0954b48d2fbda40c0f8 SHA256 4861ae20722e60cff5f2c0a536f7c7ec05c34e9e221b612eee0bb24433431ae4
+MISC ChangeLog 19070 RMD160 c22f62cc3b24a20d7d0e5c984da235fc59ef903a SHA1 d63bbebaf9da905c6aaadca5cc0a1352c7cedffa SHA256 9e374f0ad300259c5de1d9d353695f1ae40d7990449db432cc9b86d4a1fce8e7
 MISC metadata.xml 162 RMD160 fd38b82541901b3c6df18b630d79fe7883ae3f01 SHA1 e6aecefcc2137d6047cedfe447686775ab59cb48 SHA256 569031668e39895fb20829fb17a49a91a83e8f41b2195b0f04825c4340d2af6b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqQczEACgkQ9A5kJBGSrsvpkwCfaGRgfkA/Mlq5DIMdZtdyuqvs
-9M8An3arPl7SL7ThCJKPhMYXj9iPgot0
-=iqWM
+iEYEARECAAYFAkqcEuUACgkQ9A5kJBGSrstoUQCeOY2lf/xbP19CqHcvXp0EqSkQ
+nuAAniffCDVCPplZcVyNCk3RHytTNYir
+=jpw6
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/sendmail/files/errata-8.13.7-1.patch b/mail-mta/sendmail/files/errata-8.13.7-1.patch
deleted file mode 100644
index 35c7ad8fd201..000000000000
--- a/mail-mta/sendmail/files/errata-8.13.7-1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -u -r8.954 -r8.954.2.2
---- sendmail/queue.c	22 Apr 2006 01:07:00 -0000	8.954
-+++ sendmail/queue.c	14 Jun 2006 21:50:56 -0000	8.954.2.2
-@@ -6695,8 +6695,7 @@
- 	static time_t nextupdate = 0;
- 
- #if SM_CONF_SHM
--	/* only the daemon updates this structure */
--	if (ShmId == SM_SHM_NO_ID || DaemonPid != CurrentPid)
-+	if (ShmId == SM_SHM_NO_ID && DaemonPid != CurrentPid)
- 		return;
- #endif /* SM_CONF_SHM */
- 	now = curtime();
diff --git a/mail-mta/sendmail/files/errata-8.13.7-2.patch b/mail-mta/sendmail/files/errata-8.13.7-2.patch
deleted file mode 100644
index c48d84c580be..000000000000
--- a/mail-mta/sendmail/files/errata-8.13.7-2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -u -r8.944 main.c
---- sendmail/main.c	21 Apr 2006 23:56:42 -0000	8.944
-+++ sendmail/main.c	15 Jun 2006 18:38:35 -0000
-@@ -2408,6 +2408,8 @@
- 	{
- 		char dtype[200];
- 
-+		/* avoid cleanup in finis(), DaemonPid will be set below */
-+		DaemonPid = 0;
- 		if (!run_in_foreground && !tTd(99, 100))
- 		{
- 			/* put us in background */
-@@ -2440,7 +2442,10 @@
- 
- 		dtype[0] = '\0';
- 		if (OpMode == MD_DAEMON)
-+		{
- 			(void) sm_strlcat(dtype, "+SMTP", sizeof dtype);
-+			DaemonPid = CurrentPid;
-+		}
- 		if (QueueIntvl > 0)
- 		{
- 			(void) sm_strlcat2(dtype,
diff --git a/mail-mta/sendmail/files/sendmail-CVE-2006-1173.patch b/mail-mta/sendmail/files/sendmail-CVE-2006-1173.patch
deleted file mode 100644
index 5866d7aba5d4..000000000000
--- a/mail-mta/sendmail/files/sendmail-CVE-2006-1173.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- sendmail/mime.c	24 Mar 2006 03:17:06 -0000	8.140
-+++ sendmail/mime.c	27 Apr 2006 22:56:16 -0000	8.141
-@@ -242,7 +242,9 @@
- 	*/
-
- 	if (sm_strcasecmp(type, "multipart") == 0 &&
--	    (!bitset(M87F_NO8BIT, flags) || bitset(M87F_NO8TO7, flags)))
-+	    (!bitset(M87F_NO8BIT, flags) || bitset(M87F_NO8TO7, flags)) &&
-+	    !bitset(EF_TOODEEP, e->e_flags)
-+	   )
- 	{
-
- 		if (sm_strcasecmp(subtype, "digest") == 0)
-@@ -286,10 +288,13 @@
- 		}
- 		if (i >= MAXMIMENESTING)
- 		{
--			usrerr("mime8to7: multipart nesting boundary too deep");
-+			if (tTd(43, 4))
-+				sm_dprintf("mime8to7: too deep, i=%d\n", i);
-+			if (!bitset(EF_TOODEEP, e->e_flags))
-+				usrerr("mime8to7: multipart nesting boundary too deep");
-
- 			/* avoid bounce loops */
--			e->e_flags |= EF_DONT_MIME;
-+			e->e_flags |= EF_DONT_MIME|EF_TOODEEP;
- 		}
- 		else
- 		{
-@@ -374,7 +379,8 @@
-
- 	if (sm_strcasecmp(type, "message") == 0)
- 	{
--		if (!wordinclass(subtype, 's'))
-+		if (!wordinclass(subtype, 's') ||
-+		    bitset(EF_TOODEEP, e->e_flags))
- 		{
- 			flags |= M87F_NO8BIT;
- 		}
---- sendmail/sendmail.h	22 Mar 2006 22:58:39 -0000	8.1007
-+++ sendmail/sendmail.h	27 Apr 2006 22:56:16 -0000	8.1008
-@@ -942,6 +942,7 @@
- #define EF_TOOBIG	0x02000000L	/* message is too big */
- #define EF_SPLIT	0x04000000L	/* envelope has been split */
- #define EF_UNSAFE	0x08000000L	/* unsafe: read from untrusted source */
-+#define EF_TOODEEP	0x10000000L	/* message is nested too deep */
-
- #define DLVR_NOTIFY	0x01
- #define DLVR_RETURN	0x02
-
diff --git a/mail-mta/sendmail/sendmail-8.13.6-r1.ebuild b/mail-mta/sendmail/sendmail-8.13.6-r1.ebuild
deleted file mode 100644
index 97302ed35de2..000000000000
--- a/mail-mta/sendmail/sendmail-8.13.6-r1.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2007 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-r1.ebuild,v 1.4 2007/09/10 09:09:48 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
-	epatch ${FILESDIR}/sendmail-CVE-2006-1173.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`.`uname -m`"
-	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
-	doinitd ${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
-		elog
-		elog "Since you emerged sendmail without mailwrapper in USE,"
-		elog "you probably want to 'emerge -C mailwrapper' now."
-		elog
-	fi
-}
diff --git a/mail-mta/sendmail/sendmail-8.13.7-r1.ebuild b/mail-mta/sendmail/sendmail-8.13.7-r1.ebuild
deleted file mode 100644
index c6f295303f12..000000000000
--- a/mail-mta/sendmail/sendmail-8.13.7-r1.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.13.7-r1.ebuild,v 1.12 2007/09/10 09:09:48 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
-	epatch ${FILESDIR}/errata-8.13.7-1.patch || die
-	epatch ${FILESDIR}/errata-8.13.7-2.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`.`uname -m`"
-	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
-	doinitd ${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
-		elog
-		elog "Since you emerged sendmail without mailwrapper in USE,"
-		elog "you probably want to 'emerge -C mailwrapper' now."
-		elog
-	fi
-}
diff --git a/mail-mta/sendmail/sendmail-8.13.7.ebuild b/mail-mta/sendmail/sendmail-8.13.7.ebuild
deleted file mode 100644
index 9ae093d23ac6..000000000000
--- a/mail-mta/sendmail/sendmail-8.13.7.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.13.7.ebuild,v 1.5 2007/09/10 09:09:48 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`.`uname -m`"
-	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
-	doinitd ${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
-		elog
-		elog "Since you emerged sendmail without mailwrapper in USE,"
-		elog "you probably want to 'emerge -C mailwrapper' now."
-		elog
-	fi
-}
diff --git a/mail-mta/sendmail/sendmail-8.13.8.ebuild b/mail-mta/sendmail/sendmail-8.13.8.ebuild
deleted file mode 100644
index 1d3f21bd8069..000000000000
--- a/mail-mta/sendmail/sendmail-8.13.8.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.13.8.ebuild,v 1.13 2007/09/10 09:09:48 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 arm hppa ia64 ppc ppc64 s390 sh ~sparc x86"
-IUSE="ssl ldap sasl tcpd mbox mailwrapper ipv6 nis sockets"
-
-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"
-	use nis && confENVDEF="${confENVDEF} -DNIS"
-	use sockets && confENVDEF="${confENVDEF} -DSOCKETMAP"
-	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`.`uname -m`"
-	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
-	doinitd ${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
-		elog
-		elog "Since you emerged sendmail without mailwrapper in USE,"
-		elog "you probably want to 'emerge -C mailwrapper' now."
-		elog
-	fi
-}
diff --git a/mail-mta/sendmail/sendmail-8.14.0.ebuild b/mail-mta/sendmail/sendmail-8.14.0.ebuild
index c17de979bfde..f0302bd48d57 100644
--- a/mail-mta/sendmail/sendmail-8.14.0.ebuild
+++ b/mail-mta/sendmail/sendmail-8.14.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.14.0.ebuild,v 1.12 2007/09/10 09:09:48 lcars Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.14.0.ebuild,v 1.13 2009/08/31 18:13:37 mrness Exp $
 
 inherit eutils
 
@@ -53,6 +53,8 @@ src_unpack() {
 	use nis && confENVDEF="${confENVDEF} -DNIS"
 	use sockets && confENVDEF="${confENVDEF} -DSOCKETMAP"
 	sed -e "s:@@confCCOPTS@@:${confCCOPTS}:" \
+		-e "/@@confLDOPTS@@/d" \
+		-e "/@@confCC@@/d" \
 		-e "s/@@confMAPDEF@@/${confMAPDEF}/" \
 		-e "s/@@confENVDEF@@/${confENVDEF}/" \
 		-e "s/@@confLIBS@@/${confLIBS}/" \
diff --git a/mail-mta/sendmail/sendmail-8.14.1.ebuild b/mail-mta/sendmail/sendmail-8.14.1.ebuild
index cba983dda580..08aa4555dcbf 100644
--- a/mail-mta/sendmail/sendmail-8.14.1.ebuild
+++ b/mail-mta/sendmail/sendmail-8.14.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.14.1.ebuild,v 1.3 2007/09/10 09:09:48 lcars Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.14.1.ebuild,v 1.4 2009/08/31 18:13:37 mrness Exp $
 
 inherit eutils
 
@@ -53,6 +53,8 @@ src_unpack() {
 	use nis && confENVDEF="${confENVDEF} -DNIS"
 	use sockets && confENVDEF="${confENVDEF} -DSOCKETMAP"
 	sed -e "s:@@confCCOPTS@@:${confCCOPTS}:" \
+		-e "/@@confLDOPTS@@/d" \
+		-e "/@@confCC@@/d" \
 		-e "s/@@confMAPDEF@@/${confMAPDEF}/" \
 		-e "s/@@confENVDEF@@/${confENVDEF}/" \
 		-e "s/@@confLIBS@@/${confLIBS}/" \
diff --git a/mail-mta/sendmail/sendmail-8.14.2.ebuild b/mail-mta/sendmail/sendmail-8.14.2.ebuild
index 20faa7f991d8..1e053c6aef4e 100644
--- a/mail-mta/sendmail/sendmail-8.14.2.ebuild
+++ b/mail-mta/sendmail/sendmail-8.14.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.14.2.ebuild,v 1.1 2007/11/02 20:34:08 lcars Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.14.2.ebuild,v 1.2 2009/08/31 18:13:38 mrness Exp $
 
 inherit eutils
 
@@ -53,6 +53,8 @@ src_unpack() {
 	use nis && confENVDEF="${confENVDEF} -DNIS"
 	use sockets && confENVDEF="${confENVDEF} -DSOCKETMAP"
 	sed -e "s:@@confCCOPTS@@:${confCCOPTS}:" \
+		-e "/@@confLDOPTS@@/d" \
+		-e "/@@confCC@@/d" \
 		-e "s/@@confMAPDEF@@/${confMAPDEF}/" \
 		-e "s/@@confENVDEF@@/${confENVDEF}/" \
 		-e "s/@@confLIBS@@/${confLIBS}/" \
diff --git a/mail-mta/sendmail/sendmail-8.14.3.ebuild b/mail-mta/sendmail/sendmail-8.14.3.ebuild
deleted file mode 100644
index ab9e16f3ca41..000000000000
--- a/mail-mta/sendmail/sendmail-8.14.3.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.14.3.ebuild,v 1.1 2009/06/27 16:06:47 patrick 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 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ssl ldap sasl tcpd mbox mailwrapper ipv6 nis sockets"
-
-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"
-	use nis && confENVDEF="${confENVDEF} -DNIS"
-	use sockets && confENVDEF="${confENVDEF} -DSOCKETMAP"
-	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`.`uname -m`"
-	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
-	doinitd ${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
-		elog
-		elog "Since you emerged sendmail without mailwrapper in USE,"
-		elog "you probably want to 'emerge -C mailwrapper' now."
-		elog
-	fi
-}