Handle rmail binary. Bug #97589.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 18 insertions, 12 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index 5d28b1b7df0b..d506006615c6 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.74 2005/07/04 14:38:27 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.75 2005/07/05 01:04:50 ticho Exp $
+
+  04 Jul 2005; Andrej Kacian <ticho@gentoo.org> files/mailer.conf,
+  postfix-2.2.3-r1.ebuild:
+  Handle rmail binary.
 
   04 Jul 2005; Andrej Kacian <ticho@gentoo.org> postfix-2.2.3-r1.ebuild:
   Added compatibility with mailer-config-0.2 - manpages. Bug #97589.
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index fecf30a95361..cab9a1d89194 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,13 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 8529168be77f27c39de88158d39b0ce0 postfix-2.2.3-r1.ebuild 10036
+MD5 50bdfedb095a88f45eb1371f3c378171 postfix-2.2.3-r1.ebuild 10091
 MD5 d2f97ac7ba19997b4e588b28009d684d postfix-2.2.1.ebuild 9296
 MD5 17007a983ae776242105a163124927e4 postfix-2.2.3.ebuild 9712
 MD5 ac642c2fcdc34d3e9b70b2357ce57ee8 postfix-2.2.2-r1.ebuild 9957
 MD5 2372d5dbf4de3ed67393879f2338b052 postfix-2.2.1-r1.ebuild 9944
 MD5 eb7d97dd738129a9917cf2f56860c134 postfix-2.2.2.ebuild 9941
-MD5 000bbfccefa3970038f5a91068dbe1f7 ChangeLog 34372
+MD5 91f7bb83673555dc93569f430b25be20 ChangeLog 34490
 MD5 86c229fe394877d2c6a26aa5367bc697 metadata.xml 253
 MD5 2aa3c8bc49f3d08ab5f2ce9fc6a490a4 postfix-2.1.5-r2.ebuild 7517
 MD5 8041570a9a7f31bb704af754b0d0b3e6 postfix-2.2.4.ebuild 8815
@@ -25,14 +25,14 @@ MD5 ecc87f9acb3c2395d2d7fe1a673755aa files/digest-postfix-2.2.1 135
 MD5 9419f5dcc490b61ca76278d744bd878f files/digest-postfix-2.2.2 135
 MD5 0726f3fb8ba3f25ea5bfc251d2d96cfb files/digest-postfix-2.2.3 135
 MD5 ff949f18a6d77e67fba4ed20907d0592 files/digest-postfix-2.2.4 135
-MD5 fd01735093dde1691a849d9bf002bf5c files/mailer.conf 408
+MD5 a3c32f8c9d1344be08f018d377a61f59 files/mailer.conf 438
 MD5 a41e637c45f2bbc39a37d8f704722164 files/postfix.rc6.2.2.3 633
 MD5 8d7d372a5e867ebc0b1644ee19105e4e files/postfix.rc6.2.2.4 637
 MD5 502e444ec6b9d6fb9bbef3bb0f5e284a files/smtp.pam 254
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCyUn9QlM6RnzZP+IRAt/rAJ4487Yi3F/I04TtvueCNP82omKn6QCgpoQF
-nUDyO6hw3AylGDZ2TXaobJc=
-=TBYP
+iD8DBQFCydzDQlM6RnzZP+IRAiREAJ994lIuhrI9KUC3kWyVQlZ8mZVwjACgwuaz
+Q3sGs3BxROf+CTyC00u50zw=
+=hzuB
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/files/mailer.conf b/mail-mta/postfix/files/mailer.conf
index 937cbfcfe263..466295877bde 100644
--- a/mail-mta/postfix/files/mailer.conf
+++ b/mail-mta/postfix/files/mailer.conf
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/files/mailer.conf,v 1.4 2005/05/04 09:52:10 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/files/mailer.conf,v 1.5 2005/07/05 01:04:50 ticho Exp $
 # $OpenBSD: mailer.conf,v 1.3 2000/04/06 18:24:19 millert Exp $
 
 # Execute the "real" sendmail program from postfix, 
@@ -8,3 +8,4 @@ sendmail	/usr/sbin/sendmail.postfix
 send-mail	/usr/sbin/sendmail.postfix
 mailq		/usr/sbin/sendmail.postfix
 newaliases	/usr/sbin/sendmail.postfix
+rmail		/usr/bin/rmail.postfix
diff --git a/mail-mta/postfix/postfix-2.2.3-r1.ebuild b/mail-mta/postfix/postfix-2.2.3-r1.ebuild
index 3caae23eb019..9b5f244931bb 100644
--- a/mail-mta/postfix/postfix-2.2.3-r1.ebuild
+++ b/mail-mta/postfix/postfix-2.2.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.2.3-r1.ebuild,v 1.3 2005/07/04 14:37:26 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.2.3-r1.ebuild,v 1.4 2005/07/05 01:04:50 ticho Exp $
 
 inherit eutils ssl-cert toolchain-funcs flag-o-matic mailer pam
 IUSE="ipv6 pam ldap mysql postgres ssl sasl mbox nis vda selinux hardened"
@@ -235,9 +235,13 @@ src_install () {
 	rm -rf "${D}/var"
 	keepdir /var/spool/postfix
 
+	# Install an rmail for UUCP, closing bug #19127.
+	dobin auxiliary/rmail/rmail
+
 	# mailwrapper stuff
 	if use mailwrapper ; then
 		mv "${D}/usr/sbin/sendmail" "${D}/usr/sbin/sendmail.postfix"
+		mv "${D}/usr/bin/rmail" "${D}/usr/bin/rmail.postfix"
 		rm "${D}/usr/bin/mailq" "${D}/usr/bin/newaliases"
 
 		mv "${D}/usr/share/man/man1/sendmail.1" \
@@ -254,9 +258,6 @@ src_install () {
 		dosym /usr/sbin/sendmail /usr/lib/sendmail
 	fi
 
-	# Install an rmail for UUCP, closing bug #19127.
-	dobin auxiliary/rmail/rmail
-
 	# Install qshape tool.
 	dobin auxiliary/qshape/qshape.pl