Replacing einfo with elog

(Portage version: 2.1.2.2)

8 files changed, 96 insertions, 90 deletions

diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index 9e2878362e26..6882cffc13ad 100644
--- a/mail-filter/amavisd-new/ChangeLog
+++ b/mail-filter/amavisd-new/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/amavisd-new
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.102 2007/01/31 15:47:27 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.103 2007/03/18 02:44:50 genone Exp $
+
+  18 Mar 2007; Marius Mauch <genone@gentoo.org> amavisd-new-2.3.3-r2.ebuild,
+  amavisd-new-2.4.1.ebuild, amavisd-new-2.4.2.ebuild,
+  amavisd-new-2.4.2-r1.ebuild, amavisd-new-2.4.3.ebuild,
+  amavisd-new-2.4.4.ebuild, amavisd-new-2.4.5.ebuild:
+  Replacing einfo with elog
 
 *amavisd-new-2.4.5 (31 Jan 2007)
 
diff --git a/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild
index dd1a4f440f4b..dd93903386dd 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild,v 1.14 2006/12/10 20:48:12 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild,v 1.15 2007/03/18 02:44:50 genone Exp $
 
 inherit eutils
 
@@ -67,15 +67,15 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	if $(has_version mail-mta/courier) ; then
-		einfo "Patching with courier support."
+		elog "Patching with courier support."
 		epatch "amavisd-new-courier.patch" || die "patch failed"
 	fi
 
 	if $(has_version virtual/qmail) ; then
-		einfo "Patching with qmail qmqp support."
+		elog "Patching with qmail qmqp support."
 		epatch "amavisd-new-qmqpqq.patch" || die "patch failed"
 
-		einfo "Patching with qmail lf bug workaround."
+		elog "Patching with qmail lf bug workaround."
 		epatch "${FILESDIR}/${PN}-2.2.1-qmail-lf-workaround.patch" || die "patch failed"
 	fi
 
@@ -121,7 +121,7 @@ src_install() {
 	keepdir ${AMAVIS_ROOT}/tmp
 
 	if $(has_version net-nds/openldap ) ; then
-		einfo "Adding ${P} schema to openldap schema dir."
+		elog "Adding ${P} schema to openldap schema dir."
 		dodir /etc/openldap/schema
 		insinto /etc/openldap/schema
 		insopts -o root -g root -m 644
@@ -146,13 +146,13 @@ src_install() {
 
 	if $(has_version mail-filter/razor) ; then
 		if [ ! -f ${AMAVIS_ROOT}/.razor/razor-agent.conf ] ; then
-			einfo "Setting up initial razor config files..."
+			elog "Setting up initial razor config files..."
 
 			razor-admin -create -home=${D}/${AMAVIS_ROOT}/.razor
 			sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
 				${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf
 		else
-			einfo "Copying existing razor config files..."
+			elog "Copying existing razor config files..."
 			insinto ${AMAVIS_ROOT}/.razor
 			doins ${AMAVIS_ROOT}/.razor/*.{conf,lst}
 		fi
@@ -165,11 +165,11 @@ src_install() {
 pkg_postinst() {
 	if ! $(has_version mail-filter/spamassassin) ; then
 		echo
-		einfo "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking"
-		einfo "will be performed without it. Since you do not have SpamAssassin installed,"
-		einfo "all spam checks have been disabled. To enable them, install SpamAssassin"
-		einfo "and comment out the line containing: "
-		einfo "@bypass_spam_checks_maps = (1); in /etc/amavisd.conf."
+		elog "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking"
+		elog "will be performed without it. Since you do not have SpamAssassin installed,"
+		elog "all spam checks have been disabled. To enable them, install SpamAssassin"
+		elog "and comment out the line containing: "
+		elog "@bypass_spam_checks_maps = (1); in /etc/amavisd.conf."
 	fi
 	echo
 	ewarn "Adjusting permissions for /etc/amavisd.conf (0 for world, owner root:amavis)"
diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild
index e97a31d31a6d..8b2b028d08fc 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild,v 1.8 2006/12/10 20:48:12 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.1.ebuild,v 1.9 2007/03/18 02:44:50 genone Exp $
 
 inherit eutils
 
@@ -66,15 +66,15 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	if $(has_version mail-mta/courier) ; then
-		einfo "Patching with courier support."
+		elog "Patching with courier support."
 		epatch "amavisd-new-courier.patch" || die "patch failed"
 	fi
 
 	if $(has_version virtual/qmail) ; then
-		einfo "Patching with qmail qmqp support."
+		elog "Patching with qmail qmqp support."
 		epatch "amavisd-new-qmqpqq.patch" || die "patch failed"
 
-		einfo "Patching with qmail lf bug workaround."
+		elog "Patching with qmail lf bug workaround."
 		epatch "${FILESDIR}/${P%.*}-qmail-lf-workaround.patch" || die "patch failed"
 	fi
 
@@ -119,7 +119,7 @@ src_install() {
 	keepdir ${AMAVIS_ROOT}/tmp
 
 	if $(has_version net-nds/openldap ) ; then
-		einfo "Adding ${P} schema to openldap schema dir."
+		elog "Adding ${P} schema to openldap schema dir."
 		dodir /etc/openldap/schema
 		insinto /etc/openldap/schema
 		insopts -o root -g root -m 644
@@ -144,13 +144,13 @@ src_install() {
 
 	if $(has_version mail-filter/razor) ; then
 		if [ ! -f ${AMAVIS_ROOT}/.razor/razor-agent.conf ] ; then
-			einfo "Setting up initial razor config files..."
+			elog "Setting up initial razor config files..."
 
 			razor-admin -create -home=${D}/${AMAVIS_ROOT}/.razor
 			sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
 				${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf
 		else
-			einfo "Copying existing razor config files..."
+			elog "Copying existing razor config files..."
 			insinto ${AMAVIS_ROOT}/.razor
 			doins ${AMAVIS_ROOT}/.razor/*.{conf,lst}
 		fi
@@ -163,11 +163,11 @@ src_install() {
 pkg_postinst() {
 	if ! $(has_version mail-filter/spamassassin) ; then
 		echo
-		einfo "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking"
-		einfo "will be performed without it. Since you do not have SpamAssassin installed,"
-		einfo "all spam checks have been disabled. To enable them, install SpamAssassin"
-		einfo "and comment out the line containing: "
-		einfo "@bypass_spam_checks_maps = (1); in /etc/amavisd.conf."
+		elog "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking"
+		elog "will be performed without it. Since you do not have SpamAssassin installed,"
+		elog "all spam checks have been disabled. To enable them, install SpamAssassin"
+		elog "and comment out the line containing: "
+		elog "@bypass_spam_checks_maps = (1); in /etc/amavisd.conf."
 	fi
 	echo
 	ewarn "Adjusting permissions for /etc/amavisd.conf (0 for world, owner root:amavis)"
diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.2-r1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.2-r1.ebuild
index e6c7882ac973..fbfa8c8f4c97 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.4.2-r1.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.4.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.2-r1.ebuild,v 1.2 2006/12/10 20:48:12 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.2-r1.ebuild,v 1.3 2007/03/18 02:44:50 genone Exp $
 
 inherit eutils
 
@@ -66,15 +66,15 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	if $(has_version mail-mta/courier) ; then
-		einfo "Patching with courier support."
+		elog "Patching with courier support."
 		epatch "amavisd-new-courier.patch" || die "patch failed"
 	fi
 
 	if $(has_version virtual/qmail) ; then
-		einfo "Patching with qmail qmqp support."
+		elog "Patching with qmail qmqp support."
 		epatch "amavisd-new-qmqpqq.patch" || die "patch failed"
 
-		einfo "Patching with qmail lf bug workaround."
+		elog "Patching with qmail lf bug workaround."
 		epatch "${FILESDIR}/${P%.*}-qmail-lf-workaround.patch" || die "patch failed"
 	fi
 
@@ -121,7 +121,7 @@ src_install() {
 	keepdir ${AMAVIS_ROOT}/tmp
 
 	if $(has_version net-nds/openldap ) ; then
-		einfo "Adding ${P} schema to openldap schema dir."
+		elog "Adding ${P} schema to openldap schema dir."
 		dodir /etc/openldap/schema
 		insinto /etc/openldap/schema
 		insopts -o root -g root -m 644
@@ -146,13 +146,13 @@ src_install() {
 
 	if $(has_version mail-filter/razor) ; then
 		if [ ! -f ${AMAVIS_ROOT}/.razor/razor-agent.conf ] ; then
-			einfo "Setting up initial razor config files..."
+			elog "Setting up initial razor config files..."
 
 			razor-admin -create -home=${D}/${AMAVIS_ROOT}/.razor
 			sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
 				${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf
 		else
-			einfo "Copying existing razor config files..."
+			elog "Copying existing razor config files..."
 			insinto ${AMAVIS_ROOT}/.razor
 			doins ${AMAVIS_ROOT}/.razor/*.{conf,lst}
 		fi
@@ -165,11 +165,11 @@ src_install() {
 pkg_postinst() {
 	if ! $(has_version mail-filter/spamassassin) ; then
 		echo
-		einfo "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking"
-		einfo "will be performed without it. Since you do not have SpamAssassin installed,"
-		einfo "all spam checks have been disabled. To enable them, install SpamAssassin"
-		einfo "and comment out the line containing: "
-		einfo "@bypass_spam_checks_maps = (1); in /etc/amavisd.conf."
+		elog "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking"
+		elog "will be performed without it. Since you do not have SpamAssassin installed,"
+		elog "all spam checks have been disabled. To enable them, install SpamAssassin"
+		elog "and comment out the line containing: "
+		elog "@bypass_spam_checks_maps = (1); in /etc/amavisd.conf."
 	fi
 	echo
 	ewarn "Adjusting permissions for /etc/amavisd.conf (0 for world, owner root:amavis)"
diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.2.ebuild
index 0718fefefc48..a9d65c5f808c 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.4.2.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.4.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.2.ebuild,v 1.2 2006/12/10 20:48:12 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.2.ebuild,v 1.3 2007/03/18 02:44:50 genone Exp $
 
 inherit eutils
 
@@ -66,15 +66,15 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	if $(has_version mail-mta/courier) ; then
-		einfo "Patching with courier support."
+		elog "Patching with courier support."
 		epatch "amavisd-new-courier.patch" || die "patch failed"
 	fi
 
 	if $(has_version virtual/qmail) ; then
-		einfo "Patching with qmail qmqp support."
+		elog "Patching with qmail qmqp support."
 		epatch "amavisd-new-qmqpqq.patch" || die "patch failed"
 
-		einfo "Patching with qmail lf bug workaround."
+		elog "Patching with qmail lf bug workaround."
 		epatch "${FILESDIR}/${P%.*}-qmail-lf-workaround.patch" || die "patch failed"
 	fi
 
@@ -119,7 +119,7 @@ src_install() {
 	keepdir ${AMAVIS_ROOT}/tmp
 
 	if $(has_version net-nds/openldap ) ; then
-		einfo "Adding ${P} schema to openldap schema dir."
+		elog "Adding ${P} schema to openldap schema dir."
 		dodir /etc/openldap/schema
 		insinto /etc/openldap/schema
 		insopts -o root -g root -m 644
@@ -144,13 +144,13 @@ src_install() {
 
 	if $(has_version mail-filter/razor) ; then
 		if [ ! -f ${AMAVIS_ROOT}/.razor/razor-agent.conf ] ; then
-			einfo "Setting up initial razor config files..."
+			elog "Setting up initial razor config files..."
 
 			razor-admin -create -home=${D}/${AMAVIS_ROOT}/.razor
 			sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
 				${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf
 		else
-			einfo "Copying existing razor config files..."
+			elog "Copying existing razor config files..."
 			insinto ${AMAVIS_ROOT}/.razor
 			doins ${AMAVIS_ROOT}/.razor/*.{conf,lst}
 		fi
@@ -163,11 +163,11 @@ src_install() {
 pkg_postinst() {
 	if ! $(has_version mail-filter/spamassassin) ; then
 		echo
-		einfo "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking"
-		einfo "will be performed without it. Since you do not have SpamAssassin installed,"
-		einfo "all spam checks have been disabled. To enable them, install SpamAssassin"
-		einfo "and comment out the line containing: "
-		einfo "@bypass_spam_checks_maps = (1); in /etc/amavisd.conf."
+		elog "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking"
+		elog "will be performed without it. Since you do not have SpamAssassin installed,"
+		elog "all spam checks have been disabled. To enable them, install SpamAssassin"
+		elog "and comment out the line containing: "
+		elog "@bypass_spam_checks_maps = (1); in /etc/amavisd.conf."
 	fi
 	echo
 	ewarn "Adjusting permissions for /etc/amavisd.conf (0 for world, owner root:amavis)"
diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.3.ebuild
index ca0043143faf..346f85acae64 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.4.3.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.4.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.3.ebuild,v 1.2 2006/12/10 20:48:12 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.3.ebuild,v 1.3 2007/03/18 02:44:50 genone Exp $
 
 inherit eutils
 
@@ -66,15 +66,15 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	if $(has_version mail-mta/courier) ; then
-		einfo "Patching with courier support."
+		elog "Patching with courier support."
 		epatch "amavisd-new-courier.patch" || die "patch failed"
 	fi
 
 	if $(has_version virtual/qmail) ; then
-		einfo "Patching with qmail qmqp support."
+		elog "Patching with qmail qmqp support."
 		epatch "amavisd-new-qmqpqq.patch" || die "patch failed"
 
-		einfo "Patching with qmail lf bug workaround."
+		elog "Patching with qmail lf bug workaround."
 		epatch "${FILESDIR}/${P%.*}-qmail-lf-workaround.patch" || die "patch failed"
 	fi
 
@@ -121,7 +121,7 @@ src_install() {
 	keepdir ${AMAVIS_ROOT}/tmp
 
 	if $(has_version net-nds/openldap ) ; then
-		einfo "Adding ${P} schema to openldap schema dir."
+		elog "Adding ${P} schema to openldap schema dir."
 		dodir /etc/openldap/schema
 		insinto /etc/openldap/schema
 		insopts -o root -g root -m 644
@@ -146,13 +146,13 @@ src_install() {
 
 	if $(has_version mail-filter/razor) ; then
 		if [ ! -f ${AMAVIS_ROOT}/.razor/razor-agent.conf ] ; then
-			einfo "Setting up initial razor config files..."
+			elog "Setting up initial razor config files..."
 
 			razor-admin -create -home=${D}/${AMAVIS_ROOT}/.razor
 			sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
 				${D}/${AMAVIS_ROOT}/.razor/razor-agent.conf
 		else
-			einfo "Copying existing razor config files..."
+			elog "Copying existing razor config files..."
 			insinto ${AMAVIS_ROOT}/.razor
 			doins ${AMAVIS_ROOT}/.razor/*.{conf,lst}
 		fi
@@ -165,11 +165,11 @@ src_install() {
 pkg_postinst() {
 	if ! $(has_version mail-filter/spamassassin) ; then
 		echo
-		einfo "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking"
-		einfo "will be performed without it. Since you do not have SpamAssassin installed,"
-		einfo "all spam checks have been disabled. To enable them, install SpamAssassin"
-		einfo "and comment out the line containing: "
-		einfo "@bypass_spam_checks_maps = (1); in /etc/amavisd.conf."
+		elog "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking"
+		elog "will be performed without it. Since you do not have SpamAssassin installed,"
+		elog "all spam checks have been disabled. To enable them, install SpamAssassin"
+		elog "and comment out the line containing: "
+		elog "@bypass_spam_checks_maps = (1); in /etc/amavisd.conf."
 	fi
 	echo
 	ewarn "Adjusting permissions for /etc/amavisd.conf (0 for world, owner root:amavis)"
diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild
index abceb57cd6ee..608abe22d40e 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild,v 1.4 2007/01/30 00:18:32 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.4.ebuild,v 1.5 2007/03/18 02:44:50 genone Exp $
 
 inherit eutils
 
@@ -66,18 +66,18 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	if $(has_version mail-mta/courier) ; then
-		einfo "Patching with courier support."
+		elog "Patching with courier support."
 		epatch "amavisd-new-courier.patch" || die "patch failed"
 	fi
 
 	if $(has_version virtual/qmail) ; then
-		einfo "Patching with qmail qmqp support."
+		elog "Patching with qmail qmqp support."
 		epatch "amavisd-new-qmqpqq.patch" || die "patch failed"
 
-		einfo "Patching with qmail lf bug workaround."
+		elog "Patching with qmail lf bug workaround."
 		epatch "${FILESDIR}/${P}-qmail-lf-workaround.patch" || die "patch failed"
 	fi
-		einfo "Patching with qmail lf bug workaround."
+		elog "Patching with qmail lf bug workaround."
 		epatch "${FILESDIR}/${P}-qmail-lf-workaround.patch" || die "patch failed"
 
 	epatch "${FILESDIR}/${P}-amavisd.conf-gentoo.patch" || die "patch failed"
@@ -123,7 +123,7 @@ src_install() {
 	keepdir ${AMAVIS_ROOT}/tmp
 
 	if $(has_version net-nds/openldap ) ; then
-		einfo "Adding ${P} schema to openldap schema dir."
+		elog "Adding ${P} schema to openldap schema dir."
 		dodir /etc/openldap/schema
 		insinto /etc/openldap/schema
 		insopts -o root -g root -m 644
@@ -148,7 +148,7 @@ src_install() {
 
 	if $(has_version mail-filter/razor) ; then
 		if [ ! -d ${AMAVIS_ROOT}/.razor ] ; then
-			einfo "Setting up initial razor config files..."
+			elog "Setting up initial razor config files..."
 
 			razor-admin -create -home=${D}/${AMAVIS_ROOT}/.razor
 			sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
@@ -163,11 +163,11 @@ src_install() {
 pkg_postinst() {
 	if ! $(has_version mail-filter/spamassassin) ; then
 		echo
-		einfo "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking"
-		einfo "will be performed without it. Since you do not have SpamAssassin installed,"
-		einfo "all spam checks have been disabled. To enable them, install SpamAssassin"
-		einfo "and comment out the line containing: "
-		einfo "@bypass_spam_checks_maps = (1); in /etc/amavisd.conf."
+		elog "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking"
+		elog "will be performed without it. Since you do not have SpamAssassin installed,"
+		elog "all spam checks have been disabled. To enable them, install SpamAssassin"
+		elog "and comment out the line containing: "
+		elog "@bypass_spam_checks_maps = (1); in /etc/amavisd.conf."
 	fi
 	echo
 	ewarn "Adjusting permissions for /etc/amavisd.conf (0 for world, owner root:amavis)"
diff --git a/mail-filter/amavisd-new/amavisd-new-2.4.5.ebuild b/mail-filter/amavisd-new/amavisd-new-2.4.5.ebuild
index 816a2bcf34e4..3b349ddaff54 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.4.5.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.5.ebuild,v 1.1 2007/01/31 15:47:27 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.4.5.ebuild,v 1.2 2007/03/18 02:44:50 genone Exp $
 
 inherit eutils
 
@@ -66,18 +66,18 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	if $(has_version mail-mta/courier) ; then
-		einfo "Patching with courier support."
+		elog "Patching with courier support."
 		epatch "amavisd-new-courier.patch" || die "patch failed"
 	fi
 
 	if $(has_version virtual/qmail) ; then
-		einfo "Patching with qmail qmqp support."
+		elog "Patching with qmail qmqp support."
 		epatch "amavisd-new-qmqpqq.patch" || die "patch failed"
 
-		einfo "Patching with qmail lf bug workaround."
+		elog "Patching with qmail lf bug workaround."
 		epatch "${FILESDIR}/${PN}-2.4.4-qmail-lf-workaround.patch" || die "patch failed"
 	fi
-		einfo "Patching with qmail lf bug workaround."
+		elog "Patching with qmail lf bug workaround."
 		epatch "${FILESDIR}/${PN}-2.4.4-qmail-lf-workaround.patch" || die "patch failed"
 
 	epatch "${FILESDIR}/${PN}-2.4.4-amavisd.conf-gentoo.patch" || die "patch failed"
@@ -123,7 +123,7 @@ src_install() {
 	keepdir ${AMAVIS_ROOT}/tmp
 
 	if $(has_version net-nds/openldap ) ; then
-		einfo "Adding ${P} schema to openldap schema dir."
+		elog "Adding ${P} schema to openldap schema dir."
 		dodir /etc/openldap/schema
 		insinto /etc/openldap/schema
 		insopts -o root -g root -m 644
@@ -148,7 +148,7 @@ src_install() {
 
 	if $(has_version mail-filter/razor) ; then
 		if [ ! -d ${AMAVIS_ROOT}/.razor ] ; then
-			einfo "Setting up initial razor config files..."
+			elog "Setting up initial razor config files..."
 
 			razor-admin -create -home=${D}/${AMAVIS_ROOT}/.razor
 			sed -i -e "s:debuglevel\([ ]*\)= .:debuglevel\1= 0:g" \
@@ -163,11 +163,11 @@ src_install() {
 pkg_postinst() {
 	if ! $(has_version mail-filter/spamassassin) ; then
 		echo
-		einfo "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking"
-		einfo "will be performed without it. Since you do not have SpamAssassin installed,"
-		einfo "all spam checks have been disabled. To enable them, install SpamAssassin"
-		einfo "and comment out the line containing: "
-		einfo "@bypass_spam_checks_maps = (1); in /etc/amavisd.conf."
+		elog "Amavisd-new no longer requires SpamAssassin, but no anti-spam checking"
+		elog "will be performed without it. Since you do not have SpamAssassin installed,"
+		elog "all spam checks have been disabled. To enable them, install SpamAssassin"
+		elog "and comment out the line containing: "
+		elog "@bypass_spam_checks_maps = (1); in /etc/amavisd.conf."
 	fi
 	echo
 	ewarn "As of amavisd-new-2.4.5 p0f-analyzer.pl only binds to the loopback interface"