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, 43 insertions, 31 deletions

diff --git a/mail-mta/netqmail/netqmail-1.05-r4.ebuild b/mail-mta/netqmail/netqmail-1.05-r4.ebuild
index 1c288aa8c5ee..026051769984 100644
--- a/mail-mta/netqmail/netqmail-1.05-r4.ebuild
+++ b/mail-mta/netqmail/netqmail-1.05-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/netqmail-1.05-r4.ebuild,v 1.26 2011/03/16 11:03:37 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/netqmail-1.05-r4.ebuild,v 1.27 2011/03/28 09:32:33 eras Exp $
 
 inherit eutils toolchain-funcs fixheadtails flag-o-matic
 
@@ -25,7 +25,7 @@ SRC_URI="
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="gencertdaily highvolume mailwrapper noauthcram qmail-spp ssl vanilla"
+IUSE="gencertdaily highvolume noauthcram qmail-spp ssl vanilla"
 RESTRICT="test"
 
 DEPEND="
@@ -35,8 +35,17 @@ 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
 	virtual/daemontools
 	net-mail/dot-forward
@@ -46,7 +55,6 @@ RDEPEND="
 	)
 	${DEPEND}
 "
-PROVIDE="virtual/mta"
 
 # Important: QMAIL_CONF_SPLIT should always be a prime number!
 MY_CONF_SPLIT="${QMAIL_CONF_SPLIT:-23}"
@@ -186,14 +194,8 @@ src_install() {
 	diropts -m 755
 	dodir /usr/sbin /usr/lib
 
-	if use mailwrapper
-	then
-		insinto /etc/mail
-		doins ${FILESDIR}/mailer.conf
-	else
-		dosym /var/qmail/bin/sendmail /usr/sbin/sendmail
-		dosym /var/qmail/bin/sendmail /usr/lib/sendmail
-	fi
+	dosym /var/qmail/bin/sendmail /usr/sbin/sendmail
+	dosym /var/qmail/bin/sendmail /usr/lib/sendmail
 
 	einfo "Setting up the default aliases ..."
 	diropts -m 700 -o alias -g qmail
diff --git a/mail-mta/netqmail/netqmail-1.05-r8.ebuild b/mail-mta/netqmail/netqmail-1.05-r8.ebuild
index 0e918bba93cb..efbd94f96edd 100644
--- a/mail-mta/netqmail/netqmail-1.05-r8.ebuild
+++ b/mail-mta/netqmail/netqmail-1.05-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/netqmail-1.05-r8.ebuild,v 1.11 2011/03/16 11:03:37 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/netqmail-1.05-r8.ebuild,v 1.12 2011/03/28 09:32:33 eras Exp $
 
 inherit eutils toolchain-funcs fixheadtails flag-o-matic
 
@@ -25,7 +25,7 @@ SRC_URI="
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="gencertdaily highvolume mailwrapper noauthcram qmail-spp ssl vanilla"
+IUSE="gencertdaily highvolume noauthcram qmail-spp ssl vanilla"
 RESTRICT="test"
 
 DEPEND="
@@ -35,8 +35,17 @@ 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
 	virtual/daemontools
 	net-mail/dot-forward
@@ -46,7 +55,6 @@ RDEPEND="
 	)
 	${DEPEND}
 "
-PROVIDE="virtual/mta"
 
 # Important: QMAIL_CONF_SPLIT should always be a prime number!
 MY_CONF_SPLIT="${QMAIL_CONF_SPLIT:-23}"
@@ -196,14 +204,8 @@ src_install() {
 	diropts -m 755
 	dodir /usr/sbin /usr/lib
 
-	if use mailwrapper
-	then
-		insinto /etc/mail
-		doins ${FILESDIR}/mailer.conf
-	else
-		dosym /var/qmail/bin/sendmail /usr/sbin/sendmail
-		dosym /var/qmail/bin/sendmail /usr/lib/sendmail
-	fi
+	dosym /var/qmail/bin/sendmail /usr/sbin/sendmail
+	dosym /var/qmail/bin/sendmail /usr/lib/sendmail
 
 	einfo "Setting up the default aliases ..."
 	diropts -m 700 -o alias -g qmail
diff --git a/mail-mta/netqmail/netqmail-1.06.ebuild b/mail-mta/netqmail/netqmail-1.06.ebuild
index 5661108c1020..6a678becc20d 100644
--- a/mail-mta/netqmail/netqmail-1.06.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/netqmail-1.06.ebuild,v 1.11 2011/03/16 11:03:37 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/netqmail/netqmail-1.06.ebuild,v 1.12 2011/03/28 09:32:33 eras Exp $
 
 GENQMAIL_PV=20080406
 QMAIL_SPP_PV=0.42
@@ -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,8 +40,17 @@ 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 )
 	virtual/daemontools
@@ -50,7 +59,6 @@ RDEPEND="
 	authcram? ( >=net-mail/cmd5checkpw-0.30 )
 	${DEPEND}
 "
-PROVIDE="virtual/mta"
 
 pkg_setup() {
 	if [[ -n "${QMAIL_PATCH_DIR}" ]]; then