4 files changed, 29 insertions, 66 deletions
diff --git a/mail-mta/esmtp/ChangeLog b/mail-mta/esmtp/ChangeLog
index 6d618de21410..ee186aa6f3fb 100644
--- a/mail-mta/esmtp/ChangeLog
+++ b/mail-mta/esmtp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-mta/esmtp
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/esmtp/ChangeLog,v 1.18 2007/04/24 18:33:37 dertobi123 Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/esmtp/ChangeLog,v 1.19 2008/07/22 17:27:54 dertobi123 Exp $
+
+  22 Jul 2008; Tobias Scherbaum <dertobi123@gentoo.org> ChangeLog:
+  Version bump, remove mailwrapper support, #198106
 
   24 Apr 2007; Tobias Scherbaum <dertobi123@gentoo.org>
   esmtp-0.5.0-r1.ebuild:
diff --git a/mail-mta/esmtp/esmtp-0.5.0-r2.ebuild b/mail-mta/esmtp/esmtp-0.5.0-r2.ebuild
deleted file mode 100644
index d5de63e06833..000000000000
--- a/mail-mta/esmtp/esmtp-0.5.0-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/esmtp/esmtp-0.5.0-r2.ebuild,v 1.2 2005/05/12 17:28:32 ferdy Exp $
-
-inherit mailer
-
-DESCRIPTION="esmtp is a user configurable relay-only Mail Transfer Agent (MTA) with a sendmail compatible syntax"
-HOMEPAGE="http://esmtp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-IUSE=""
-DEPEND="virtual/libc
-	net-libs/libesmtp
-	dev-libs/openssl"
-
-src_install() {
-	make DESTDIR=${D} install || die "einstall failed"
-	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
-
-	if use mailwrapper ; then
-		mv ${D}/usr/sbin/sendmail ${D}/usr/bin/sendmail.esmtp
-		mv ${D}/usr/bin/mailq ${D}/usr/bin/mailq.esmtp
-		mv ${D}/usr/bin/newaliases ${D}/usr/bin/newaliases.esmtp
-		mailer_install_conf
-	fi
-}
diff --git a/mail-mta/esmtp/esmtp-0.5.1.ebuild b/mail-mta/esmtp/esmtp-0.5.1.ebuild
deleted file mode 100644
index 9a08050523a9..000000000000
--- a/mail-mta/esmtp/esmtp-0.5.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/esmtp/esmtp-0.5.1.ebuild,v 1.3 2006/01/27 14:29:41 slarti Exp $
-
-inherit mailer
-
-DESCRIPTION="esmtp is a user configurable relay-only Mail Transfer Agent (MTA) with a sendmail compatible syntax"
-HOMEPAGE="http://esmtp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-DEPEND="virtual/libc
-	net-libs/libesmtp
-	dev-libs/openssl"
-
-src_install() {
-	make DESTDIR=${D} install || die "einstall failed"
-	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
-
-	if use mailwrapper ; then
-		rm "${D}/usr/sbin/sendmail"
-		rm "${D}/usr/lib/sendmail"
-		dosym "/usr/bin/esmtp" "/usr/sbin/sendmail.esmtp"
-		rm "${D}/usr/bin/mailq"
-		rm "${D}/usr/bin/newaliases"
-		mv "${D}/usr/share/man/man1/newaliases.1" \
-			"${D}/usr/share/man/man1/newaliases-esmtp.1"
-		mv "${D}/usr/share/man/man1/mailq.1" \
-			"${D}/usr/share/man/man1/mailq-esmtp.1"
-		mv "${D}/usr/share/man/man1/sendmail.1" \
-			"${D}/usr/share/man/man1/sendmail-esmtp.1"
-		mailer_install_conf
-	fi
-}
diff --git a/mail-mta/esmtp/esmtp-0.6.0.ebuild b/mail-mta/esmtp/esmtp-0.6.0.ebuild
new file mode 100644
index 000000000000..a7738bed47e5
--- /dev/null
+++ b/mail-mta/esmtp/esmtp-0.6.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/esmtp/esmtp-0.6.0.ebuild,v 1.1 2008/07/22 17:27:54 dertobi123 Exp $
+
+DESCRIPTION="esmtp is a user configurable relay-only Mail Transfer Agent (MTA) with a sendmail compatible syntax"
+HOMEPAGE="http://esmtp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+DEPEND="virtual/libc
+	net-libs/libesmtp
+	dev-libs/openssl"
+RDEPEND="${DEPEND}
+		!net-mail/mailwrapper
+		!virtual/mta"
+
+PROVIDE="virtual/mta"
+
+src_install() {
+	emake DESTDIR="${D}" install || die "einstall failed"
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}