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

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

3 files changed, 34 insertions, 50 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/Manifest b/mail-mta/sendmail/Manifest
index 512e155c9536..0b13d6b95e18 100644
--- a/mail-mta/sendmail/Manifest
+++ b/mail-mta/sendmail/Manifest
@@ -11,23 +11,23 @@ AUX sendmail-procmail.mc 357 RMD160 e912a3d2f91fc60e0856e1a537b9a9851788172f SHA
 AUX sendmail.mc 299 RMD160 cb659c515cc2b5de750b645fbcfb7a8a60ad60ae SHA1 c93483684c46356cd1d09899517539c5406b5bd0 SHA256 fbf4f2bf7826cabf2072f6c113b3616c1dffd580864d708e344b5f334f1a8a38
 AUX site.config.m4 564 RMD160 5e27f44c72947cdb4f00aaed618691db5a1c9489 SHA1 df71882eb8b19f7779ae349d07665849aa6c2781 SHA256 3a7d586f8dfc24f7ed53621c04374aeca91153ded80cf17411ce417a45aade44
 DIST sendmail.8.14.4.tar.gz 2080472 RMD160 d998062ee6b4e80eb90cc6e790f971bd02b52254 SHA1 ba192f9a5114437aaec952f503fa2f09ee6dbe57 SHA256 bc0109437c5018b3ea8999edb63506db2f3b31c4c1ab4367cb56236a7df97cb1
-EBUILD sendmail-8.14.4.ebuild 7587 RMD160 550cd2202337ca86a970455f6e2e7730947ef3a9 SHA1 ab3494b72b9dc5fe8a611189f641eaedf45e9419 SHA256 588ed88fa7ec536704d26cc45e714f4e5893cd5844ac8ecc768268a5c5a418aa
-MISC ChangeLog 20592 RMD160 da3f0eaea65ac121e2f225013716548c69e4ce51 SHA1 83b8a159a774b507754f53802d4529cfe014f11c SHA256 45b2179a51ba6f6f36d2a48b30e652479415426f75a6b729496f2065993c8a1f
+EBUILD sendmail-8.14.4.ebuild 6729 RMD160 e959d66a88146892d1d2d15fd7e2c47dc3269d4b SHA1 aae599ab8c971fc8a75e2fd7f3ff43d410c6e7fe SHA256 516b30e07b4f90fb2d70935aa6a77e356f612e1b335aadfcb7ed67fa09acd334
+MISC ChangeLog 20751 RMD160 cb7be16fb7cd061c8b55ed885b771ba2f04820cc SHA1 7c7e8d3154a171e84337052d647581138609dc8e SHA256 406f23dad53ff454b75da306f6e8e0508babbe2d88475fa78901c8e9ab5f156c
 MISC metadata.xml 162 RMD160 fd38b82541901b3c6df18b630d79fe7883ae3f01 SHA1 e6aecefcc2137d6047cedfe447686775ab59cb48 SHA256 569031668e39895fb20829fb17a49a91a83e8f41b2195b0f04825c4340d2af6b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNkFk6AAoJEHfx8XVYajsfOEYP/A/AtWH4H234bdJuZX6KLrdI
-nUtlw8NvOmpxodRf6d27UR5g3QxAprb9/dDDfGK/xPOWqu2RT3RQ17XpZS1L2xOl
-R2BWTz1ZX53qfwQ7/YFGSGSOrt5svNeg1Ebt4i0Iqb9jDdkorgEZ+7PmaSsmqqet
-tO5TQuJ2gLJo3zSJE6ITPf5l1pxg50ovN/7pZobKttz/p/SPKTanitQXirCIdnl/
-Upq3pqiI+pBDW6bgq/ze+b5InKybcGYpVIuHS5hTYbUSwjYLhN882HG3HWfCikJA
-CNXsRBO5EmPSNP+ubfajTpeCETHPV19loTm8H4CiFYHczpX9B6kDeypaAPLxjF8F
-hMAUjKJce+j/xIqxwrCfq6sUE1Ckp+yD5n4FOqiieZDUwAjRnB/6/lV5CxhMteGy
-DaeCXrNsO5eptGhcl6UT+Rmxu3G75WOdM+jSUkFfj+YnJp5rbUO0Wek2mcPsG13n
-pjq/v3Y6TMw7mkJRlAliV0ub1+vOOBSClOF5Un7iBdDXpigf/BMO6pMSj4NfUzCX
-DT05oS3sjuqcVrCuJdj/Pv0CGkFarm5tRokj5lu6ZYqTvpCfHnsRHwngimMC+Fqe
-OA19NOF4czk6+AHwmXYpHzvDFLZGTob/0VBC0RwVVKDzXXhh3pg3QnLDqONmw34t
-anlVeLk5HF2RGgD7qKXS
-=yJkZ
+iQIcBAEBCAAGBQJNkFqzAAoJEHfx8XVYajsfLO0P/3oItqupTijMzlURdDSuybyp
+xn9LBAAdhjP74SKgQPTj0DV5J5Bgm7SzmTxaabxATUZxZVaE3mKgPbRKFATdfi/l
+TbER7wRdc2TglcsjKbYljjMVL3Wp4rBZrcxVJ50Ng+D1czcZZqJD/39zoUs8U5Ht
+V4yh6/FKwdmanwZxdwcuKwyjIRjqVszl+heYRqG0yCE7sSHx8hwFrCBcYrGVt4fp
+30AYpJvts2bQNX4OXL9Q74IKOy4Uc07ZaZ4f3RkRj0uPQD/Oa07ODhjqTbt946do
+tTkTqSRYTnWq+OV5NqK6Qscz6fPRwrM+SaepOfduEaa/VfzdCU0GXjvzWaOAVWiD
+NSvOxho6trUNP6A4tGXGwAypetgiljqkMFa77L072/VJyvOubtVL2k4pU6/TJ40Y
+ZKJik9MLuk7ipNEIaVSO/CDsbiC9mpL0fftGlCt4AgeHpNoW4NkIZLsBoX4OlcFV
+d5kXl3O0+dDQP464vvRZPM6rjFXrYYTK2uCOF7kUWDy7LX0Tcfgq1pVWqawxitKS
+gvFb2/LdQ8c5z5gufN4GQl/zNUxavr4WpUa6jaXvfEQNSS51inlbehSHOG6W05fQ
+3zORLy4BVmyP9JK1umc8I1wbqg9C3UVsjBLKv2avOo3+b+WDfPjEJLhjqki28+T+
+88/eXPv+UrEn4POLu9MY
+=P/gX
 -----END PGP SIGNATURE-----
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
 }