use net instead of need net in 2.2.3 initscript. bug #96850.

Package-Manager: portage-2.0.51.22-r1

5 files changed, 36 insertions, 15 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index d506006615c6..7d5b4889041a 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,15 @@
 # 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.75 2005/07/05 01:04:50 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.76 2005/07/07 02:27:10 ticho Exp $
+
+  07 Jul 2005; Andrej Kacian <ticho@gentoo.org> files/postfix.rc6.2.2.3,
+  postfix-2.2.3-r1.ebuild, postfix-2.2.4.ebuild:
+  Changed 'need net' to 'use net'. Bug #96850, by Akos Ladanyi <ladanyi at
+  tmit.bme.hu>.
+
+  05 Jul 2005; Andrej Kacian <ticho@gentoo.org> postfix-2.2.3-r1.ebuild,
+  postfix-2.2.4.ebuild:
+  Update 2.2.4 with latest mailer-config stuff (rmail binary). Bug #97589.
 
   04 Jul 2005; Andrej Kacian <ticho@gentoo.org> files/mailer.conf,
   postfix-2.2.3-r1.ebuild:
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index cab9a1d89194..ff729dd58806 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 50bdfedb095a88f45eb1371f3c378171 postfix-2.2.3-r1.ebuild 10091
+MD5 cbc02a5a067aa0ce18e6f61ba7093f16 postfix-2.2.3-r1.ebuild 10092
 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 91f7bb83673555dc93569f430b25be20 ChangeLog 34490
+MD5 fcbc15dc80c7058b65ca3791e52f0ff2 ChangeLog 34877
 MD5 86c229fe394877d2c6a26aa5367bc697 metadata.xml 253
 MD5 2aa3c8bc49f3d08ab5f2ce9fc6a490a4 postfix-2.1.5-r2.ebuild 7517
-MD5 8041570a9a7f31bb704af754b0d0b3e6 postfix-2.2.4.ebuild 8815
+MD5 cb96fca148894ddc7332b31811474c2e postfix-2.2.4.ebuild 9232
 MD5 19504e91dd051f1af469b3a2fcbaaacd postfix-2.2.2-r2.ebuild 9709
 MD5 98872da0bd186c6e0d2b884b0fa28b78 files/postfix.rc6 610
 MD5 889559c8b5d02597e9e7eec89e328360 files/smtp.pass 141
@@ -26,13 +26,13 @@ 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 a3c32f8c9d1344be08f018d377a61f59 files/mailer.conf 438
-MD5 a41e637c45f2bbc39a37d8f704722164 files/postfix.rc6.2.2.3 633
+MD5 7369b2e934a2a30e996698b28849c224 files/postfix.rc6.2.2.3 632
 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)
 
-iD8DBQFCydzDQlM6RnzZP+IRAiREAJ994lIuhrI9KUC3kWyVQlZ8mZVwjACgwuaz
-Q3sGs3BxROf+CTyC00u50zw=
-=hzuB
+iD8DBQFCzJMVQlM6RnzZP+IRAtEdAKCQvar60eyeE6fwxgtYoRk9qT+GqACfWiT6
+XosjNNls5EG23FyUDsrcIfQ=
+=1HtX
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/files/postfix.rc6.2.2.3 b/mail-mta/postfix/files/postfix.rc6.2.2.3
index 07bbee0e388d..60a6c71f9575 100644
--- a/mail-mta/postfix/files/postfix.rc6.2.2.3
+++ b/mail-mta/postfix/files/postfix.rc6.2.2.3
@@ -1,12 +1,12 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/files/postfix.rc6.2.2.3,v 1.1 2005/06/18 23:18:29 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/files/postfix.rc6.2.2.3,v 1.2 2005/07/07 02:27:10 ticho Exp $
 
 opts="${opts} reload"
 
 depend() {
-	need net
+	use net
 	use logger dns ypbind amavisd mysql postgresql antivirus postfix_greylist
 	provide mta
 }
diff --git a/mail-mta/postfix/postfix-2.2.3-r1.ebuild b/mail-mta/postfix/postfix-2.2.3-r1.ebuild
index 9b5f244931bb..c177281bcdeb 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.4 2005/07/05 01:04:50 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.2.3-r1.ebuild,v 1.5 2005/07/07 02:27:10 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"
@@ -252,6 +252,7 @@ src_install () {
 			"${D}/usr/share/man/man1/mailq-postfix.1"
 		mv "${D}/usr/share/man/man5/aliases.5" \
 			"${D}/usr/share/man/man5/aliases-postfix.5"
+
 		mailer_install_conf
 	else
 		# Provide another link for legacy FSH.
diff --git a/mail-mta/postfix/postfix-2.2.4.ebuild b/mail-mta/postfix/postfix-2.2.4.ebuild
index bf2db8c9db9b..a940cb78ec93 100644
--- a/mail-mta/postfix/postfix-2.2.4.ebuild
+++ b/mail-mta/postfix/postfix-2.2.4.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.4.ebuild,v 1.1 2005/06/29 15:10:13 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.2.4.ebuild,v 1.2 2005/07/07 02:27:10 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"
@@ -212,19 +212,30 @@ 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" \
+			"${D}/usr/share/man/man1/sendmail-postfix.1"
+		mv "${D}/usr/share/man/man1/newaliases.1" \
+			"${D}/usr/share/man/man1/newaliases-postfix.1"
+		mv "${D}/usr/share/man/man1/mailq.1" \
+			"${D}/usr/share/man/man1/mailq-postfix.1"
+		mv "${D}/usr/share/man/man5/aliases.5" \
+			"${D}/usr/share/man/man5/aliases-postfix.5"
+
 		mailer_install_conf
 	else
 		# Provide another link for legacy FSH.
 		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