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

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

7 files changed, 123 insertions, 142 deletions

diff --git a/mail-mta/courier/ChangeLog b/mail-mta/courier/ChangeLog
index 378793f0f163..1e5bf76ac594 100644
--- a/mail-mta/courier/ChangeLog
+++ b/mail-mta/courier/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-mta/courier
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.141 2011/03/27 15:11:33 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.142 2011/03/28 07:46:40 eras Exp $
+
+  28 Mar 2011; Eray Aslan <eras@gentoo.org> courier-0.59.0.ebuild,
+  courier-0.62.2.ebuild, courier-0.64.1.ebuild, courier-0.65.2.ebuild,
+  courier-0.65.2-r1.ebuild:
+  Change to new style virtual/mta - bug 360305. Remove mailwrapper support -
+  bug 158003
 
   27 Mar 2011; Brent Baude <ranger@gentoo.org> courier-0.65.2-r1.ebuild:
   Marking courier-0.65.2-r1 ppc for bug 359303
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index 3d052be306e9..c7cb7cacc14d 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX apache-sqwebmail.inc 347 RMD160 9d046149af6138320448fe7bb762b142e0eb9b94 SHA1 4996c33b74a3c9b70886f27948334e3880df8073 SHA256 3a6616dacfd49ab0c89c62d9df5662fc3c2d9e598786d781240bf5e8900afc65
 AUX bofh 23 RMD160 995b6b103c29f390c2f0230af95d4c0823423dcb SHA1 f6399bc612af33ca79921961b223cbdf394d9549 SHA256 7e42d61373770a2b14a6fdd8b5f71c598ce4767726f8f7106de00b7c34a59e8c
 AUX courier-0.59.0-asneeded.patch 534 RMD160 fe2f28235842220d999dc77ed22857dd99c648a2 SHA1 5ae8a8cefbbd91f2146988c9095ac0e3668c1135 SHA256 802ae0431c9d2b55cdda4602522058874765170d12f4e2fcdd064971f8d31991
@@ -14,10 +17,27 @@ DIST courier-0.59.0.tar.bz2 7121762 RMD160 580e57fd9d39b62772e07dcdec653379cd21c
 DIST courier-0.62.2.tar.bz2 7132042 RMD160 787b0240a0683350d0d1d7fc5220505d82579af7 SHA1 f7c49a86dc6560e4ab33870c9ac4983aac03949b SHA256 7b129ee12bb0f942354fb09527f706821556a0aa824798cafd004b8f60da2964
 DIST courier-0.64.1.tar.bz2 7131375 RMD160 f7a0733ab2c4f8e0743bbe8b0fb4c44a5d75ceec SHA1 c8b81a2deb87ce07c74033fae807a498e4958e52 SHA256 b1cc5d95b256b7467743bcd78536c952febe3bfd7926fcc51742bf105deaadee
 DIST courier-0.65.2.tar.bz2 7152680 RMD160 6a81f74c85f9e78e6514f840598dde634fe070ce SHA1 784893216ea6c43c91606fa550cfdff13060855d SHA256 496361b8734381ba6128c7b0d5fe4c64ce7d807c01a74aae2cb5be8bb29e5ab2
-EBUILD courier-0.59.0.ebuild 10330 RMD160 be141060d64abacbfa54001672a30297d55e5120 SHA1 d4bd69e91204d46774f9baea325a091663908a52 SHA256 495fd049a3b60eb33420875dd0f1a7c90aeba44519d1c9907784cee298386591
-EBUILD courier-0.62.2.ebuild 9432 RMD160 f3b65515e82f77a02ee2979949ebf8accacc5a2d SHA1 1959b6b8340c9ea1247c84184c3e52abc2a17f2e SHA256 cea647832c024069c7c3f050046cce599639bd77b6fd51299d2771ef6b6c81c5
-EBUILD courier-0.64.1.ebuild 9435 RMD160 4b9a7b46b7d39a456e9d81d69689673bb494049f SHA1 7c61157d9825713d06b858e47177e98500198b3a SHA256 fe92ae161e854981801b56cf97a3e46eecf910aa1ea5a99a53be59a6147ab3c1
-EBUILD courier-0.65.2-r1.ebuild 9441 RMD160 145df4441353e4e99e50a0b22ff4a8715615a0e6 SHA1 f2a6ae068d52699134374be7d1b08a0ec81dfda9 SHA256 4b0513a9b7cc9886f98359dfdd5532990bd959a61c9f3a45257d4ebf27a8b8c3
-EBUILD courier-0.65.2.ebuild 9438 RMD160 c498b1105a2dba53e3f40365b2c65ef073f35bdc SHA1 286bef6da5a1aaa062ec6a5ef238a1c268131446 SHA256 1d8caff3882eb5a5b24a4a22bbdbf1facf05d23ff1fa0274996f69ece8fa9dc3
-MISC ChangeLog 34026 RMD160 52ca7023b7a12751373db491251c62e7d6caa055 SHA1 e99e7bf4bcd087b4d3cee5f849a1ca1719f57c9f SHA256 123484c6262df6e5b354aa08b5b6bd9822ebef1c6f36adaa7e1629019fefb6bc
+EBUILD courier-0.59.0.ebuild 9874 RMD160 831c5d53e35125968efe1e6354af02800c43532c SHA1 ad575b8457905eb662a55d998288f18cd3380e12 SHA256 2d2544abd38b1d579242ea95687cfcac60c1c68c65d0f5db43c174daf7d6df74
+EBUILD courier-0.62.2.ebuild 8977 RMD160 494b1c72f1447ffe8b534fe7eb2feaacd9280c36 SHA1 cd82d9dcda0472c929f8ec9574d7f10f532a48f4 SHA256 dae8e9ca31903a88b795089d45db4ef31f5ce9c3352f11306622e741197e1b67
+EBUILD courier-0.64.1.ebuild 8979 RMD160 1ac0b0fab6cc17307750ef48c16d42c3582a04c3 SHA1 be9b2e34644ea5d75eb931f15ada7ae0cdb2df82 SHA256 52e401655ec5c9ee5352168aa2a4da9b785d6a46ca65a7a56fce4a14fa5d0b77
+EBUILD courier-0.65.2-r1.ebuild 8983 RMD160 127f9b80cdc919484c0acacb5b712cf27b1b5531 SHA1 82188d89dcf6ef08070f63f15ac6fe76f853d0e6 SHA256 6f694a2a3b823a2cb82d971cbac2f095c4754307f8cfdb7375a0fa2392d6aed1
+EBUILD courier-0.65.2.ebuild 8982 RMD160 8616d7860986844ea951ec2a2dd5d78f9f75fd91 SHA1 f8e213f494d6ddf823917a1e522928aa596e8d55 SHA256 c4dc8c4f44a38ff9831aa922e281284f0a57c0a99a68d7fdb76d67ec32b3c550
+MISC ChangeLog 34281 RMD160 45c7d7dd91d3f0ea9df49460d338d4feb2a50f60 SHA1 3d943d2ac262b64d6ca3efe935f0cd09d77a0169 SHA256 c4cb6589e3a4eb0b9d3741da52429c046db943d2b44874722f260e3d669c5d37
 MISC metadata.xml 688 RMD160 d6ea2c5c87e6f305adfef15da4cbc91affe577af SHA1 eaa2f9fea774bdbc651a59929e2fa84f2292b335 SHA256 1cb15a4a98fc9fae0e167e7aa9f8672f3456af2320bb3f8f011ecb612eaa1557
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCAAGBQJNkDzzAAoJEHfx8XVYajsf7vsP/jbHwV3XBtTmRtmgpBJfT3nf
+286yxuD/ykvvChkzq0grY6YfBx8cvSuSIv8UK2WeuqSYfsPxX41iQdJhNnI6eKco
+EX9mvO2KpwMTK3BRpcNMtxIkv/PaZ43/fsqFPt6i+L2lHVm7Xv3rEeCNUlUDIfX6
+o0k9xnsYB4LIcrj2F4EOutocZJKPOWD4Xtm20jqE5j55X89k94LDTqJulYK6asEl
+p/PNVESKR0i6MKYo7G9Sh1wmr7o+5UxS8dkyCu4cUJkPjVygAFgfLbvpJd4hzgu9
+hyK4CE/IGZh9C6wMK5QpBuhmaDAdmmHCkMLG/Rw+oASzFF1xgmMpdXw2MXy0Q3LV
+Emdn5wtj8QOdaKJ3rlCNL605dpu2X0akHp98FulncqxzXmxsHkMm7bq2iLX180eA
+spjOkJJT7mzrrZhb/ON2qYk2O/FHqKUVprwTTDREUVneTRYDWDKl6pRgZe2NmKs+
+V+NDBIuvgTvbMA0CHd8y7elvgoj9AnFXRlrFUDecUmRnnxlpTIfErOAEjf74Z95L
+9d2Ib2eeqLPvesB5bNcvse63HG/5Uzjwa6oREe3QsxXAzkJC6nwH0giMdLU6wkWe
+lnp7RM0jSPyqOyrnn/YeSSNllfWnOOd7KuZzYsIviEwUvbO+sYIQrxa1hwaH2ttV
+N4+C0cm6WIQYTNz6H6vw
+=Ol7D
+-----END PGP SIGNATURE-----
diff --git a/mail-mta/courier/courier-0.59.0.ebuild b/mail-mta/courier/courier-0.59.0.ebuild
index cd7afc570a11..318b63ce0f2c 100644
--- a/mail-mta/courier/courier-0.59.0.ebuild
+++ b/mail-mta/courier/courier-0.59.0.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/courier/courier-0.59.0.ebuild,v 1.18 2011/03/19 17:19:31 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.59.0.ebuild,v 1.19 2011/03/28 07:46:40 eras Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -18,11 +18,9 @@ SLOT="0"
 LICENSE="GPL-2"
 # not in keywords due to missing dependencies: ~arm ~s390 ~ppc64
 KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite mailwrapper \
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
 	fam web webmail"
 
-PROVIDE="virtual/mta"
-
 DEPEND="
 	>=net-libs/courier-authlib-0.59
 	>=dev-libs/openssl-0.9.6
@@ -36,14 +34,25 @@ DEPEND="
 	postgres? ( dev-db/postgresql-base )
 	spell? ( virtual/aspell-dict )
 	fam? ( virtual/fam )
-	!mailwrapper? ( !virtual/mta )
-	!mail-filter/maildrop"
+	!mail-filter/maildrop
+	!mail-mta/esmtp
+	!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
+	"
 
 RDEPEND="${DEPEND}
 	dev-lang/perl
 	sys-process/procps"
 
-# get rid of old style virtual - bug 350792
+# get rid of old style virtual/imapd - bug 350792
 # all blockers really needed?
 RDEPEND="${RDEPEND}
 	!net-mail/dovecot
@@ -52,8 +61,7 @@ RDEPEND="${RDEPEND}
 	!net-mail/cyrus-imapd
 	!net-mail/uw-imap"
 
-PDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	pam? ( net-mail/mailbase )
+PDEPEND="pam? ( net-mail/mailbase )
 	crypt? ( >=app-crypt/gnupg-1.0.4 )"
 
 filter-flags '-fomit-frame-pointer'
@@ -231,24 +239,7 @@ src_install() {
 	# users should be able to send mail. Could be restricted with suictl.
 	chmod u+s "${D}/usr/bin/sendmail"
 
-	if use mailwrapper ; then
-		mv "${D}/usr/bin/sendmail" "${D}/usr/bin/sendmail.courier"
-		mv "${D}/usr/bin/rmail" "${D}/usr/bin/rmail.courier"
-		mv "${D}/usr/bin/mailq" "${D}/usr/bin/mailq.courier"
-
-		mv "${D}/usr/share/man/man1/sendmail.1" \
-			"${D}/usr/share/man/man1/sendmail-courier.1"
-		mv "${D}/usr/share/man/man1/mailq.1" \
-			"${D}/usr/share/man/man1/mailq-courier.1"
-		mv "${D}/usr/share/man/man1/rmail.1" \
-			"${D}/usr/share/man/man1/rmail-courier.1"
-
-		insopts -m 444 -o mail -g mail
-		insinto /etc/mail
-		doins "${FILESDIR}/mailer.conf"
-	else
-		dosym /usr/bin/sendmail /usr/sbin/sendmail
-	fi
+	dosym /usr/bin/sendmail /usr/sbin/sendmail
 }
 
 src_test() {
diff --git a/mail-mta/courier/courier-0.62.2.ebuild b/mail-mta/courier/courier-0.62.2.ebuild
index e31c3c3518f7..077da98d4de9 100644
--- a/mail-mta/courier/courier-0.62.2.ebuild
+++ b/mail-mta/courier/courier-0.62.2.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/courier/courier-0.62.2.ebuild,v 1.9 2011/03/19 17:19:31 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.62.2.ebuild,v 1.10 2011/03/28 07:46:40 eras Exp $
 
 inherit eutils flag-o-matic
 
@@ -11,11 +11,9 @@ SLOT="0"
 LICENSE="GPL-2"
 # not in keywords due to missing dependencies: ~arm ~s390 ~ppc64
 KEYWORDS="alpha amd64 ~hppa ia64 ppc sparc x86"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite mailwrapper \
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
 	fam web webmail"
 
-PROVIDE="virtual/mta"
-
 DEPEND="
 	>=net-libs/courier-authlib-0.61.0
 	>=dev-libs/openssl-0.9.6
@@ -29,14 +27,25 @@ DEPEND="
 	postgres? ( dev-db/postgresql-base )
 	spell? ( virtual/aspell-dict )
 	fam? ( virtual/fam )
-	!mailwrapper? ( !virtual/mta )
-	!mail-filter/maildrop"
+	!mail-filter/maildrop
+	!mail-mta/esmtp
+	!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
+	"
 
 RDEPEND="${DEPEND}
 	dev-lang/perl
 	sys-process/procps"
 
-# get rid of old style virtual - bug 350792
+# get rid of old style virtual/imapd - bug 350792
 # all blockers really needed?
 RDEPEND="${RDEPEND}
 	!net-mail/dovecot
@@ -45,8 +54,7 @@ RDEPEND="${RDEPEND}
 	!net-mail/cyrus-imapd
 	!net-mail/uw-imap"
 
-PDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	pam? ( net-mail/mailbase )
+PDEPEND="pam? ( net-mail/mailbase )
 	crypt? ( >=app-crypt/gnupg-1.0.4 )"
 
 src_unpack() {
@@ -212,24 +220,7 @@ src_install() {
 	# users should be able to send mail. Could be restricted with suictl.
 	chmod u+s "${D}/usr/bin/sendmail"
 
-	if use mailwrapper ; then
-		mv "${D}/usr/bin/sendmail" "${D}/usr/bin/sendmail.courier"
-		mv "${D}/usr/bin/rmail" "${D}/usr/bin/rmail.courier"
-		mv "${D}/usr/bin/mailq" "${D}/usr/bin/mailq.courier"
-
-		mv "${D}/usr/share/man/man1/sendmail.1" \
-			"${D}/usr/share/man/man1/sendmail-courier.1"
-		mv "${D}/usr/share/man/man1/mailq.1" \
-			"${D}/usr/share/man/man1/mailq-courier.1"
-		mv "${D}/usr/share/man/man1/rmail.1" \
-			"${D}/usr/share/man/man1/rmail-courier.1"
-
-		insopts -m 444 -o mail -g mail
-		insinto /etc/mail
-		doins "${FILESDIR}/mailer.conf"
-	else
-		dosym /usr/bin/sendmail /usr/sbin/sendmail
-	fi
+	dosym /usr/bin/sendmail /usr/sbin/sendmail
 }
 
 src_test() {
diff --git a/mail-mta/courier/courier-0.64.1.ebuild b/mail-mta/courier/courier-0.64.1.ebuild
index 06d0aea86b2d..668991a397b1 100644
--- a/mail-mta/courier/courier-0.64.1.ebuild
+++ b/mail-mta/courier/courier-0.64.1.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/courier/courier-0.64.1.ebuild,v 1.8 2011/03/19 17:19:31 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.64.1.ebuild,v 1.9 2011/03/28 07:46:40 eras Exp $
 
 inherit eutils flag-o-matic
 
@@ -11,11 +11,9 @@ SLOT="0"
 LICENSE="GPL-2"
 # not in keywords due to missing dependencies: ~arm ~s390 ~ppc64
 KEYWORDS="~alpha ~amd64 hppa ~ia64 ppc ~sparc x86"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite mailwrapper \
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
 	fam web webmail"
 
-PROVIDE="virtual/mta"
-
 DEPEND="
 	>=net-libs/courier-authlib-0.61.0
 	>=dev-libs/openssl-0.9.6
@@ -29,14 +27,25 @@ DEPEND="
 	postgres? ( dev-db/postgresql-base )
 	spell? ( virtual/aspell-dict )
 	fam? ( virtual/fam )
-	!mailwrapper? ( !virtual/mta )
-	!mail-filter/maildrop"
+	!mail-filter/maildrop
+	!mail-mta/esmtp
+	!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
+	"
 
 RDEPEND="${DEPEND}
 	dev-lang/perl
 	sys-process/procps"
 
-# get rid of old style virtual - bug 350792
+# get rid of old style virtual/imapd - bug 350792
 # all blockers really needed?
 RDEPEND="${RDEPEND}
 	!net-mail/dovecot
@@ -45,8 +54,7 @@ RDEPEND="${RDEPEND}
 	!net-mail/cyrus-imapd
 	!net-mail/uw-imap"
 
-PDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	pam? ( net-mail/mailbase )
+PDEPEND="pam? ( net-mail/mailbase )
 	crypt? ( >=app-crypt/gnupg-1.0.4 )"
 
 src_unpack() {
@@ -212,24 +220,7 @@ src_install() {
 	# users should be able to send mail. Could be restricted with suictl.
 	chmod u+s "${D}/usr/bin/sendmail"
 
-	if use mailwrapper ; then
-		mv "${D}/usr/bin/sendmail" "${D}/usr/bin/sendmail.courier"
-		mv "${D}/usr/bin/rmail" "${D}/usr/bin/rmail.courier"
-		mv "${D}/usr/bin/mailq" "${D}/usr/bin/mailq.courier"
-
-		mv "${D}/usr/share/man/man1/sendmail.1" \
-			"${D}/usr/share/man/man1/sendmail-courier.1"
-		mv "${D}/usr/share/man/man1/mailq.1" \
-			"${D}/usr/share/man/man1/mailq-courier.1"
-		mv "${D}/usr/share/man/man1/rmail.1" \
-			"${D}/usr/share/man/man1/rmail-courier.1"
-
-		insopts -m 444 -o mail -g mail
-		insinto /etc/mail
-		doins "${FILESDIR}/mailer.conf"
-	else
-		dosym /usr/bin/sendmail /usr/sbin/sendmail
-	fi
+	dosym /usr/bin/sendmail /usr/sbin/sendmail
 }
 
 src_test() {
diff --git a/mail-mta/courier/courier-0.65.2-r1.ebuild b/mail-mta/courier/courier-0.65.2-r1.ebuild
index 780a8b101417..38844b1e168a 100644
--- a/mail-mta/courier/courier-0.65.2-r1.ebuild
+++ b/mail-mta/courier/courier-0.65.2-r1.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/courier/courier-0.65.2-r1.ebuild,v 1.7 2011/03/27 15:11:33 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.65.2-r1.ebuild,v 1.8 2011/03/28 07:46:40 eras Exp $
 
 inherit eutils flag-o-matic
 
@@ -11,11 +11,9 @@ SLOT="0"
 LICENSE="GPL-2"
 # not in keywords due to missing dependencies: ~arm ~s390 ~ppc64
 KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ~sparc ~x86"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite mailwrapper \
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
 	fam web webmail"
 
-PROVIDE="virtual/mta"
-
 DEPEND="
 	>=net-libs/courier-authlib-0.61.0
 	>=dev-libs/openssl-0.9.6
@@ -29,14 +27,25 @@ DEPEND="
 	postgres? ( dev-db/postgresql-base )
 	spell? ( virtual/aspell-dict )
 	fam? ( virtual/fam )
-	!mailwrapper? ( !virtual/mta )
-	!mail-filter/maildrop"
+	!mail-filter/maildrop
+	!mail-mta/esmtp
+	!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
+	"
 
 RDEPEND="${DEPEND}
 	dev-lang/perl
 	sys-process/procps"
 
-# get rid of old style virtual - bug 350792
+# get rid of old style virtual/imapd - bug 350792
 # all blockers really needed?
 RDEPEND="${RDEPEND}
 	!net-mail/dovecot
@@ -45,8 +54,7 @@ RDEPEND="${RDEPEND}
 	!net-mail/cyrus-imapd
 	!net-mail/uw-imap"
 
-PDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	pam? ( net-mail/mailbase )
+PDEPEND="pam? ( net-mail/mailbase )
 	crypt? ( >=app-crypt/gnupg-1.0.4 )"
 
 src_unpack() {
@@ -212,24 +220,7 @@ src_install() {
 	# users should be able to send mail. Could be restricted with suictl.
 	chmod u+s "${D}/usr/bin/sendmail"
 
-	if use mailwrapper ; then
-		mv "${D}/usr/bin/sendmail" "${D}/usr/bin/sendmail.courier"
-		mv "${D}/usr/bin/rmail" "${D}/usr/bin/rmail.courier"
-		mv "${D}/usr/bin/mailq" "${D}/usr/bin/mailq.courier"
-
-		mv "${D}/usr/share/man/man1/sendmail.1" \
-			"${D}/usr/share/man/man1/sendmail-courier.1"
-		mv "${D}/usr/share/man/man1/mailq.1" \
-			"${D}/usr/share/man/man1/mailq-courier.1"
-		mv "${D}/usr/share/man/man1/rmail.1" \
-			"${D}/usr/share/man/man1/rmail-courier.1"
-
-		insopts -m 444 -o mail -g mail
-		insinto /etc/mail
-		doins "${FILESDIR}/mailer.conf"
-	else
-		dosym /usr/bin/sendmail /usr/sbin/sendmail
-	fi
+	dosym /usr/bin/sendmail /usr/sbin/sendmail
 }
 
 src_test() {
diff --git a/mail-mta/courier/courier-0.65.2.ebuild b/mail-mta/courier/courier-0.65.2.ebuild
index 6f75710430cb..181f650da722 100644
--- a/mail-mta/courier/courier-0.65.2.ebuild
+++ b/mail-mta/courier/courier-0.65.2.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/courier/courier-0.65.2.ebuild,v 1.3 2011/03/19 17:19:31 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.65.2.ebuild,v 1.4 2011/03/28 07:46:40 eras Exp $
 
 inherit eutils flag-o-matic
 
@@ -11,11 +11,9 @@ SLOT="0"
 LICENSE="GPL-2"
 # not in keywords due to missing dependencies: ~arm ~s390 ~ppc64
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite mailwrapper \
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \
 	fam web webmail"
 
-PROVIDE="virtual/mta"
-
 DEPEND="
 	>=net-libs/courier-authlib-0.61.0
 	>=dev-libs/openssl-0.9.6
@@ -29,14 +27,25 @@ DEPEND="
 	postgres? ( dev-db/postgresql-base )
 	spell? ( virtual/aspell-dict )
 	fam? ( virtual/fam )
-	!mailwrapper? ( !virtual/mta )
-	!mail-filter/maildrop"
+	!mail-filter/maildrop
+	!mail-mta/esmtp
+	!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
+	"
 
 RDEPEND="${DEPEND}
 	dev-lang/perl
 	sys-process/procps"
 
-# get rid of old style virtual - bug 350792
+# get rid of old style virtual/imapd - bug 350792
 # all blockers really needed?
 RDEPEND="${RDEPEND}
 	!net-mail/dovecot
@@ -45,8 +54,7 @@ RDEPEND="${RDEPEND}
 	!net-mail/cyrus-imapd
 	!net-mail/uw-imap"
 
-PDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )
-	pam? ( net-mail/mailbase )
+PDEPEND="pam? ( net-mail/mailbase )
 	crypt? ( >=app-crypt/gnupg-1.0.4 )"
 
 src_unpack() {
@@ -212,24 +220,7 @@ src_install() {
 	# users should be able to send mail. Could be restricted with suictl.
 	chmod u+s "${D}/usr/bin/sendmail"
 
-	if use mailwrapper ; then
-		mv "${D}/usr/bin/sendmail" "${D}/usr/bin/sendmail.courier"
-		mv "${D}/usr/bin/rmail" "${D}/usr/bin/rmail.courier"
-		mv "${D}/usr/bin/mailq" "${D}/usr/bin/mailq.courier"
-
-		mv "${D}/usr/share/man/man1/sendmail.1" \
-			"${D}/usr/share/man/man1/sendmail-courier.1"
-		mv "${D}/usr/share/man/man1/mailq.1" \
-			"${D}/usr/share/man/man1/mailq-courier.1"
-		mv "${D}/usr/share/man/man1/rmail.1" \
-			"${D}/usr/share/man/man1/rmail-courier.1"
-
-		insopts -m 444 -o mail -g mail
-		insinto /etc/mail
-		doins "${FILESDIR}/mailer.conf"
-	else
-		dosym /usr/bin/sendmail /usr/sbin/sendmail
-	fi
+	dosym /usr/bin/sendmail /usr/sbin/sendmail
 }
 
 src_test() {