From 3c7e331505a6f66006367a671f020078a85d4658 Mon Sep 17 00:00:00 2001
From: Gianni Ceccarelli <gianni.ceccarelli@net-a-porter.com>
Date: Wed, 20 Jul 2011 16:58:10 +0100
Subject: merge main portage changes to netqmail ebuild

---
 mail-mta/netqmail/Manifest                |  2 +-
 mail-mta/netqmail/netqmail-1.06-r2.ebuild | 21 +++++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'mail-mta')

diff --git a/mail-mta/netqmail/Manifest b/mail-mta/netqmail/Manifest
index 8d54d2e..f4c0472 100644
--- a/mail-mta/netqmail/Manifest
+++ b/mail-mta/netqmail/Manifest
@@ -38,5 +38,5 @@ DIST netqmail-1.06.tar.gz 260941 RMD160 d31598afa862abb35bc1feb8d038ab619b5a17a2
 DIST qmail-spp-0.42.tar.gz 18689 RMD160 5511722c52346692488a63bca53106d580a004c7 SHA1 76a94051b017dd331d8c791e466bb2a936ceba41 SHA256 1518e7e82d10fbbb8ecc520f51daf503edeb9c3a9fb935be65a8185e7b53808d
 EBUILD netqmail-1.05-r9.ebuild 13697 RMD160 4a5e5333105ed69f33c964dd0d7e48d4ce2b255b SHA1 c067d656a46bff6afcea6748c67dea9d8dff1d68 SHA256 6696f1b95f37a94d5462863a6e69db21aef55bfa6d33bab727e8f424a2c4c3db
 EBUILD netqmail-1.06-r1.ebuild 3410 RMD160 579bfcaba8cb2e68c188f7fabc4c9e94db6fceef SHA1 08f72fbfa067f7c610651cd8cde1e965b12ceb83 SHA256 509df549f72c4c5a9f52fa0da36449f772135f3fbb97136c743b312c273f4356
-EBUILD netqmail-1.06-r2.ebuild 3443 RMD160 000a9f9b598bb45aea829f87784a77d81a81bdc6 SHA1 deaffd97570e1f2b48fd9bbf05819fc0ef5f25be SHA256 5cfdf8aeff7d2cdba08549c1c05fb11be0618694243fe30f530e056a38a741e2
+EBUILD netqmail-1.06-r2.ebuild 3517 RMD160 e14bedf803510f36dc98bbc7a9acfe6ef934e4b6 SHA1 79adcdf2ec35776b957143cad7864ee556ae6798 SHA256 f2c717a77186acf97d0025e3972ecfec5b02b072f38eca49bceabe810f6cf971
 MISC metadata.xml 159 RMD160 aa4ad961079c26af99cc726320fc79401e65ea9a SHA1 35fb9f5820b650eb060f5c4ece62c60de1bab0e9 SHA256 b0c15ada9b1606aa2ff9da86e0b7f0bbcd31f202958e29b4d862bf81a1a374e7
diff --git a/mail-mta/netqmail/netqmail-1.06-r2.ebuild b/mail-mta/netqmail/netqmail-1.06-r2.ebuild
index 3d740c4..792badd 100644
--- a/mail-mta/netqmail/netqmail-1.06-r2.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r2.ebuild
@@ -31,7 +31,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
-IUSE="authcram gencertdaily highvolume mailwrapper qmail-spp ssl vanilla"
+IUSE="authcram gencertdaily highvolume qmail-spp ssl vanilla"
 RESTRICT="test"
 
 DEPEND="
@@ -40,20 +40,25 @@ DEPEND="
 	ssl? ( dev-libs/openssl )
 "
 RDEPEND="
-	mailwrapper? ( net-mail/mailwrapper )
-	!mailwrapper? ( !virtual/mta )
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp
+	!mail-mta/nbsmtp
+	!mail-mta/nullmailer
+	!mail-mta/postfix
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/ssmtp
 	>=sys-apps/ucspi-tcp-0.88-r17
 	ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 )
-	>=sys-process/daemontools-0.76-r6
+	virtual/daemontools
 	>=net-mail/dot-forward-0.71-r3
 	virtual/checkpassword
 	authcram? ( >=net-mail/cmd5checkpw-0.30 )
 	${DEPEND}
 "
-PROVIDE="
-	virtual/mta
-	virtual/mda
-"
 
 pkg_setup() {
 	if [[ -n "${QMAIL_PATCH_DIR}" ]]; then
-- 
cgit v1.2.3