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

(Portage version: 2.1.6.13/cvs/Linux x86_64)

12 files changed, 21 insertions, 1070 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/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
-}