Change to new style virtual/mta - bug 360305. Remove mailwrapper support - bug 158003

(Portage version: 2.1.9.45/cvs/Linux x86_64)

3 files changed, 37 insertions, 17 deletions

diff --git a/mail-mta/esmtp/ChangeLog b/mail-mta/esmtp/ChangeLog
index 447eac35f1b7..3678296cd708 100644
--- a/mail-mta/esmtp/ChangeLog
+++ b/mail-mta/esmtp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-mta/esmtp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/esmtp/ChangeLog,v 1.24 2011/03/28 08:07:30 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/esmtp/ChangeLog,v 1.25 2011/03/28 08:13:44 eras Exp $
+
+  28 Mar 2011; Eray Aslan <eras@gentoo.org> esmtp-0.5.0-r1.ebuild,
+  esmtp-1.2.ebuild:
+  Change to new style virtual/mta - bug 360305. Remove mailwrapper support -
+  bug 158003
 
   28 Mar 2011; Eray Aslan <eras@gentoo.org> -esmtp-0.6.0.ebuild,
   -esmtp-1.0.ebuild:
diff --git a/mail-mta/esmtp/esmtp-0.5.0-r1.ebuild b/mail-mta/esmtp/esmtp-0.5.0-r1.ebuild
index 6aa926c5ee71..18e92b4df9ae 100644
--- a/mail-mta/esmtp/esmtp-0.5.0-r1.ebuild
+++ b/mail-mta/esmtp/esmtp-0.5.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 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-r1.ebuild,v 1.12 2009/09/23 18:05:37 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/esmtp/esmtp-0.5.0-r1.ebuild,v 1.13 2011/03/28 08:13:44 eras Exp $
 
 DESCRIPTION="esmtp is a user configurable relay-only Mail Transfer Agent (MTA) with a sendmail compatible syntax"
 HOMEPAGE="http://esmtp.sourceforge.net/"
@@ -8,23 +8,31 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha ~amd64 ppc ~sparc x86"
-IUSE="mailwrapper"
+IUSE=""
 DEPEND="net-libs/libesmtp
 	dev-libs/openssl"
 RDEPEND="${DEPEND}
-	mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	!mailwrapper? ( !virtual/mta )"
-PROVIDE="virtual/mta"
+	!mail-mta/courier
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp
+	!mail-mta/nbsmtp
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/ssmtp"
 
 src_install() {
-	make DESTDIR=${D} install || die "einstall failed"
-	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
+	emake DESTDIR="${D}" install || die "einstall failed"
+	dodoc AUTHORS ChangeLog NEWS README TODO
 
 	if use mailwrapper
 	then
 		# We install sendmail binary to be compatible with mailwrapper
-		mv ${D}/usr/sbin/sendmail ${D}/usr/sbin/sendmail.esmtp
+		mv "${D}/usr/sbin/sendmail" "${D}/usr/sbin/sendmail.esmtp"
 		dosym /usr/sbin/sendmail /usr/lib/sendmail
-		rm ${D}/usr/bin/mailq ${D}/usr/bin/newaliases
+		rm "${D}/usr/bin/mailq" "${D}/usr/bin/newaliases"
 	fi
 }
diff --git a/mail-mta/esmtp/esmtp-1.2.ebuild b/mail-mta/esmtp/esmtp-1.2.ebuild
index c5840990f9f0..ead4fe2edcb5 100644
--- a/mail-mta/esmtp/esmtp-1.2.ebuild
+++ b/mail-mta/esmtp/esmtp-1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/esmtp/esmtp-1.2.ebuild,v 1.1 2010/06/09 18:56:16 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/esmtp/esmtp-1.2.ebuild,v 1.2 2011/03/28 08:13:44 eras Exp $
 
 DESCRIPTION="esmtp is a user configurable relay-only Mail Transfer Agent (MTA) with a sendmail compatible syntax"
 HOMEPAGE="http://esmtp.sourceforge.net/"
@@ -14,10 +14,17 @@ IUSE=""
 DEPEND="net-libs/libesmtp
 	dev-libs/openssl"
 RDEPEND="${DEPEND}
-		!net-mail/mailwrapper
-		!virtual/mta"
-
-PROVIDE="virtual/mta"
+	!mail-mta/courier
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp
+	!mail-mta/nbsmtp
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/ssmtp"
 
 src_install() {
 	emake DESTDIR="${D}" install || die "einstall failed"