From: Marius Mauch Date: Sun, 18 Mar 2007 05:56:11 +0000 (+0000) Subject: Replacing einfo with elog X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e1f070486b2ee44ff0f962f8613e69bfabeaa465;p=gentoo.git Replacing einfo with elog Package-Manager: portage-2.1.2.2 --- diff --git a/mail-mta/nullmailer/ChangeLog b/mail-mta/nullmailer/ChangeLog index cacf9c483840..c7d9435be712 100644 --- a/mail-mta/nullmailer/ChangeLog +++ b/mail-mta/nullmailer/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for mail-mta/nullmailer # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.24 2007/02/22 01:05:52 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.25 2007/03/18 05:51:53 genone Exp $ + + 18 Mar 2007; Marius Mauch nullmailer-1.00.ebuild, + nullmailer-1.00-r2.ebuild, nullmailer-1.02.ebuild, + nullmailer-1.02-r1.ebuild, nullmailer-1.02-r2.ebuild: + Replacing einfo with elog 22 Feb 2007; Piotr Jaroszyński ChangeLog: Transition to Manifest2. diff --git a/mail-mta/nullmailer/nullmailer-1.00-r2.ebuild b/mail-mta/nullmailer/nullmailer-1.00-r2.ebuild index ff82eefac70d..75bded138207 100644 --- a/mail-mta/nullmailer/nullmailer-1.00-r2.ebuild +++ b/mail-mta/nullmailer/nullmailer-1.00-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-mta/nullmailer/nullmailer-1.00-r2.ebuild,v 1.1 2006/02/11 10:35:51 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.00-r2.ebuild,v 1.2 2007/03/18 05:51:53 genone Exp $ inherit eutils flag-o-matic mailer @@ -101,9 +101,9 @@ pkg_config() { } msg_svscan() { - einfo "To start nullmailer at boot you have to enable the /etc/init.d/svscan rc file" - einfo "and create the following link :" - einfo "ln -fs /var/nullmailer/service /service/nullmailer" + elog "To start nullmailer at boot you have to enable the /etc/init.d/svscan rc file" + elog "and create the following link :" + elog "ln -fs /var/nullmailer/service /service/nullmailer" } msg_mailerconf() { use mailwrapper && \ @@ -120,8 +120,8 @@ pkg_postinst() { use mailwrapper && dosym /usr/sbin/sendmail /usr/bin/mailq - einfo "To create an initial setup, please do:" - einfo "emerge --config =${PF}" + elog "To create an initial setup, please do:" + elog "emerge --config =${PF}" msg_svscan msg_mailerconf } diff --git a/mail-mta/nullmailer/nullmailer-1.00.ebuild b/mail-mta/nullmailer/nullmailer-1.00.ebuild index e2a73680f14a..3299d3e61109 100644 --- a/mail-mta/nullmailer/nullmailer-1.00.ebuild +++ b/mail-mta/nullmailer/nullmailer-1.00.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-mta/nullmailer/nullmailer-1.00.ebuild,v 1.7 2006/02/11 10:35:51 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.00.ebuild,v 1.8 2007/03/18 05:51:53 genone Exp $ inherit eutils flag-o-matic @@ -102,9 +102,9 @@ pkg_config() { } msg_svscan() { - einfo "To start nullmailer at boot you have to enable the /etc/init.d/svscan rc file" - einfo "and create the following link :" - einfo "ln -fs /var/nullmailer/service /service/nullmailer" + elog "To start nullmailer at boot you have to enable the /etc/init.d/svscan rc file" + elog "and create the following link :" + elog "ln -fs /var/nullmailer/service /service/nullmailer" } msg_mailerconf() { use mailwrapper && \ @@ -121,8 +121,8 @@ pkg_postinst() { use mailwrapper && dosym /usr/sbin/sendmail /usr/bin/mailq - einfo "To create an initial setup, please do:" - einfo "emerge --config =${PF}" + elog "To create an initial setup, please do:" + elog "emerge --config =${PF}" msg_svscan msg_mailerconf } diff --git a/mail-mta/nullmailer/nullmailer-1.02-r1.ebuild b/mail-mta/nullmailer/nullmailer-1.02-r1.ebuild index 6be957d33f15..cd99463ed686 100644 --- a/mail-mta/nullmailer/nullmailer-1.02-r1.ebuild +++ b/mail-mta/nullmailer/nullmailer-1.02-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-mta/nullmailer/nullmailer-1.02-r1.ebuild,v 1.1 2006/02/11 10:35:51 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.02-r1.ebuild,v 1.2 2007/03/18 05:51:53 genone Exp $ inherit eutils flag-o-matic @@ -112,14 +112,14 @@ pkg_config() { } msg_svscan() { - einfo "To start nullmailer at boot you have to enable the /etc/init.d/svscan rc file" - einfo "and create the following link :" - einfo "ln -fs /var/nullmailer/service /service/nullmailer" - einfo "As an alternative, we also provide an init.d script." - einfo - einfo "If the nullmailer service is already running, please restart it now," - einfo "using 'svc-restart nullmailer' or the init.d script." - einfo + elog "To start nullmailer at boot you have to enable the /etc/init.d/svscan rc file" + elog "and create the following link :" + elog "ln -fs /var/nullmailer/service /service/nullmailer" + elog "As an alternative, we also provide an init.d script." + elog + elog "If the nullmailer service is already running, please restart it now," + elog "using 'svc-restart nullmailer' or the init.d script." + elog } msg_mailerconf() { @@ -135,8 +135,8 @@ pkg_postinst() { chmod 770 /var/log/nullmailer /var/nullmailer/{tmp,queue} chmod 660 /var/nullmailer/trigger - einfo "To create an initial setup, please do:" - einfo "emerge --config =${PF}" + elog "To create an initial setup, please do:" + elog "emerge --config =${PF}" msg_svscan msg_mailerconf } diff --git a/mail-mta/nullmailer/nullmailer-1.02-r2.ebuild b/mail-mta/nullmailer/nullmailer-1.02-r2.ebuild index 15b897db9b23..0828bc55ebcf 100644 --- a/mail-mta/nullmailer/nullmailer-1.02-r2.ebuild +++ b/mail-mta/nullmailer/nullmailer-1.02-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-mta/nullmailer/nullmailer-1.02-r2.ebuild,v 1.1 2006/02/11 10:35:51 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.02-r2.ebuild,v 1.2 2007/03/18 05:51:53 genone Exp $ inherit eutils flag-o-matic mailer @@ -110,14 +110,14 @@ pkg_config() { } msg_svscan() { - einfo "To start nullmailer at boot you have to enable the /etc/init.d/svscan rc file" - einfo "and create the following link :" - einfo "ln -fs /var/nullmailer/service /service/nullmailer" - einfo "As an alternative, we also provide an init.d script." - einfo - einfo "If the nullmailer service is already running, please restart it now," - einfo "using 'svc-restart nullmailer' or the init.d script." - einfo + elog "To start nullmailer at boot you have to enable the /etc/init.d/svscan rc file" + elog "and create the following link :" + elog "ln -fs /var/nullmailer/service /service/nullmailer" + elog "As an alternative, we also provide an init.d script." + elog + elog "If the nullmailer service is already running, please restart it now," + elog "using 'svc-restart nullmailer' or the init.d script." + elog } msg_mailerconf() { @@ -133,8 +133,8 @@ pkg_postinst() { chmod 770 /var/log/nullmailer /var/nullmailer/{tmp,queue} chmod 660 /var/nullmailer/trigger - einfo "To create an initial setup, please do:" - einfo "emerge --config =${PF}" + elog "To create an initial setup, please do:" + elog "emerge --config =${PF}" msg_svscan msg_mailerconf } diff --git a/mail-mta/nullmailer/nullmailer-1.02.ebuild b/mail-mta/nullmailer/nullmailer-1.02.ebuild index cbea8116f0a2..f69c9d083c22 100644 --- a/mail-mta/nullmailer/nullmailer-1.02.ebuild +++ b/mail-mta/nullmailer/nullmailer-1.02.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-mta/nullmailer/nullmailer-1.02.ebuild,v 1.2 2006/02/11 10:35:51 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.02.ebuild,v 1.3 2007/03/18 05:51:53 genone Exp $ inherit eutils flag-o-matic @@ -112,14 +112,14 @@ pkg_config() { } msg_svscan() { - einfo "To start nullmailer at boot you have to enable the /etc/init.d/svscan rc file" - einfo "and create the following link :" - einfo "ln -fs /var/nullmailer/service /service/nullmailer" - einfo - einfo "If the nullmailer service is already running, please restart it now," - einfo "using 'svc-restart nullmailer' or the init.d script." - einfo - einfo "As an alternative, we also provide an init.d script." + elog "To start nullmailer at boot you have to enable the /etc/init.d/svscan rc file" + elog "and create the following link :" + elog "ln -fs /var/nullmailer/service /service/nullmailer" + elog + elog "If the nullmailer service is already running, please restart it now," + elog "using 'svc-restart nullmailer' or the init.d script." + elog + elog "As an alternative, we also provide an init.d script." } msg_mailerconf() { use mailwrapper && \ @@ -136,8 +136,8 @@ pkg_postinst() { use mailwrapper && dosym /usr/sbin/sendmail /usr/bin/mailq - einfo "To create an initial setup, please do:" - einfo "emerge --config =${PF}" + elog "To create an initial setup, please do:" + elog "emerge --config =${PF}" msg_svscan msg_mailerconf } diff --git a/mail-mta/qmail/ChangeLog b/mail-mta/qmail/ChangeLog index 2b3a0a4b5e25..e281a78e4917 100644 --- a/mail-mta/qmail/ChangeLog +++ b/mail-mta/qmail/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for mail-mta/qmail # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.84 2007/02/11 19:01:05 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/ChangeLog,v 1.85 2007/03/18 05:56:11 genone Exp $ + + 18 Mar 2007; Marius Mauch qmail-1.03-r15.ebuild, + qmail-1.03-r16.ebuild: + Replacing einfo with elog 11 Feb 2007; Michael Hanselmann qmail-1.03-r15.ebuild, qmail-1.03-r16.ebuild: diff --git a/mail-mta/qmail/qmail-1.03-r15.ebuild b/mail-mta/qmail/qmail-1.03-r15.ebuild index 4b788d9f4760..49d26359e7a1 100644 --- a/mail-mta/qmail/qmail-1.03-r15.ebuild +++ b/mail-mta/qmail/qmail-1.03-r15.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-mta/qmail/qmail-1.03-r15.ebuild,v 1.43 2007/02/11 19:01:05 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r15.ebuild,v 1.44 2007/03/18 05:56:11 genone Exp $ inherit toolchain-funcs eutils fixheadtails flag-o-matic @@ -415,10 +415,10 @@ rootmailfixup() { # so you can check mail as root easily local TMPCMD="ln -sf /var/qmail/alias/.maildir/ ${ROOT}/root/.maildir" if [ -d "${ROOT}/root/.maildir" ] && [ ! -L "${ROOT}/root/.maildir" ] ; then - einfo "Previously the qmail ebuilds created /root/.maildir/ but not" - einfo "every mail was delivered there. If the directory does not" - einfo "contain any mail, please delete it and run:" - einfo "${TMPCMD}" + elog "Previously the qmail ebuilds created /root/.maildir/ but not" + elog "every mail was delivered there. If the directory does not" + elog "contain any mail, please delete it and run:" + elog "${TMPCMD}" else ${TMPCMD} fi @@ -440,7 +440,7 @@ buildtcprules() { pkg_postinst() { if [[ ! -x /var/qmail/bin/queue-fix ]]; then eerror "Can't find /var/qmail/bin/queue-fix -- have you rm -rf'd /var/qmail?" - einfo "Please remerge net-mail/queue-fix and don't do that again!" + eerror "Please remerge net-mail/queue-fix and don't do that again!" die "Can't find /var/qmail/bin/queue-fix" fi @@ -454,31 +454,31 @@ pkg_postinst() { # for good measure env-update - einfo "To setup qmail to run out-of-the-box on your system, run:" - einfo "emerge --config =${CATEGORY}/${PF}" - echo - einfo "To start qmail at boot you have to add svscan to your startup" - einfo "and create the following links:" - einfo "ln -s /var/qmail/supervise/qmail-send /service/qmail-send" - einfo "ln -s /var/qmail/supervise/qmail-smtpd /service/qmail-smtpd" - echo - einfo "To start the pop3 server as well, create the following link:" - einfo "ln -s /var/qmail/supervise/qmail-pop3d /service/qmail-pop3d" - echo - einfo "Additionally, the QMTP and QMQP protocols are supported, " - einfo "and can be started as:" - einfo "ln -s /var/qmail/supervise/qmail-qmtpd /service/qmail-qmtpd" - einfo "ln -s /var/qmail/supervise/qmail-qmqpd /service/qmail-qmqpd" - echo - einfo "Additionally, if you wish to run qmail right now, you should " - einfo "run this before anything else:" - einfo "source /etc/profile" - echo - einfo "If you are looking for documentation, check those links:" - einfo "http://www.gentoo.org/doc/en/qmail-howto.xml" - einfo " -- qmail/vpopmail Virtual Mail Hosting System Guide" - einfo "http://www.lifewithqmail.com/" - einfo " -- Life with qmail" + elog "To setup qmail to run out-of-the-box on your system, run:" + elog "emerge --config =${CATEGORY}/${PF}" + elog + elog "To start qmail at boot you have to add svscan to your startup" + elog "and create the following links:" + elog "ln -s /var/qmail/supervise/qmail-send /service/qmail-send" + elog "ln -s /var/qmail/supervise/qmail-smtpd /service/qmail-smtpd" + elog + elog "To start the pop3 server as well, create the following link:" + elog "ln -s /var/qmail/supervise/qmail-pop3d /service/qmail-pop3d" + elog + elog "Additionally, the QMTP and QMQP protocols are supported, " + elog "and can be started as:" + elog "ln -s /var/qmail/supervise/qmail-qmtpd /service/qmail-qmtpd" + elog "ln -s /var/qmail/supervise/qmail-qmqpd /service/qmail-qmqpd" + elog + elog "Additionally, if you wish to run qmail right now, you should " + elog "run this before anything else:" + elog "source /etc/profile" + elog + elog "If you are looking for documentation, check those links:" + elog "http://www.gentoo.org/doc/en/qmail-howto.xml" + elog " -- qmail/vpopmail Virtual Mail Hosting System Guide" + elog "http://www.lifewithqmail.com/" + elog " -- Life with qmail" } pkg_preinst() { diff --git a/mail-mta/qmail/qmail-1.03-r16.ebuild b/mail-mta/qmail/qmail-1.03-r16.ebuild index 5071797c79e6..16aa3024c4c1 100644 --- a/mail-mta/qmail/qmail-1.03-r16.ebuild +++ b/mail-mta/qmail/qmail-1.03-r16.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-mta/qmail/qmail-1.03-r16.ebuild,v 1.59 2007/02/11 19:01:05 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/qmail/qmail-1.03-r16.ebuild,v 1.60 2007/03/18 05:56:11 genone Exp $ inherit toolchain-funcs eutils fixheadtails flag-o-matic @@ -489,10 +489,10 @@ rootmailfixup() { # so you can check mail as root easily local TMPCMD="ln -sf /var/qmail/alias/.maildir/ ${ROOT}/root/.maildir" if [[ -d "${ROOT}/root/.maildir" && ! -L "${ROOT}/root/.maildir" ]] ; then - einfo "Previously the qmail ebuilds created /root/.maildir/ but not" - einfo "every mail was delivered there. If the directory does not" - einfo "contain any mail, please delete it and run:" - einfo "${TMPCMD}" + elog "Previously the qmail ebuilds created /root/.maildir/ but not" + elog "every mail was delivered there. If the directory does not" + elog "contain any mail, please delete it and run:" + elog "${TMPCMD}" else ${TMPCMD} fi @@ -514,7 +514,7 @@ buildtcprules() { pkg_postinst() { if [[ ! -x /var/qmail/bin/queue-fix ]]; then eerror "Can't find /var/qmail/bin/queue-fix -- have you rm -rf'd /var/qmail?" - einfo "Please remerge net-mail/queue-fix and don't do that again!" + eerror "Please remerge net-mail/queue-fix and don't do that again!" die "Can't find /var/qmail/bin/queue-fix" fi @@ -528,38 +528,38 @@ pkg_postinst() { # for good measure env-update - einfo "To setup qmail to run out-of-the-box on your system, run:" - einfo "emerge --config =${CATEGORY}/${PF}" - echo - einfo "To start qmail at boot you have to add svscan to your startup" - einfo "and create the following links:" - einfo "ln -s /var/qmail/supervise/qmail-send /service/qmail-send" - einfo "ln -s /var/qmail/supervise/qmail-smtpd /service/qmail-smtpd" - echo - einfo "To start the pop3 server as well, create the following link:" - einfo "ln -s /var/qmail/supervise/qmail-pop3d /service/qmail-pop3d" - echo - einfo "Additionally, the QMTP and QMQP protocols are supported, " - einfo "and can be started as:" - einfo "ln -s /var/qmail/supervise/qmail-qmtpd /service/qmail-qmtpd" - einfo "ln -s /var/qmail/supervise/qmail-qmqpd /service/qmail-qmqpd" - echo - einfo "Additionally, if you wish to run qmail right now, you should " - einfo "run this before anything else:" - einfo "source /etc/profile" - echo - einfo "If you are looking for documentation, check those links:" - einfo "http://www.gentoo.org/doc/en/qmail-howto.xml" - einfo " -- qmail/vpopmail Virtual Mail Hosting System Guide" - einfo "http://www.lifewithqmail.com/" - einfo " -- Life with qmail" + elog "To setup qmail to run out-of-the-box on your system, run:" + elog "emerge --config =${CATEGORY}/${PF}" + elog + elog "To start qmail at boot you have to add svscan to your startup" + elog "and create the following links:" + elog "ln -s /var/qmail/supervise/qmail-send /service/qmail-send" + elog "ln -s /var/qmail/supervise/qmail-smtpd /service/qmail-smtpd" + elog + elog "To start the pop3 server as well, create the following link:" + elog "ln -s /var/qmail/supervise/qmail-pop3d /service/qmail-pop3d" + elog + elog "Additionally, the QMTP and QMQP protocols are supported, " + elog "and can be started as:" + elog "ln -s /var/qmail/supervise/qmail-qmtpd /service/qmail-qmtpd" + elog "ln -s /var/qmail/supervise/qmail-qmqpd /service/qmail-qmqpd" + elog + elog "Additionally, if you wish to run qmail right now, you should " + elog "run this before anything else:" + elog "source /etc/profile" + elog + elog "If you are looking for documentation, check those links:" + elog "http://www.gentoo.org/doc/en/qmail-howto.xml" + elog " -- qmail/vpopmail Virtual Mail Hosting System Guide" + elog "http://www.lifewithqmail.com/" + elog " -- Life with qmail" if use logmail; then - echo - einfo "You've enabled the logmail USE flag. To really use it, please" - einfo "follow those URLs:" - einfo "http://cr.yp.to/qmail/faq/admin.html#copies" - einfo "http://www.cyber-sentry.com/index.php?id=35" + elog + elog "You've enabled the logmail USE flag. To really use it, please" + elog "follow those URLs:" + elog "http://cr.yp.to/qmail/faq/admin.html#copies" + elog "http://www.cyber-sentry.com/index.php?id=35" fi if [[ -f /etc/${CRON_FOLDER}/qmail-dhparam.sh ]]; then