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

(Portage version: 2.0.51.22-r1)

4 files changed, 29 insertions, 8 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/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