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

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

4 files changed, 53 insertions, 33 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/Manifest b/mail-mta/esmtp/Manifest
index 56eba4e7c41c..49738b4d21ab 100644
--- a/mail-mta/esmtp/Manifest
+++ b/mail-mta/esmtp/Manifest
@@ -4,24 +4,24 @@ Hash: SHA256
 AUX mailer.conf 295 RMD160 a7c5529ca310951e4ca4fe6aa88083e9a9b3679b SHA1 8c04f3714414913c1864414b8a2676ea07fbca1f SHA256 ccfca2b579165153e1fcfd049b02202e193f3de4fd475a967c2727e939851e37
 DIST esmtp-0.5.0.tar.bz2 125494 RMD160 5904322030d0faef47d091bc443c2d03d51ab6fb SHA1 4273c6eda74c10b4c94888c2c68a3894342d621b SHA256 508060456a2f208d08c56ef18169e078132acf74ee2e4781041372296289d831
 DIST esmtp-1.2.tar.bz2 127921 RMD160 3fcd5908273087858dca8162c8440760774d8bf0 SHA1 01405c2ea5821c080edb37b16b1523234a442915 SHA256 a0d26931bf731f97514da266d079d8bc7d73c65b3499ed080576ab606b21c0ce
-EBUILD esmtp-0.5.0-r1.ebuild 1040 RMD160 6b6b7017c3b7585f75dd40f91a1223d8c2b8aad5 SHA1 69e18ed2e2e95695a037273fbe31ec5009cda612 SHA256 e0bc6c51c9dbc92af214da7d41aab7a8a452089678614bc328e51e53c9e6ae81
-EBUILD esmtp-1.2.ebuild 782 RMD160 59079f81e623002ed83a5f71285925ec2ebd0761 SHA1 9327adc0dd7f74fbed689d6d754427ad1e670c38 SHA256 dcfa1b1e220b8382df1191d69ffeefdf514872dec38a582d3c3c86a9d4deca1e
-MISC ChangeLog 3247 RMD160 91879f5d654398424422f206c5842a57a8db249e SHA1 f7d8de49775b5a1fb1a686301f92c532acf53240 SHA256 6b18305283dd55d1faa9e5bf8347a79eee5aaaf461c3b364cd3ce3477291784b
+EBUILD esmtp-0.5.0-r1.ebuild 1142 RMD160 109840903895adfab037c34b8b5d2dd54bb01058 SHA1 552876dbf68aa2c6aee60ee1eb331ebba0e28b97 SHA256 1f3d0d3632a4d4105e8eb1f2bfbf265c95ef777622056fc46474000fdead3b0d
+EBUILD esmtp-1.2.ebuild 929 RMD160 784a6c1162d72b1409ae34e30287993babd58239 SHA1 60df727e24dbe11b5d31dd0dbd57f64aca57df11 SHA256 1bf4ce3d121213fd4409ef7d130429bdb086e870dd5203a48475cb8465b4be46
+MISC ChangeLog 3425 RMD160 761cb3c4eb674a427d50f02cd397e841caf0da36 SHA1 0d754f6fe9766073947e691b081bf79eb6d9a982 SHA256 3a300c55a509f9cd4aabc778f26c973fdb5e1fba9f7864b1aef6b29a1dabf7f2
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNkEHQAAoJEHfx8XVYajsfaUwP/iwh64jUaJnDQLNxaDH0p5ch
-80xbMCyC1g0PXQLr8umpods8deaI6LWa0vLLAKeg6aF5Cyc4DxxUBlSZ2ASEeHX/
-ogie4dC94vD415ZZYeFzJf3ph0+Yg20GyNxb7/6rF73RyaFaSQt6AfYWpw5DmswQ
-dSI/zqDb5hoXqWlmtPDHb9qsOsGzuqTx5Q2RADHPLUsDOsqF77hpXMTich3Zajw5
-8ymMSgQJqHwGOGfg8M9fY43hYkLg3XFJLWgoYliGQ3PoRCC9TaENczAkoRlHYkSF
-JtTeaulqYdZVnix2j4UlIPbp5PXZJnPj0qwiAIXmFx8b6s/DvUGACidBhJ4tEKBh
-mJZ7U5EMR0Qhl2qkB56AE663VTtJPc+zcg0DWpC68lWnzgfuPcGmE4lWxdipZm00
-z3HLT0Gk9SG2tulf7y6H4/Os44LrVAMXmR1jgI36LWQtSYBtPOr7JsG08j0oev7Z
-X+omMzXGRp+Cgsf7zdusIdiq0j6xLTEcBJPWsgOnDzaY8bejHC1Hen/K6l8Fm2kA
-FdnCNVOvj78tSQV09PlYvLRUIsccVbx9OQ2GI8MHXPIlOeDiI6dRGAuPkxuCMZZC
-mkDMZyPr3VqQRlfcTviIr7baCLuavmyrPv1jNlfcjLPqElEarx+XRzkd4RbxzpuI
-ao0d9G3IvZFYq989eHav
-=m/i5
+iQIcBAEBCAAGBQJNkENJAAoJEHfx8XVYajsfEJkP/3ZKWO3ekKkM+3Qw+Yo4KaY6
+WIFCdEeGJC0hkS9aWXBZbGwf2Q55KRHp/WspUSO9OTBOrq7VXzF+WkHMIu7c5hkd
+iDFpSncx0+I6SOYsbrZLxoqBzTZW/uvANQy31d6YmxEVZLy5YSWH5ydy0Wh7uF2b
+07eCFGseNAFlQSid6Zja1QoBQzrSl1jHpi2diypveXhifCdgGD85hPv3oj6gD9FB
+8d+YNAE416gemxLuRlhgfAzYx2Br+F6U154ugVCDsRPuEXa90mZ88b3mpGMAtoUk
+sUe9WTVnd4bTCu00bEQ69JpO0DfrSrUD/c9BlPoqBGNpDfp8K7/+4fM6OnpD58Dj
+BkCMh82LLseTXdpKGCPguW9mZLDkm09zCYPMly/Mi5Wp++UifcD3eQcX6HOzMBpN
+cULhcQUUz48siHmmSPBDfhShrWkKJa6bfIpLNJG9i+wu+0Muj7732VJTy+d8zfSi
+/zXziGm8Yd5bhLjE9A8iyTgSTc9MX1ecvpOdjzYfS8tE5AmlFXvzTFNQoqjlPSzD
+V20oUOJPhylVEr8q0at1ciL/n6E4ZUkpqRaq6pmWUvnoIJY9djBzjnXvjT/GrHED
+ke60du6GoN+wqScsqL+s7nH0nba0EM09s8hMfSdyLOvfftbmtG/H6gGFDYeSqsSc
+ZFnqspZ4zdAd7WVPXdcs
+=VFzm
 -----END PGP SIGNATURE-----
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"