Updated einfo -> elog

Package-Manager: portage-2.1.2_rc4-r6

7 files changed, 161 insertions, 155 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 78b9f08e0ea2..231813ce67ca 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.99 2007/01/05 03:45:33 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.100 2007/01/09 16:49:14 wltjr Exp $
+
+  09 Jan 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  tomcat-5.0.27-r6.ebuild, tomcat-5.0.28-r14.ebuild,
+  tomcat-5.5.20-r5.ebuild, tomcat-5.5.20-r6.ebuild,
+  tomcat-6.0.7_alpha-r3.ebuild:
+  Updated einfo -> elog
 
 *tomcat-6.0.7_alpha-r3 (05 Jan 2007)
 
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 7ca249a493e3..d15dc67ff2f3 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -110,30 +110,30 @@ DIST apache-tomcat-5.5.20-src.tar.gz 4796377 RMD160 587590d2e272d1ede73501b62933
 DIST apache-tomcat-6.0.7-src.tar.gz 3210405 RMD160 830485c5e25926da950e6b2148aa8baae263b351 SHA1 6883fbed7840c20d0967c435deafc0260609200f SHA256 a76be3230db0a3363835916f14afcccce6f18509577c2999f5491c0fb861e4f3
 DIST jakarta-tomcat-5.0.27.tar.gz 10298374 RMD160 a333fcb531bb98af20db6e0a10d3e8b2c72ee1fa SHA1 5f3981ecdd67e2b9774e643b336ad98ebc1bd4e3 SHA256 873fc94b4316235091e69bca926bd66a0fb9fab542016e582a03323ed6777d78
 DIST jakarta-tomcat-5.0.28-src.tar.gz 3565766 RMD160 22c5e60b2c5009dc33a62edcefa6760d82da859b SHA1 a4ac2ad52f8b8db8ae8c38979f5f50713e242e36 SHA256 bbf584b3c376d23d92b1a0d306eb8f3729cea244c7a850f81d2527a7df6d20fc
-EBUILD tomcat-5.0.27-r6.ebuild 3881 RMD160 80b96c74656e19ac148a68a8047b74066e5709b4 SHA1 8bb842e8a2f594593fab407e7f14d35f4a50ad38 SHA256 c750b594d6f7397f4dfa775738db62238391e86c347a3c5bbcc744d8394974ba
-MD5 999b5f8d571956043cde42233459eb5b tomcat-5.0.27-r6.ebuild 3881
-RMD160 80b96c74656e19ac148a68a8047b74066e5709b4 tomcat-5.0.27-r6.ebuild 3881
-SHA256 c750b594d6f7397f4dfa775738db62238391e86c347a3c5bbcc744d8394974ba tomcat-5.0.27-r6.ebuild 3881
-EBUILD tomcat-5.0.28-r14.ebuild 9357 RMD160 a9a37ab6ec5479ff613eb071548285d62597e183 SHA1 ea258c0c28941ee2e31f7bacdd05657616bf8490 SHA256 a107e5be63f23f54b0664bcc71db4c825683aa18e2a9badfe3cd97805667dcfc
-MD5 0bf6de6439b6a7f67509fe51bedbefab tomcat-5.0.28-r14.ebuild 9357
-RMD160 a9a37ab6ec5479ff613eb071548285d62597e183 tomcat-5.0.28-r14.ebuild 9357
-SHA256 a107e5be63f23f54b0664bcc71db4c825683aa18e2a9badfe3cd97805667dcfc tomcat-5.0.28-r14.ebuild 9357
-EBUILD tomcat-5.5.20-r5.ebuild 10227 RMD160 7b09a525ac99d4d44ac53e3e193090f41aa8d047 SHA1 e2801a6f667491a8a35c832f681894d7d3a52d3c SHA256 30c697ecc987ace021a7fcbacc32f6e050fd7b8a49dc4e8a7382177f4acc3774
-MD5 38bf0e0238cc1cd76fcf3668b7bd252d tomcat-5.5.20-r5.ebuild 10227
-RMD160 7b09a525ac99d4d44ac53e3e193090f41aa8d047 tomcat-5.5.20-r5.ebuild 10227
-SHA256 30c697ecc987ace021a7fcbacc32f6e050fd7b8a49dc4e8a7382177f4acc3774 tomcat-5.5.20-r5.ebuild 10227
-EBUILD tomcat-5.5.20-r6.ebuild 10235 RMD160 c75db964790363a05b2f04234e96dc880caa54d5 SHA1 48b8258f56938af7c7683e21a88fe22ad53b2e76 SHA256 1b0ea606f802e3903fcb43d65983cad0606f1bc562d9373feb8a5905e73a27d7
-MD5 c29595278538a55ccc576c7ee80b0e03 tomcat-5.5.20-r6.ebuild 10235
-RMD160 c75db964790363a05b2f04234e96dc880caa54d5 tomcat-5.5.20-r6.ebuild 10235
-SHA256 1b0ea606f802e3903fcb43d65983cad0606f1bc562d9373feb8a5905e73a27d7 tomcat-5.5.20-r6.ebuild 10235
-EBUILD tomcat-6.0.7_alpha-r3.ebuild 4630 RMD160 5c828822b73cec59bb432c4b419ca42d85373a91 SHA1 1baa8f924fd4f0b1ecd2f1761db10e9d6349e2a6 SHA256 ccf1afed8738fc4145037f822c649ce1006e132304c132d147d0feb57e1c8d04
-MD5 b3d9c65197f142668369d668fb782365 tomcat-6.0.7_alpha-r3.ebuild 4630
-RMD160 5c828822b73cec59bb432c4b419ca42d85373a91 tomcat-6.0.7_alpha-r3.ebuild 4630
-SHA256 ccf1afed8738fc4145037f822c649ce1006e132304c132d147d0feb57e1c8d04 tomcat-6.0.7_alpha-r3.ebuild 4630
-MISC ChangeLog 32241 RMD160 247615b7b4975d50d9f03bf5af7564e2b0ae0f01 SHA1 f853f40dbf48c13767e4521a79826eee9a846728 SHA256 29aa11d59e3d5426d04382d0d15048b3714732e8380adbe746f56f5ab3a12003
-MD5 31d4768ea12b5129b5b5ec2c11d5c280 ChangeLog 32241
-RMD160 247615b7b4975d50d9f03bf5af7564e2b0ae0f01 ChangeLog 32241
-SHA256 29aa11d59e3d5426d04382d0d15048b3714732e8380adbe746f56f5ab3a12003 ChangeLog 32241
+EBUILD tomcat-5.0.27-r6.ebuild 3847 RMD160 41cea01bc672d5ab288f88b5af3bd61cc295c970 SHA1 70a142673897e04a5a0ebaeca26e21e58132e987 SHA256 8784db8376eed0d3b5fdb74c1377505e7e3c3996c7e426dfa2fb795f0b91b019
+MD5 981b0a50e37b88b5b73b17c2e2534d5a tomcat-5.0.27-r6.ebuild 3847
+RMD160 41cea01bc672d5ab288f88b5af3bd61cc295c970 tomcat-5.0.27-r6.ebuild 3847
+SHA256 8784db8376eed0d3b5fdb74c1377505e7e3c3996c7e426dfa2fb795f0b91b019 tomcat-5.0.27-r6.ebuild 3847
+EBUILD tomcat-5.0.28-r14.ebuild 9331 RMD160 443c26d31df8fbd41e2f3e84f14cd47fc4f14d4e SHA1 20cf06c0814491fca7a2167e53d333ff34e07050 SHA256 995765389ab7fda0cf3a628f6da919ca1e0c51b4cc7afd9aa371b094e45581d6
+MD5 1325b1a3c64afbb14284b913313073d9 tomcat-5.0.28-r14.ebuild 9331
+RMD160 443c26d31df8fbd41e2f3e84f14cd47fc4f14d4e tomcat-5.0.28-r14.ebuild 9331
+SHA256 995765389ab7fda0cf3a628f6da919ca1e0c51b4cc7afd9aa371b094e45581d6 tomcat-5.0.28-r14.ebuild 9331
+EBUILD tomcat-5.5.20-r5.ebuild 10202 RMD160 9931d0ab2e9c524fc861baece747d86d7b636a06 SHA1 5a764696112a7b19cd8dcbaf50a82bc0179fcb52 SHA256 e71ffd09d964eea2d2510e79d7caaf7b803219d62c7021f0800d65fca4ace884
+MD5 ed18056c8c800cda630f00f7c98fa657 tomcat-5.5.20-r5.ebuild 10202
+RMD160 9931d0ab2e9c524fc861baece747d86d7b636a06 tomcat-5.5.20-r5.ebuild 10202
+SHA256 e71ffd09d964eea2d2510e79d7caaf7b803219d62c7021f0800d65fca4ace884 tomcat-5.5.20-r5.ebuild 10202
+EBUILD tomcat-5.5.20-r6.ebuild 10209 RMD160 d4d4ff17f5ea2a85ac72a12c92b02cec62af6c31 SHA1 a9a565f3688863be8080c543783931302edc3da4 SHA256 a9a4b84e286ef5a5f40af3b6bd8c09f326b67e19c692213139fae08c8b22a2e0
+MD5 b6cd386a5a03055cd755b3f080e02195 tomcat-5.5.20-r6.ebuild 10209
+RMD160 d4d4ff17f5ea2a85ac72a12c92b02cec62af6c31 tomcat-5.5.20-r6.ebuild 10209
+SHA256 a9a4b84e286ef5a5f40af3b6bd8c09f326b67e19c692213139fae08c8b22a2e0 tomcat-5.5.20-r6.ebuild 10209
+EBUILD tomcat-6.0.7_alpha-r3.ebuild 4623 RMD160 6be698b38907158395e16f9ce423d31fb4de263a SHA1 62c65374ce3f0f2ac3a1e9daf0dcf7ef973cabb8 SHA256 0def52feaeb1d57169ecf77b723bd0504bf6c39a633629149c568021995ef118
+MD5 1c289058465b192739827ec8c6ad0421 tomcat-6.0.7_alpha-r3.ebuild 4623
+RMD160 6be698b38907158395e16f9ce423d31fb4de263a tomcat-6.0.7_alpha-r3.ebuild 4623
+SHA256 0def52feaeb1d57169ecf77b723bd0504bf6c39a633629149c568021995ef118 tomcat-6.0.7_alpha-r3.ebuild 4623
+MISC ChangeLog 32461 RMD160 6c0e0ae883f22e787283ad967a37c608af863fdd SHA1 e2b3e2b1c3d22b59fe81b45dff87eaf8402882ee SHA256 6978a6d20cd1b9e3fcf8b4625e9ed53b0b5b898fefb9c020e50aceaa6d7b44ee
+MD5 bb9f796b6eb3f59662d11353c2afc505 ChangeLog 32461
+RMD160 6c0e0ae883f22e787283ad967a37c608af863fdd ChangeLog 32461
+SHA256 6978a6d20cd1b9e3fcf8b4625e9ed53b0b5b898fefb9c020e50aceaa6d7b44ee ChangeLog 32461
 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79
 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556
 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556
diff --git a/www-servers/tomcat/tomcat-5.0.27-r6.ebuild b/www-servers/tomcat/tomcat-5.0.27-r6.ebuild
index b50d021150d3..b7af74d5c0a4 100644
--- a/www-servers/tomcat/tomcat-5.0.27-r6.ebuild
+++ b/www-servers/tomcat/tomcat-5.0.27-r6.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/www-servers/tomcat/tomcat-5.0.27-r6.ebuild,v 1.9 2006/12/08 10:08:00 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.27-r6.ebuild,v 1.10 2007/01/09 16:49:14 wltjr Exp $
 
 inherit eutils
 
@@ -91,39 +91,39 @@ pkg_postinst() {
 
 	chmod 750 /etc/${TOMCAT_NAME}
 
-	einfo
-	einfo " NOTICE!"
-	einfo " FILE LOCATIONS:"
-	einfo " 1.  Tomcat home directory: ${TOMCAT_HOME}"
-	einfo "     Contains application data, configuration files."
-	einfo " 2.  Runtime settings: /etc/conf.d/${TOMCAT_NAME}"
-	einfo "     Contains CLASSPATH and JAVA_HOME settings."
-	einfo " 3.  Configuration:  /etc/${TOMCAT_NAME}"
-	einfo " 4.  Logs:  /var/log/${TOMCAT_NAME}/"
-	einfo
-	einfo
-	einfo " STARTING AND STOPPING TOMCAT:"
-	einfo "   /etc/init.d/${TOMCAT_NAME} start"
-	einfo "   /etc/init.d/${TOMCAT_NAME} stop"
-	einfo "   /etc/init.d/${TOMCAT_NAME} restart"
-	einfo
-	einfo
+	elog
+	elog " NOTICE!"
+	elog " FILE LOCATIONS:"
+	elog " 1.  Tomcat home directory: ${TOMCAT_HOME}"
+	elog "     Contains application data, configuration files."
+	elog " 2.  Runtime settings: /etc/conf.d/${TOMCAT_NAME}"
+	elog "     Contains CLASSPATH and JAVA_HOME settings."
+	elog " 3.  Configuration:  /etc/${TOMCAT_NAME}"
+	elog " 4.  Logs:  /var/log/${TOMCAT_NAME}/"
+	elog
+	elog
+	elog " STARTING AND STOPPING TOMCAT:"
+	elog "   /etc/init.d/${TOMCAT_NAME} start"
+	elog "   /etc/init.d/${TOMCAT_NAME} stop"
+	elog "   /etc/init.d/${TOMCAT_NAME} restart"
+	elog
+	elog
 	ewarn " If you are upgrading from older ebuild do NOT use"
 	ewarn " /etc/init.d/tomcat and /etc/conf.d/tomcat you probably"
 	ewarn " want to remove these."
 	ewarn " A version number has been appended so that tomcat 3, 4 and 5"
 	ewarn " can be installed side by side"
-	einfo
-	einfo " NETWORK CONFIGURATION:"
-	einfo " By default, Tomcat runs on port 8080.  You can change this"
-	einfo " value by editing /etc/${TOMCAT_NAME}/server.xml."
-	einfo
-	einfo " To test Tomcat while it's running, point your web browser to:"
-	einfo " http://localhost:8080/"
-	einfo
-	einfo
-	einfo " BUGS:"
-	einfo " Please file any bugs at http://bugs.gentoo.org/ or else it"
-	einfo " may not get seen.  Thank you."
-	einfo
+	elog
+	elog " NETWORK CONFIGURATION:"
+	elog " By default, Tomcat runs on port 8080.  You can change this"
+	elog " value by editing /etc/${TOMCAT_NAME}/server.xml."
+	elog
+	elog " To test Tomcat while it's running, point your web browser to:"
+	elog " http://localhost:8080/"
+	elog
+	elog
+	elog " BUGS:"
+	elog " Please file any bugs at http://bugs.gentoo.org/ or else it"
+	elog " may not get seen.  Thank you."
+	elog
 }
diff --git a/www-servers/tomcat/tomcat-5.0.28-r14.ebuild b/www-servers/tomcat/tomcat-5.0.28-r14.ebuild
index ca658f344adf..f73361c9e705 100644
--- a/www-servers/tomcat/tomcat-5.0.28-r14.ebuild
+++ b/www-servers/tomcat/tomcat-5.0.28-r14.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/www-servers/tomcat/tomcat-5.0.28-r14.ebuild,v 1.5 2006/12/13 03:13:45 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.28-r14.ebuild,v 1.6 2007/01/09 16:49:14 wltjr Exp $
 
 inherit eutils java-pkg
 
@@ -232,18 +232,18 @@ pkg_postinst() {
 	chown root:root /etc/init.d/${TOMCAT_NAME}
 	chown root:root /etc/conf.d/${TOMCAT_NAME}
 
-	einfo
+	ewarn
 	ewarn " This ebuild implements a new filesystem layout for tomcat"
 	ewarn " please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml"
 	ewarn " for more information!."
-	einfo
-	einfo " Please file any bugs at http://bugs.gentoo.org/ or else it"
-	einfo " may not get seen.  Thank you."
-	einfo
-
-#	einfo "Run emerge --config =${PF}"
-#	einfo "to configure Tomcat if you need to for example"
-#	einfo "change the home directory of the Tomcat user."
+	elog
+	elog " Please file any bugs at http://bugs.gentoo.org/ or else it"
+	elog " may not get seen.  Thank you."
+	elog
+
+#	elog "Run emerge --config =${PF}"
+#	elog "to configure Tomcat if you need to for example"
+#	elog "change the home directory of the Tomcat user."
 }
 
 #helpers
@@ -256,36 +256,36 @@ pkg_config() {
 	# Better suggestions are welcome
 	local currentdir="$(getent passwd tomcat | gawk -F':' '{ print $6 }')"
 
-	einfo "The default home directory for Tomcat is /dev/null."
-	einfo "You need to change it if your applications needs it to"
-	einfo "be an actual directory. Current home directory:"
-	einfo "${currentdir}"
-	einfo ""
-	einfo "Do you want to change it [yes/no]?"
+	elog "The default home directory for Tomcat is /dev/null."
+	elog "You need to change it if your applications needs it to"
+	elog "be an actual directory. Current home directory:"
+	elog "${currentdir}"
+	elog ""
+	elog "Do you want to change it [yes/no]?"
 
 	local answer
 	read answer
 
 	if [[ "${answer}" == "yes" ]]; then
-		einfo ""
-		einfo "Suggestions:"
-		einfo "${WEBAPPS_DIR}"
-		einfo ""
-		einfo "If you want to suggest a directory, file a bug to"
-		einfo "http://bugs.gentoo.org"
-		einfo ""
-		einfo "Enter home directory:"
+		elog ""
+		elog "Suggestions:"
+		elog "${WEBAPPS_DIR}"
+		elog ""
+		elog "If you want to suggest a directory, file a bug to"
+		elog "http://bugs.gentoo.org"
+		elog ""
+		elog "Enter home directory:"
 
 		local homedir
 		read homedir
 
-		einfo ""
-		einfo "Setting home directory to: ${homedir}"
+		elog ""
+		elog "Setting home directory to: ${homedir}"
 
 		/usr/sbin/usermod -d"${homedir}" tomcat
 
-		einfo "You can run emerge --config =${PF}"
-		einfo "again to change to homedir"
-		einfo "at any time."
+		elog "You can run emerge --config =${PF}"
+		elog "again to change to homedir"
+		elog "at any time."
 	fi
 }
diff --git a/www-servers/tomcat/tomcat-5.5.20-r5.ebuild b/www-servers/tomcat/tomcat-5.5.20-r5.ebuild
index 1881f352e5a3..efae0f8c3a9d 100644
--- a/www-servers/tomcat/tomcat-5.5.20-r5.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.20-r5.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/www-servers/tomcat/tomcat-5.5.20-r5.ebuild,v 1.9 2006/12/30 16:25:31 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.20-r5.ebuild,v 1.10 2007/01/09 16:49:14 wltjr Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -278,18 +278,18 @@ pkg_postinst() {
 	chown root:root /etc/init.d/${TOMCAT_NAME}
 	chown root:root /etc/conf.d/${TOMCAT_NAME}
 
-	einfo
+	ewarn
 	ewarn " This ebuild implements a new filesystem layout for tomcat"
 	ewarn " please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml"
 	ewarn " for more information!."
-	einfo
-	einfo " Please file any bugs at http://bugs.gentoo.org/ or else it"
-	einfo " may not get seen.  Thank you."
-	einfo
-
-#	einfo "Run emerge --config =${PF}"
-#	einfo "to configure Tomcat if you need to for example"
-#	einfo "change the home directory of the Tomcat user."
+	elog
+	elog " Please file any bugs at http://bugs.gentoo.org/ or else it"
+	elog " may not get seen.  Thank you."
+	elog
+
+#	elog "Run emerge --config =${PF}"
+#	elog "to configure Tomcat if you need to for example"
+#	elog "change the home directory of the Tomcat user."
 }
 
 #helpers
@@ -302,36 +302,36 @@ pkg_config() {
 	# Better suggestions are welcome
 	local currentdir="$(getent passwd tomcat | gawk -F':' '{ print $6 }')"
 
-	einfo "The default home directory for Tomcat is /dev/null."
-	einfo "You need to change it if your applications needs it to"
-	einfo "be an actual directory. Current home directory:"
-	einfo "${currentdir}"
-	einfo ""
-	einfo "Do you want to change it [yes/no]?"
+	elog "The default home directory for Tomcat is /dev/null."
+	elog "You need to change it if your applications needs it to"
+	elog "be an actual directory. Current home directory:"
+	elog "${currentdir}"
+	elog ""
+	elog "Do you want to change it [yes/no]?"
 
 	local answer
 	read answer
 
 	if [[ "${answer}" == "yes" ]]; then
-		einfo ""
-		einfo "Suggestions:"
-		einfo "${WEBAPPS_DIR}"
-		einfo ""
-		einfo "If you want to suggest a directory, file a bug to"
-		einfo "http://bugs.gentoo.org"
-		einfo ""
-		einfo "Enter home directory:"
+		elog ""
+		elog "Suggestions:"
+		elog "${WEBAPPS_DIR}"
+		elog ""
+		elog "If you want to suggest a directory, file a bug to"
+		elog "http://bugs.gentoo.org"
+		elog ""
+		elog "Enter home directory:"
 
 		local homedir
 		read homedir
 
-		einfo ""
-		einfo "Setting home directory to: ${homedir}"
+		elog ""
+		elog "Setting home directory to: ${homedir}"
 
 		/usr/sbin/usermod -d"${homedir}" tomcat
 
-		einfo "You can run emerge --config =${PF}"
-		einfo "again to change to homedir"
-		einfo "at any time."
+		elog "You can run emerge --config =${PF}"
+		elog "again to change to homedir"
+		elog "at any time."
 	fi
 }
diff --git a/www-servers/tomcat/tomcat-5.5.20-r6.ebuild b/www-servers/tomcat/tomcat-5.5.20-r6.ebuild
index e4908ec47860..3f152361a552 100644
--- a/www-servers/tomcat/tomcat-5.5.20-r6.ebuild
+++ b/www-servers/tomcat/tomcat-5.5.20-r6.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/www-servers/tomcat/tomcat-5.5.20-r6.ebuild,v 1.1 2006/12/30 16:25:31 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.5.20-r6.ebuild,v 1.2 2007/01/09 16:49:14 wltjr Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -273,18 +273,18 @@ pkg_postinst() {
 	chown root:root /etc/init.d/${TOMCAT_NAME}
 	chown root:root /etc/conf.d/${TOMCAT_NAME}
 
-	einfo
+	ewarn
 	ewarn " This ebuild implements a new filesystem layout for tomcat"
 	ewarn " please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml"
 	ewarn " for more information!."
-	einfo
-	einfo " Please file any bugs at http://bugs.gentoo.org/ or else it"
-	einfo " may not get seen.  Thank you."
-	einfo
-
-#	einfo "Run emerge --config =${PF}"
-#	einfo "to configure Tomcat if you need to for example"
-#	einfo "change the home directory of the Tomcat user."
+	elog
+	elog " Please file any bugs at http://bugs.gentoo.org/ or else it"
+	elog " may not get seen.  Thank you."
+	elog
+
+#	elog "Run emerge --config =${PF}"
+#	elog "to configure Tomcat if you need to for example"
+#	elog "change the home directory of the Tomcat user."
 }
 
 #helpers
@@ -297,36 +297,36 @@ pkg_config() {
 	# Better suggestions are welcome
 	local currentdir="$(getent passwd tomcat | gawk -F':' '{ print $6 }')"
 
-	einfo "The default home directory for Tomcat is /dev/null."
-	einfo "You need to change it if your applications needs it to"
-	einfo "be an actual directory. Current home directory:"
-	einfo "${currentdir}"
-	einfo ""
-	einfo "Do you want to change it [yes/no]?"
+	elog "The default home directory for Tomcat is /dev/null."
+	elog "You need to change it if your applications needs it to"
+	elog "be an actual directory. Current home directory:"
+	elog "${currentdir}"
+	elog ""
+	elog "Do you want to change it [yes/no]?"
 
 	local answer
 	read answer
 
 	if [[ "${answer}" == "yes" ]]; then
-		einfo ""
-		einfo "Suggestions:"
-		einfo "${WEBAPPS_DIR}"
-		einfo ""
-		einfo "If you want to suggest a directory, file a bug to"
-		einfo "http://bugs.gentoo.org"
-		einfo ""
-		einfo "Enter home directory:"
+		elog ""
+		elog "Suggestions:"
+		elog "${WEBAPPS_DIR}"
+		elog ""
+		elog "If you want to suggest a directory, file a bug to"
+		elog "http://bugs.gentoo.org"
+		elog ""
+		elog "Enter home directory:"
 
 		local homedir
 		read homedir
 
-		einfo ""
-		einfo "Setting home directory to: ${homedir}"
+		elog ""
+		elog "Setting home directory to: ${homedir}"
 
 		/usr/sbin/usermod -d"${homedir}" tomcat
 
-		einfo "You can run emerge --config =${PF}"
-		einfo "again to change to homedir"
-		einfo "at any time."
+		elog "You can run emerge --config =${PF}"
+		elog "again to change to homedir"
+		elog "at any time."
 	fi
 }
diff --git a/www-servers/tomcat/tomcat-6.0.7_alpha-r3.ebuild b/www-servers/tomcat/tomcat-6.0.7_alpha-r3.ebuild
index 2d661e5526d0..d211597fa7ae 100644
--- a/www-servers/tomcat/tomcat-6.0.7_alpha-r3.ebuild
+++ b/www-servers/tomcat/tomcat-6.0.7_alpha-r3.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/www-servers/tomcat/tomcat-6.0.7_alpha-r3.ebuild,v 1.1 2007/01/05 03:45:33 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.7_alpha-r3.ebuild,v 1.2 2007/01/09 16:49:14 wltjr Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -146,11 +146,11 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo
-	einfo " This ebuild implements a FHS compliant layout for tomcat"
-	einfo " Please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml"
-	einfo " for more information."
-	einfo
-	einfo " Please report any bugs to http://bugs.gentoo.org/"
-	einfo
+	elog
+	elog " This ebuild implements a FHS compliant layout for tomcat"
+	elog " Please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml"
+	elog " for more information."
+	elog
+	elog " Please report any bugs to http://bugs.gentoo.org/"
+	elog
 }