change to new style virtual/mta - bug 360305. remove mailwrapper support - bug 158003

(Portage version: 2.1.9.45/cvs/Linux x86_64)

2 files changed, 19 insertions, 35 deletions

diff --git a/mail-mta/sendmail/ChangeLog b/mail-mta/sendmail/ChangeLog
index 7e497287fa96..ff356a9696cd 100644
--- a/mail-mta/sendmail/ChangeLog
+++ b/mail-mta/sendmail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-mta/sendmail
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/ChangeLog,v 1.93 2011/03/28 09:47:24 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/ChangeLog,v 1.94 2011/03/28 09:53:41 eras Exp $
+
+  28 Mar 2011; Eray Aslan <eras@gentoo.org> sendmail-8.14.4.ebuild:
+  change to new style virtual/mta - bug 360305. remove mailwrapper support -
+  bug 158003
 
   28 Mar 2011; Eray Aslan <eras@gentoo.org> -sendmail-8.14.0.ebuild,
   -sendmail-8.14.1.ebuild, -sendmail-8.14.2.ebuild,
diff --git a/mail-mta/sendmail/sendmail-8.14.4.ebuild b/mail-mta/sendmail/sendmail-8.14.4.ebuild
index 0adc055e9297..46ce05b99cc9 100644
--- a/mail-mta/sendmail/sendmail-8.14.4.ebuild
+++ b/mail-mta/sendmail/sendmail-8.14.4.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/sendmail/sendmail-8.14.4.ebuild,v 1.7 2011/01/10 13:47:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/sendmail-8.14.4.ebuild,v 1.8 2011/03/28 09:53:41 eras Exp $
 
 EAPI="2"
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.sendmail.org/pub/${PN}/${PN}.${PV}.tar.gz"
 LICENSE="Sendmail"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE="ssl ldap sasl tcpd mbox mailwrapper ipv6 nis sockets"
+IUSE="ssl ldap sasl tcpd mbox ipv6 nis sockets"
 
 DEPEND="net-mail/mailbase
 	sys-devel/m4
@@ -26,10 +26,19 @@ DEPEND="net-mail/mailbase
 	"
 RDEPEND="${DEPEND}
 	>=net-mail/mailbase-0.00
-	!mailwrapper? ( !virtual/mta !net-mail/mailwrapper )
-	mailwrapper? ( >=net-mail/mailwrapper-0.2 )"
+	!mail-mta/courier
+	!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/ssmtp"
+
 PDEPEND="!mbox? ( mail-filter/procmail )"
-PROVIDE="virtual/mta"
 
 # libmilter library is part of sendmail, but it does not share the version number with it.
 # In order to find the right libmilter version number, check SMFI_VERSION definition
@@ -177,33 +186,4 @@ src_install () {
 	doinitd "${FILESDIR}"/sendmail
 	keepdir /usr/adm/sm.bin
 
-	if use mailwrapper
-	then
-		mv "${D}"/usr/sbin/sendmail "${D}"/usr/sbin/sendmail.sendmail
-		insinto /etc/mail
-		doins "${FILESDIR}"/mailer.conf
-		rm "${D}"/usr/bin/mailq
-		rm "${D}"/usr/bin/newaliases
-		mv "${D}"/usr/share/man/man8/sendmail.8 \
-			"${D}"/usr/share/man/man8/sendmail-sendmail.8
-		mv "${D}"/usr/share/man/man1/mailq.1 \
-			"${D}"/usr/share/man/man1/mailq-sendmail.1
-		mv "${D}"/usr/share/man/man1/newaliases.1 \
-			"${D}"/usr/share/man/man1/newaliases-sendmail.1
-		mv "${D}"/usr/share/man/man5/aliases.5 \
-			"${D}"/usr/share/man/man5/aliases-sendmail.5
-		dosed 's/} sendmail/} sendmail.sendmail/' /etc/init.d/sendmail
-		dosed 's/sbin\/sendmail/sbin\/sendmail.sendmail/' /etc/init.d/sendmail
-	fi
-
-}
-
-pkg_postinst() {
-	if ! use mailwrapper && [[ -e /etc/mailer.conf ]]
-	then
-		elog
-		elog "Since you emerged sendmail without mailwrapper in USE,"
-		elog "you probably want to 'emerge -C mailwrapper' now."
-		elog
-	fi
 }