replace einfo with elog

Package-Manager: portage-2.1.1_pre2-r4

9 files changed, 141 insertions, 135 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 75296eef78fa..c8b22b7d6bf6 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.200 2006/07/05 18:58:57 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.201 2006/07/06 23:15:23 genone Exp $
+
+  06 Jul 2006; Marius Mauch <genone@gentoo.org> portage-2.0.51.22-r3.ebuild,
+  portage-2.0.54-r2.ebuild, portage-2.1.ebuild, portage-2.1-r1.ebuild,
+  portage-2.1.1_pre1-r5.ebuild, portage-2.1.1_pre2-r2.ebuild,
+  portage-2.1.1_pre2-r4.ebuild:
+  replace einfo with elog
 
 *portage-2.1.1_pre2-r4 (05 Jul 2006)
 
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index d42005137cfa..e8d01e07e033 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -38,38 +38,38 @@ DIST portage-man-pl-2.1-r1.patch.bz2 2076 RMD160 be3898714b94fb0253c1826909649ea
 DIST portage-man-pl-2.1.tar.bz2 52425 RMD160 5fdb898b94b0c6bb23234f0903572675f653ff44 SHA1 9942d024d0c29ccf1bc5d71954ed4668a2aaa424 SHA256 7e01f6c9c567f81d8e81dfdc26cf04b8d1f9f375090641cb80580986f8ac4817
 DIST portage-man-pl-2.1_rc4.tar.bz2 52266 RMD160 e250a0c2e6da46f3c5c21ac6ac6df47f9976243a SHA1 0f6700555da057af5d9d447ca7f3ddb5955931f0 SHA256 86e462a529471601f64ec6293c56f4f461c853201d0587fb0b7de8e845021fbb
 DIST portage-patches-2.0.54-2.tar.bz2 6722 RMD160 a9fbb40ec45c62db6b94e79b33ebabf5de22b287 SHA1 44f0b24d6c5893e50f2e4315d9ca22a288062ba8 SHA256 6d6055f433411a42d0388b787fc353014cf527dba51dd0faee203e5dda2d1fcc
-EBUILD portage-2.0.51.22-r3.ebuild 5796 RMD160 3bdf43216d1d70e8547bac9637a394dbcd9a7bd2 SHA1 b88b2898eb5ba5b4471a10f8fa82df9b8dc747f0 SHA256 f634d807fcc92500d9acc3dd5d79aadd2f565dbf1ee64a0f75a3543e2a372e25
-MD5 4df85686b65f5591383e16bf3d6845ba portage-2.0.51.22-r3.ebuild 5796
-RMD160 3bdf43216d1d70e8547bac9637a394dbcd9a7bd2 portage-2.0.51.22-r3.ebuild 5796
-SHA256 f634d807fcc92500d9acc3dd5d79aadd2f565dbf1ee64a0f75a3543e2a372e25 portage-2.0.51.22-r3.ebuild 5796
-EBUILD portage-2.0.54-r2.ebuild 4251 RMD160 80eeec613d740d8c425947089e408138aa81a2e2 SHA1 6876d32ef78f7fd3a7567618c18301ca9e93a467 SHA256 ddda381bac1a0b18913c2316ddc475762afcaae565e3a17280f8c9d2d19fe757
-MD5 a91dee4334b2e4c2bdf14af13e897311 portage-2.0.54-r2.ebuild 4251
-RMD160 80eeec613d740d8c425947089e408138aa81a2e2 portage-2.0.54-r2.ebuild 4251
-SHA256 ddda381bac1a0b18913c2316ddc475762afcaae565e3a17280f8c9d2d19fe757 portage-2.0.54-r2.ebuild 4251
-EBUILD portage-2.1-r1.ebuild 7549 RMD160 5bafdf5f52d5a29693c1458fc99ab9de05454b87 SHA1 c5505697e9d6cd52601c307cc5f8044ab19c5d2e SHA256 5c2259aa82c8570e345e3061aa6f68420f46e652d2f80817cbfa2289080abaff
-MD5 f1d5615c8ae3f4471d10d2a0151d182c portage-2.1-r1.ebuild 7549
-RMD160 5bafdf5f52d5a29693c1458fc99ab9de05454b87 portage-2.1-r1.ebuild 7549
-SHA256 5c2259aa82c8570e345e3061aa6f68420f46e652d2f80817cbfa2289080abaff portage-2.1-r1.ebuild 7549
-EBUILD portage-2.1.1_pre1-r5.ebuild 5692 RMD160 1d0b157a7b3c74cbee5bfd4f67a2631e8dbbd766 SHA1 89c8aaf599345f6a8939f1ffb351768d7fb8d884 SHA256 26df65f5f419c00e2c345fb2b8c808dd9c84551c23eb52b528018d5fc6e72c16
-MD5 210a4557c343011fcdf8a5077cdeef3e portage-2.1.1_pre1-r5.ebuild 5692
-RMD160 1d0b157a7b3c74cbee5bfd4f67a2631e8dbbd766 portage-2.1.1_pre1-r5.ebuild 5692
-SHA256 26df65f5f419c00e2c345fb2b8c808dd9c84551c23eb52b528018d5fc6e72c16 portage-2.1.1_pre1-r5.ebuild 5692
-EBUILD portage-2.1.1_pre2-r2.ebuild 5786 RMD160 74d16a113a871eb7a6abbd03149edfeb61608285 SHA1 f343666d3347d45d70cb03cd81697b97ebe205cd SHA256 bae713cf1c65dcef314131d18a4e132c48c8966cf9a49bef9880341258500811
-MD5 fd23c3d9a1c76a61294f33c340ebc6c6 portage-2.1.1_pre2-r2.ebuild 5786
-RMD160 74d16a113a871eb7a6abbd03149edfeb61608285 portage-2.1.1_pre2-r2.ebuild 5786
-SHA256 bae713cf1c65dcef314131d18a4e132c48c8966cf9a49bef9880341258500811 portage-2.1.1_pre2-r2.ebuild 5786
-EBUILD portage-2.1.1_pre2-r4.ebuild 5863 RMD160 546590e0376d3678f19199b8e644b1490921ac2a SHA1 6306f019a642c94c5a4124a0d318999896a26b58 SHA256 f4499472fa10c29785573cb756343905c77e063330e932abbee2404952a60cd2
-MD5 ec952c0172798ddaecc64487149e096a portage-2.1.1_pre2-r4.ebuild 5863
-RMD160 546590e0376d3678f19199b8e644b1490921ac2a portage-2.1.1_pre2-r4.ebuild 5863
-SHA256 f4499472fa10c29785573cb756343905c77e063330e932abbee2404952a60cd2 portage-2.1.1_pre2-r4.ebuild 5863
-EBUILD portage-2.1.ebuild 7248 RMD160 e54df351244bb056247dc870e8cae61f9d4d69c2 SHA1 820a21fbe6b7b1d60987a9bda32df12cd85b76e7 SHA256 93eeb65fc06e62c619785c7ac4dbf8aaf2f2a07d547f7e1d2a860ad1cdce2d13
-MD5 34ee3d531b703420790ae14a8dbb5f79 portage-2.1.ebuild 7248
-RMD160 e54df351244bb056247dc870e8cae61f9d4d69c2 portage-2.1.ebuild 7248
-SHA256 93eeb65fc06e62c619785c7ac4dbf8aaf2f2a07d547f7e1d2a860ad1cdce2d13 portage-2.1.ebuild 7248
-MISC ChangeLog 16182 RMD160 19b038cc8205cfe9c7de7ab537a339f9bd0e57c6 SHA1 5077001b4fb38ba477ed6e1cc7aec3268118a606 SHA256 3c848c844f653803fbe5658a2cc82697a2caeb3c03d2a9086d3cb4fe5c0d3a03
-MD5 bff97a4a6bb0448b9d07c14bd8048d3c ChangeLog 16182
-RMD160 19b038cc8205cfe9c7de7ab537a339f9bd0e57c6 ChangeLog 16182
-SHA256 3c848c844f653803fbe5658a2cc82697a2caeb3c03d2a9086d3cb4fe5c0d3a03 ChangeLog 16182
+EBUILD portage-2.0.51.22-r3.ebuild 5784 RMD160 b832375b604d0032e3727ad96d9c766c5f49f448 SHA1 932b3a10dcf86c09600db06084bf4425a55ece20 SHA256 b3eb209b100cb5c1b6eec6028d3b7652b75043ae60a8b8bc0b1b8aa923879b5b
+MD5 b61116f5434ae92ca80cba6e990928d5 portage-2.0.51.22-r3.ebuild 5784
+RMD160 b832375b604d0032e3727ad96d9c766c5f49f448 portage-2.0.51.22-r3.ebuild 5784
+SHA256 b3eb209b100cb5c1b6eec6028d3b7652b75043ae60a8b8bc0b1b8aa923879b5b portage-2.0.51.22-r3.ebuild 5784
+EBUILD portage-2.0.54-r2.ebuild 4247 RMD160 65a378979932e560426f072a67492d9ac4293eb0 SHA1 bb087223860390524508dbb4721877ce925fea8d SHA256 880efc42b6298d4867b140c85b03e4875ccac9715110ce4768f48c58ffdbcbff
+MD5 3e292710aeafbcd854d3c515347fc900 portage-2.0.54-r2.ebuild 4247
+RMD160 65a378979932e560426f072a67492d9ac4293eb0 portage-2.0.54-r2.ebuild 4247
+SHA256 880efc42b6298d4867b140c85b03e4875ccac9715110ce4768f48c58ffdbcbff portage-2.0.54-r2.ebuild 4247
+EBUILD portage-2.1-r1.ebuild 7519 RMD160 f6a6e35dd94fd05c5739ab529bfd6eebbd9a87a4 SHA1 349d11c693568bf567d24f25ea7b3e22a0c635d5 SHA256 bdadfb8a6e2dab3dadd1f573f8ffc5603b1e263adf48999b396663ee313b11c1
+MD5 4573216aa36cf4904976d82b14825c02 portage-2.1-r1.ebuild 7519
+RMD160 f6a6e35dd94fd05c5739ab529bfd6eebbd9a87a4 portage-2.1-r1.ebuild 7519
+SHA256 bdadfb8a6e2dab3dadd1f573f8ffc5603b1e263adf48999b396663ee313b11c1 portage-2.1-r1.ebuild 7519
+EBUILD portage-2.1.1_pre1-r5.ebuild 5686 RMD160 824053e6cd304ce142934660bbb647e91054ca62 SHA1 799a4cd4b358e4576f69429064bdd4b894354f40 SHA256 5a3e35178728f935e23eccaab373e007d6da5f6b2c33e3980409d945e6a0c929
+MD5 de6e10e1ef1add7046303b16caf5f442 portage-2.1.1_pre1-r5.ebuild 5686
+RMD160 824053e6cd304ce142934660bbb647e91054ca62 portage-2.1.1_pre1-r5.ebuild 5686
+SHA256 5a3e35178728f935e23eccaab373e007d6da5f6b2c33e3980409d945e6a0c929 portage-2.1.1_pre1-r5.ebuild 5686
+EBUILD portage-2.1.1_pre2-r2.ebuild 5780 RMD160 49dbeb4cd588385ef7a5c023cdb200b647159f6b SHA1 4731009f4b91ce6f5817f9b4fd8c843054a43a51 SHA256 65af49d2bf643e7f69f913f6e51c4df0589a606bc9bfda58f6ee93eb353e5abc
+MD5 0fe6b7ca777a766eef8509ac887b87e8 portage-2.1.1_pre2-r2.ebuild 5780
+RMD160 49dbeb4cd588385ef7a5c023cdb200b647159f6b portage-2.1.1_pre2-r2.ebuild 5780
+SHA256 65af49d2bf643e7f69f913f6e51c4df0589a606bc9bfda58f6ee93eb353e5abc portage-2.1.1_pre2-r2.ebuild 5780
+EBUILD portage-2.1.1_pre2-r4.ebuild 5857 RMD160 9d71ec95d944ae63b5e1247afd3ae0911d93bf92 SHA1 e3689538f3351e80a2e82129e520986ba1104fda SHA256 6d539a1a2ba4b488aedd916e839952bfc3aa13c6289bf92652118635ab64c963
+MD5 ae220267bee5b3947aeaf06f1b572c76 portage-2.1.1_pre2-r4.ebuild 5857
+RMD160 9d71ec95d944ae63b5e1247afd3ae0911d93bf92 portage-2.1.1_pre2-r4.ebuild 5857
+SHA256 6d539a1a2ba4b488aedd916e839952bfc3aa13c6289bf92652118635ab64c963 portage-2.1.1_pre2-r4.ebuild 5857
+EBUILD portage-2.1.ebuild 7219 RMD160 a8e6380ecb7077788c916da17cdcb651b71829c9 SHA1 3d6662a9d142e0cff5c29efbe21d85dede046800 SHA256 bfc3eb21c086de9e2cf45a1b3547bead801ab2e31d48d2e164bddd1419a07b8a
+MD5 680a2956b11fc523028c3a7e889315ca portage-2.1.ebuild 7219
+RMD160 a8e6380ecb7077788c916da17cdcb651b71829c9 portage-2.1.ebuild 7219
+SHA256 bfc3eb21c086de9e2cf45a1b3547bead801ab2e31d48d2e164bddd1419a07b8a portage-2.1.ebuild 7219
+MISC ChangeLog 16450 RMD160 6eebb9c7eae05214b097ef1450b04046b8f9ddf9 SHA1 cee7c7d292514636b3e36084ed52ce23dec186ae SHA256 8369275dff9938ede42701c5159ef8c56dd8c4c3b11730a8dc71ef2f9e773f72
+MD5 6cb395a7ca71e1a7e9234ecca0be5995 ChangeLog 16450
+RMD160 6eebb9c7eae05214b097ef1450b04046b8f9ddf9 ChangeLog 16450
+SHA256 8369275dff9938ede42701c5159ef8c56dd8c4c3b11730a8dc71ef2f9e773f72 ChangeLog 16450
 MISC metadata.xml 219 RMD160 613195ece366b33606e71ff1753be048f2507841 SHA1 d162fb909241ef50b95a3539bdfcde95429bdf81 SHA256 cbd3a20e5c89a48a842f7132fe705bf39959f02c1025052efce8aad8a8baa8dc
 MD5 74421bbd5bae342d72a7a30b98a69662 metadata.xml 219
 RMD160 613195ece366b33606e71ff1753be048f2507841 metadata.xml 219
@@ -98,7 +98,7 @@ SHA256 175b5640aa6cea37b0f5fb79b31c277fa33459017426a27d73e9a0ae12c50491 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFErAvw/ejvha5XGaMRAqv2AJ4pw2afWW6Sy1HmHasivr9GjMOVdwCgt35Y
-DMfEluy36j3dwr+s+gdNUms=
-=EkiV
+iD8DBQFErZn26J2i8a8J4okRAuFPAJ4+bpEPff6CFafMimtjo5hOfHpmhwCg20Uf
+Qsz+BRp/qCFus5Se37+Idso=
+=FaSS
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/portage/portage-2.0.51.22-r3.ebuild b/sys-apps/portage/portage-2.0.51.22-r3.ebuild
index 3adbff99fde4..163ae4fa4864 100644
--- a/sys-apps/portage/portage-2.0.51.22-r3.ebuild
+++ b/sys-apps/portage/portage-2.0.51.22-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51.22-r3.ebuild,v 1.5 2006/02/02 11:36:30 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51.22-r3.ebuild,v 1.6 2006/07/06 23:15:23 genone Exp $
 
 inherit toolchain-funcs
 
@@ -136,11 +136,11 @@ pkg_postinst() {
 	fi
 
 	echo
-	einfo "Feature additions are noted in help and make.conf descriptions."
+	elog "Feature additions are noted in help and make.conf descriptions."
 	echo
-	einfo "Update configs using 'etc-update' please. Maintaining current configs"
-	einfo "for portage and other system packages is fairly important for the"
-	einfo "continued health of your system."
+	elog "Update configs using 'etc-update' please. Maintaining current configs"
+	elog "for portage and other system packages is fairly important for the"
+	elog "continued health of your system."
 	echo
 	ewarn "NOTICE: There have been changes in the location of some internal files"
 	ewarn "        to better match the FHS. The changes do not directly affect users"
@@ -148,11 +148,11 @@ pkg_postinst() {
 	ewarn "        with and without these changes may introduce some inconsistencies"
 	ewarn "        in package data regarding 'world' and 'virtuals' (provides)."
 	echo
-	einfo "        /var/cache/edb/world has moved to /var/lib/portage/world"
+	elog "        /var/cache/edb/world has moved to /var/lib/portage/world"
 	echo
-	einfo "        /var/cache/edb/virtuals has been deprecated and is now calculated"
-	einfo "        on demand. Strictly _USER_ modifications to virtuals may go into"
-	einfo "        /etc/portage/profile/virtuals and will not be modified by portage."
+	elog "        /var/cache/edb/virtuals has been deprecated and is now calculated"
+	elog "        on demand. Strictly _USER_ modifications to virtuals may go into"
+	elog "        /etc/portage/profile/virtuals and will not be modified by portage."
 	echo
 
 	for X in ${ROOT}etc/._cfg????_make.globals; do
@@ -160,8 +160,8 @@ pkg_postinst() {
 		[ -e "${X}" ] && mv -f "${X}" "${ROOT}etc/make.globals"
 	done
 
-	einfo "You may run 'emerge metadata' to perform cache updates if you have"
-	einfo "changed versions of portage. This will provide a fairly dramatic"
-	einfo "speedup. Alternatively, you may 'emerge sync' if it has been more"
-	einfo "than 30 minutes since your last sync."
+	elog "You may run 'emerge metadata' to perform cache updates if you have"
+	elog "changed versions of portage. This will provide a fairly dramatic"
+	elog "speedup. Alternatively, you may 'emerge sync' if it has been more"
+	elog "than 30 minutes since your last sync."
 }
diff --git a/sys-apps/portage/portage-2.0.54-r2.ebuild b/sys-apps/portage/portage-2.0.54-r2.ebuild
index 67f77317ba1c..b28748456ee5 100644
--- a/sys-apps/portage/portage-2.0.54-r2.ebuild
+++ b/sys-apps/portage/portage-2.0.54-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.54-r2.ebuild,v 1.12 2006/05/29 17:35:45 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.54-r2.ebuild,v 1.13 2006/07/06 23:15:23 genone Exp $
 
 inherit toolchain-funcs eutils
 
@@ -21,10 +21,10 @@ PROVIDE="virtual/portage"
 S=${WORKDIR}/${PN}-${PV}
 
 portage_docs() {
-	einfo ""
-	einfo "For help with using portage please consult the Gentoo Handbook"
-	einfo "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
-	einfo ""
+	elog ""
+	elog "For help with using portage please consult the Gentoo Handbook"
+	elog "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
+	elog ""
 }
 
 src_unpack() {
@@ -35,7 +35,7 @@ src_unpack() {
 	done
 
 	if [ "${PR}" != "r0" ]; then
-		einfo "Setting portage.VERSION to ${PVR} ..."
+		elog "Setting portage.VERSION to ${PVR} ..."
 		sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \
 			die "Failed to patch portage.VERSION"
 	fi
diff --git a/sys-apps/portage/portage-2.1-r1.ebuild b/sys-apps/portage/portage-2.1-r1.ebuild
index f47d6597eccb..721acd20bd30 100644
--- a/sys-apps/portage/portage-2.1-r1.ebuild
+++ b/sys-apps/portage/portage-2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1-r1.ebuild,v 1.11 2006/07/02 20:30:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1-r1.ebuild,v 1.12 2006/07/06 23:15:23 genone Exp $
 
 inherit toolchain-funcs eutils
 
@@ -48,10 +48,10 @@ S="${WORKDIR}"/${PN}-${PV}
 S_PL="${WORKDIR}"/${PN}-${PV_PL}
 
 portage_docs() {
-	einfo ""
-	einfo "For help with using portage please consult the Gentoo Handbook"
-	einfo "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
-	einfo ""
+	elog ""
+	elog "For help with using portage please consult the Gentoo Handbook"
+	elog "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
+	elog ""
 }
 
 src_unpack() {
@@ -61,7 +61,7 @@ src_unpack() {
 		epatch "${WORKDIR}/${PN}-${PV}${PATCHVER}.patch"
 		use linguas_pl && \
 			epatch "${WORKDIR}/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch"
-		einfo "Setting portage.VERSION to ${PVR} ..."
+		elog "Setting portage.VERSION to ${PVR} ..."
 		sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \
 			die "Failed to patch portage.VERSION"
 		eend 0
@@ -191,35 +191,35 @@ pkg_postinst() {
 	ewarn "the CDB cache module), portage will not work until they have"
 	ewarn "been disabled via /etc/portage/modules."
 	echo
-	einfo "The default cache format has changed between 2.0.x and 2.1"
-	einfo "versions. If you have upgraded from 2.0.x, before using"
-	einfo "emerge, run \`emerge --metadata\` to restore portage's local"
-	einfo "cache."
+	elog "The default cache format has changed between 2.0.x and 2.1"
+	elog "versions. If you have upgraded from 2.0.x, before using"
+	elog "emerge, run \`emerge --metadata\` to restore portage's local"
+	elog "cache."
 	echo
-	einfo "With the new metadata_overlay cache module, it is possible to"
-	einfo "disable FEATURES=\"metadata-transfer\" (see make.conf.5)."
-	einfo "When this module is used, eclasses in \${PORTDIR} must never"
-	einfo "be modified by the user because portage will not be able to"
-	einfo "detect that cache regeneration is necessary."
-	einfo "When metadata_overlay is initially enabled by setting"
-	einfo "portdbapi.auxdbmodule = cache.metadata_overlay.database"
-	einfo "in /etc/portage/modules, the user must completely remove"
-	einfo "/var/cache/edb/dep/\${PORTDIR} in order to avoid unecessary"
-	einfo "cache regeneration."
+	elog "With the new metadata_overlay cache module, it is possible to"
+	elog "disable FEATURES=\"metadata-transfer\" (see make.conf.5)."
+	elog "When this module is used, eclasses in \${PORTDIR} must never"
+	elog "be modified by the user because portage will not be able to"
+	elog "detect that cache regeneration is necessary."
+	elog "When metadata_overlay is initially enabled by setting"
+	elog "portdbapi.auxdbmodule = cache.metadata_overlay.database"
+	elog "in /etc/portage/modules, the user must completely remove"
+	elog "/var/cache/edb/dep/\${PORTDIR} in order to avoid unecessary"
+	elog "cache regeneration."
 	echo
-	einfo "Flag ordering has changed for \`emerge --pretend --verbose\`."
-	einfo "Add EMERGE_DEFAULT_OPTS=\"--alphabetical\" to /etc/make.conf"
-	einfo "to restore the previous ordering."
+	elog "Flag ordering has changed for \`emerge --pretend --verbose\`."
+	elog "Add EMERGE_DEFAULT_OPTS=\"--alphabetical\" to /etc/make.conf"
+	elog "to restore the previous ordering."
 	echo
-	einfo "The default USE_ORDER setting (see make.conf.5) has changed in"
-	einfo "2.1 so that auto USE flags (from use.defaults) are no longer"
-	einfo "enabled.  In order to find out which flags have been disabled,"
-	einfo "the command \`env USE_ORDER=auto portageq envvar USE\` may be"
-	einfo "helpful.  These flags can be manually added to make.conf by the"
-	einfo "user (the command output may contain a few other automatically"
-	einfo "generated flags that do not need to be added to make.conf)."
+	elog "The default USE_ORDER setting (see make.conf.5) has changed in"
+	elog "2.1 so that auto USE flags (from use.defaults) are no longer"
+	elog "enabled.  In order to find out which flags have been disabled,"
+	elog "the command \`env USE_ORDER=auto portageq envvar USE\` may be"
+	elog "helpful.  These flags can be manually added to make.conf by the"
+	elog "user (the command output may contain a few other automatically"
+	elog "generated flags that do not need to be added to make.conf)."
 	echo
-	einfo "See NEWS and RELEASE-NOTES for further changes."
+	elog "See NEWS and RELEASE-NOTES for further changes."
 
 	portage_docs
 }
diff --git a/sys-apps/portage/portage-2.1.1_pre1-r5.ebuild b/sys-apps/portage/portage-2.1.1_pre1-r5.ebuild
index 98849a37e465..4748b4cd2811 100644
--- a/sys-apps/portage/portage-2.1.1_pre1-r5.ebuild
+++ b/sys-apps/portage/portage-2.1.1_pre1-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.1_pre1-r5.ebuild,v 1.1 2006/06/27 20:44:16 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.1_pre1-r5.ebuild,v 1.2 2006/07/06 23:15:23 genone Exp $
 
 inherit toolchain-funcs eutils
 
@@ -47,10 +47,10 @@ S="${WORKDIR}"/${PN}-${PV}
 S_PL="${WORKDIR}"/${PN}-${PV_PL}
 
 portage_docs() {
-	einfo ""
-	einfo "For help with using portage please consult the Gentoo Handbook"
-	einfo "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
-	einfo ""
+	elog ""
+	elog "For help with using portage please consult the Gentoo Handbook"
+	elog "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
+	elog ""
 }
 
 src_unpack() {
@@ -61,7 +61,7 @@ src_unpack() {
 		epatch "${FILESDIR}/bugs_138246_138259.patch"
 		use linguas_pl && \
 			epatch "${WORKDIR}/${PN}-man-pl-${PV_PL}${PATCHVER_PL}.patch"
-		einfo "Setting portage.VERSION to ${PVR} ..."
+		elog "Setting portage.VERSION to ${PVR} ..."
 		sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \
 			die "Failed to patch portage.VERSION"
 		eend 0
diff --git a/sys-apps/portage/portage-2.1.1_pre2-r2.ebuild b/sys-apps/portage/portage-2.1.1_pre2-r2.ebuild
index 079a52136918..f02a266462e8 100644
--- a/sys-apps/portage/portage-2.1.1_pre2-r2.ebuild
+++ b/sys-apps/portage/portage-2.1.1_pre2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.1_pre2-r2.ebuild,v 1.1 2006/07/03 03:39:45 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.1_pre2-r2.ebuild,v 1.2 2006/07/06 23:15:23 genone Exp $
 
 inherit toolchain-funcs eutils
 
@@ -51,10 +51,10 @@ S="${WORKDIR}"/${PN}-${PV}
 S_PL="${WORKDIR}"/${PN}-${PV_PL}
 
 portage_docs() {
-	einfo ""
-	einfo "For help with using portage please consult the Gentoo Handbook"
-	einfo "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
-	einfo ""
+	elog ""
+	elog "For help with using portage please consult the Gentoo Handbook"
+	elog "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
+	elog ""
 }
 
 src_unpack() {
@@ -65,7 +65,7 @@ src_unpack() {
 		epatch "${WORKDIR}/${PN}-${PV}${PATCHVER}.patch"
 	fi
 	if [ "${PR}" != "r0" ]; then
-		einfo "Setting portage.VERSION to ${PVR} ..."
+		elog "Setting portage.VERSION to ${PVR} ..."
 		sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \
 			die "Failed to patch portage.VERSION"
 		eend 0
diff --git a/sys-apps/portage/portage-2.1.1_pre2-r4.ebuild b/sys-apps/portage/portage-2.1.1_pre2-r4.ebuild
index 950154773e34..0cdaa5e896fb 100644
--- a/sys-apps/portage/portage-2.1.1_pre2-r4.ebuild
+++ b/sys-apps/portage/portage-2.1.1_pre2-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.1_pre2-r4.ebuild,v 1.1 2006/07/05 18:58:57 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.1_pre2-r4.ebuild,v 1.2 2006/07/06 23:15:23 genone Exp $
 
 inherit toolchain-funcs eutils
 
@@ -51,10 +51,10 @@ S="${WORKDIR}"/${PN}-${PV}
 S_PL="${WORKDIR}"/${PN}-${PV_PL}
 
 portage_docs() {
-	einfo ""
-	einfo "For help with using portage please consult the Gentoo Handbook"
-	einfo "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
-	einfo ""
+	elog ""
+	elog "For help with using portage please consult the Gentoo Handbook"
+	elog "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
+	elog ""
 }
 
 src_unpack() {
@@ -67,7 +67,7 @@ src_unpack() {
 	epatch "${FILESDIR}/bug_132601.patch"
 	epatch "${FILESDIR}/bug_132601-2.patch"
 	if [ "${PR}" != "r0" ]; then
-		einfo "Setting portage.VERSION to ${PVR} ..."
+		elog "Setting portage.VERSION to ${PVR} ..."
 		sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \
 			die "Failed to patch portage.VERSION"
 		eend 0
diff --git a/sys-apps/portage/portage-2.1.ebuild b/sys-apps/portage/portage-2.1.ebuild
index 1b496e563de5..54a59af89678 100644
--- a/sys-apps/portage/portage-2.1.ebuild
+++ b/sys-apps/portage/portage-2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.ebuild,v 1.9 2006/06/20 22:18:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.ebuild,v 1.10 2006/07/06 23:15:23 genone Exp $
 
 inherit toolchain-funcs eutils
 
@@ -44,10 +44,10 @@ S="${WORKDIR}"/${PN}-${PV}
 S_PL="${WORKDIR}"/${PN}-${PV_PL}
 
 portage_docs() {
-	einfo ""
-	einfo "For help with using portage please consult the Gentoo Handbook"
-	einfo "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
-	einfo ""
+	elog ""
+	elog "For help with using portage please consult the Gentoo Handbook"
+	elog "at http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=3"
+	elog ""
 }
 
 src_unpack() {
@@ -55,7 +55,7 @@ src_unpack() {
 	if [ "${PR}" != "r0" ]; then
 		cd "${S}"
 		epatch "${WORKDIR}/${PN}-${PV}${PATCHVER}.patch"
-		einfo "Setting portage.VERSION to ${PVR} ..."
+		elog "Setting portage.VERSION to ${PVR} ..."
 		sed -i "s/^VERSION=.*/VERSION=\"${PVR}\"/" pym/portage.py || \
 			die "Failed to patch portage.VERSION"
 		eend 0
@@ -185,35 +185,35 @@ pkg_postinst() {
 	ewarn "the CDB cache module), portage will not work until they have"
 	ewarn "been disabled via /etc/portage/modules."
 	echo
-	einfo "The default cache format has changed between 2.0.x and 2.1"
-	einfo "versions. If you have upgraded from 2.0.x, before using"
-	einfo "emerge, run \`emerge --metadata\` to restore portage's local"
-	einfo "cache."
+	elog "The default cache format has changed between 2.0.x and 2.1"
+	elog "versions. If you have upgraded from 2.0.x, before using"
+	elog "emerge, run \`emerge --metadata\` to restore portage's local"
+	elog "cache."
 	echo
-	einfo "With the new metadata_overlay cache module, it is possible to"
-	einfo "disable FEATURES=\"metadata-transfer\" (see make.conf.5)."
-	einfo "When this module is used, eclasses in \${PORTDIR} must never"
-	einfo "be modified by the user because portage will not be able to"
-	einfo "detect that cache regeneration is necessary."
-	einfo "When metadata_overlay is initially enabled by setting"
-	einfo "portdbapi.auxdbmodule = cache.metadata_overlay.database"
-	einfo "in /etc/portage/modules, the user must completely remove"
-	einfo "/var/cache/edb/dep/\${PORTDIR} in order to avoid unecessary"
-	einfo "cache regeneration."
+	elog "With the new metadata_overlay cache module, it is possible to"
+	elog "disable FEATURES=\"metadata-transfer\" (see make.conf.5)."
+	elog "When this module is used, eclasses in \${PORTDIR} must never"
+	elog "be modified by the user because portage will not be able to"
+	elog "detect that cache regeneration is necessary."
+	elog "When metadata_overlay is initially enabled by setting"
+	elog "portdbapi.auxdbmodule = cache.metadata_overlay.database"
+	elog "in /etc/portage/modules, the user must completely remove"
+	elog "/var/cache/edb/dep/\${PORTDIR} in order to avoid unecessary"
+	elog "cache regeneration."
 	echo
-	einfo "Flag ordering has changed for \`emerge --pretend --verbose\`."
-	einfo "Add EMERGE_DEFAULT_OPTS=\"--alphabetical\" to /etc/make.conf"
-	einfo "to restore the previous ordering."
+	elog "Flag ordering has changed for \`emerge --pretend --verbose\`."
+	elog "Add EMERGE_DEFAULT_OPTS=\"--alphabetical\" to /etc/make.conf"
+	elog "to restore the previous ordering."
 	echo
-	einfo "The default USE_ORDER setting (see make.conf.5) has changed in"
-	einfo "2.1 so that auto USE flags (from use.defaults) are no longer"
-	einfo "enabled.  In order to find out which flags have been disabled,"
-	einfo "the command \`env USE_ORDER=auto portageq envvar USE\` may be"
-	einfo "helpful.  These flags can be manually added to make.conf by the"
-	einfo "user (the command output may contain a few other automatically"
-	einfo "generated flags that do not need to be added to make.conf)."
+	elog "The default USE_ORDER setting (see make.conf.5) has changed in"
+	elog "2.1 so that auto USE flags (from use.defaults) are no longer"
+	elog "enabled.  In order to find out which flags have been disabled,"
+	elog "the command \`env USE_ORDER=auto portageq envvar USE\` may be"
+	elog "helpful.  These flags can be manually added to make.conf by the"
+	elog "user (the command output may contain a few other automatically"
+	elog "generated flags that do not need to be added to make.conf)."
 	echo
-	einfo "See NEWS and RELEASE-NOTES for further changes."
+	elog "See NEWS and RELEASE-NOTES for further changes."
 
 	portage_docs
 }