Stop using einfo/eerror in fix_libtool_files.sh to avoid a dependency on

sys-apps/gentoo-functions (bug #504434).

Signed-off-by: Ryan Hill <rhill@gentoo.org>
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x957A8463

3 files changed, 19 insertions, 16 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index 150b9813f6e5..4f8c36349455 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/gcc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.1001 2014/05/18 08:33:52 rhill Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.1002 2014/05/20 08:00:39 rhill Exp $
+
+  20 May 2014; Ryan Hill <rhill@gentoo.org> files/fix_libtool_files.sh:
+  Stop using einfo/eerror in fix_libtool_files.sh to avoid a dependency on
+  sys-apps/gentoo-functions (bug #504434).
 
 *gcc-4.9.0 (18 May 2014)
 
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 7a9ca199cc32..a3e18a5d49c2 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -20,7 +20,7 @@ AUX awk/fixlafiles.awk 7807 SHA256 3cae4890a295adef50c6cf8a7e14d1be4e7a2356479c0
 AUX awk/fixlafiles.awk-no_gcc_la 8596 SHA256 91e36c29133b6ff854bc84acd6cd2e9d07be6eaa73ef9b23e4f7bc6371107fab SHA512 a970ade3e0b57b3280dd01036a95338c4a7f0c7ec45e7aeb7255197df43e13a5fad8c565b4b345e3a0c8326f71ae7ab598b804eaeaa9d59eda8683195bccfe45 WHIRLPOOL e3da866b8902fbf639af545b43c3b6ccaca0f5d543647007f02e0b8bfc16a675463b8681e9fad11d6ce29517e099636f43708f880ef7a433e4578ee408c3b099
 AUX c89 412 SHA256 29ad5dd697135c2892067e780447894dc1cd071708157e46d21773ab99c5022c SHA512 71d33a147339d8d70a62aa22a95d3e70e445d8435d6ac05893f7da19ae851b89bea851f6ce213fbd22470f13572ae13b83cf02f0621333f07d7b0c68a79b7924 WHIRLPOOL d9707a2be8da7a709b54fcb1154cfa05e479f8c3bdd6173822ee1f1bc265b2a0d04741c0685bfb0db68e1e4297fb032d2f8ff94da88014575d947054474d8295
 AUX c99 446 SHA256 057b348cf5be9b4fb9db99a4549f6433c89d21e5f91dc5e46b0b4dc6b70432f5 SHA512 bf3b0eb1125d5e89b433954fcbf805cd86dec5a6eeb23df685ebf3ff83a610573f2ffcec65d893244c845936a73918387cba026710c65c854b2c94a78b007989 WHIRLPOOL b888038b96615c7a0363555b407a3de2c1f17e34428fa16dfbf56fcf68875d6bcdecbc61b545d7f71842ff1909a3ffeff17165fa7f56b48f95adae22f5f8bff1
-AUX fix_libtool_files.sh 1679 SHA256 0037e3f1303560f1ffadc61c7ed6bca13a41d6f2f70f196276938cda9dd158f0 SHA512 834beeb04f1057a0b1f79025fc9bbe0193ea8457055cc10b5b4c528a60e37ead7614a686aa6e7285e040161a91d4b5ff394539a33fc2f4b44be5c2514d0bb283 WHIRLPOOL c7e2f517e0c5c9a8930cd615f68222b44a6f227518ea71b5eb9b6436e1642be748d9cb4c0732f27df6c2ded2eb2c758d67ee9cb58e409f30814f988523dc649b
+AUX fix_libtool_files.sh 1636 SHA256 d2b5d275f08030a94b4186475020fc5a8b6d56ec76d2902ceb12399d5a04d8e8 SHA512 69b3834e43716b62bb878950f19a0efaa1957780e9ba05017ed03e3e7c0c1bc88bf4081c3a777cf06f2dd135d62642c7d9292754797b9c2886d43b82bf25a45e WHIRLPOOL b2ca64313433f3566ee9b2893d5913e9791dbefdd6500d513ddb32a40107892e23d6ad833067841e25000de4e52caff6a14f3b8e2de64cacfe7a147d29d817c8
 AUX gcc-configure-LANG.patch 2052 SHA256 63de6d2dcfe14f21d147abeb1390405b9220c03f8e968f482d4b4c1cf279c88b SHA512 a694c7ac2f45cc657097ff5b0cf1356ac88a9c06035c9ba15167e9d444844d0d8a478eb1b9b62195dd063774f79697b9148b9cdb6c261640b472c291061b2129 WHIRLPOOL 3cc1ec912fb192ff1058de5b93e49a994ba30d1501a932290dd5b3df1cd783875621cda56edeb41894cd5fa10c04917e693a40a60be8d742ddd7992bf5d8afeb
 AUX gcc-configure-texinfo.patch 337 SHA256 74b73a7ecec2d88889876b4db480cd173632f49d5396bb8e5b3c93673f9b5b98 SHA512 a15fba8bf2ff02bdeca54d6f186bfa08c1079c6a8ba0a3beef154483ce5c1b8c497e7ffeec32371968f0037e0ff8384609eb0c367d0155a4e5a7eef8aad084d5 WHIRLPOOL 39d008aad06f7621e4e5db15f5e85a59e583b43f8d247029bd4944466bb60a9795bda157d185c45c329294078e282703a243aad5c468d90c77665dd6336870d4
 AUX gcc-spec-env-r1.patch 3148 SHA256 da0a6442eb42bce58cbdc7858b110a2e65fc5bd5b4b780b9b491033de6e302fa SHA512 ecae71577543772cfe1711f1b4a8815c0b5d706ebd01edacd1f07586637d4805e25771f970a6e6d1bb696d4b1b5ef3e0036088a96a9f6beff7ddaee704175d16 WHIRLPOOL 3535605998eabccdee71ba396ed5cefbb8b0a8cb073101f6444c7d01233f3b3904c1b29f4daf0a3417c68de8dbd62a0b7dc367cacfcbfa0c4ee1b69b7df8c6fb
@@ -153,17 +153,17 @@ EBUILD gcc-4.8.1-r1.ebuild 1621 SHA256 d0f7a611912f92fa049e2fe8da8270db0d8a9c1b4
 EBUILD gcc-4.8.2-r1.ebuild 1579 SHA256 53136392926363dc219798505b2e47a2e591b5aa2ffc93fb4d8cef752a5c9465 SHA512 d3f79701d08962e0c2cf415dc2b63ce5e03fa3035b630ddf7869c5b538357e035da51e659e8b1b7aa9e2e90b6ef23860966e5ddf489a3140c071f65d74bf0648 WHIRLPOOL db38f8c170c87abb097f55254c5fbbad2fd8d5ca6e87ea8f9e7710f7a6ffdec542215bbb536d33f45ee84b7a75e28426942a019670944ad30fc10d31c94c64c3
 EBUILD gcc-4.8.2.ebuild 1627 SHA256 f789c5ed128a7348fc55c16595575736e86a444a7631dcbf8e0a1f47f47dcdbe SHA512 aa1728299a470dca2b187dceb7c7c3aa24c7db5b4e6f28dc0def97af1bd223927fdf78f14665bf5cbd2d1c8b4f5cc4fe71e26fbeac6a42004302fc010690efa9 WHIRLPOOL 19e3579c5a32fa9c1780a4706a8580d729a0e0a0bd944e7a5202872f3440f9fda7e02cd46699d410b66f1f8e854d18e7d57d32833a7ffe34b86db71359cdc3a1
 EBUILD gcc-4.9.0.ebuild 1556 SHA256 15523e66e454b85ba32b261b3e2cd4115edb9dfcc6475be8f13ccd454e3f8f23 SHA512 bba7b90bea1266089f09725d712459dd1b10a02c38f7948e29895825cb07d48f5e821ddb28f43b4b5c5886dca850dfd0c531fdff25a99ff9e0f06cd7d0a9590e WHIRLPOOL db3ac4ab7b406e16b3fdd43a98fff94926ce5edd999e5fe028241129276db3c74ed606f8f289717658ebff0a7b5f01b96190683fa4a7a67a2c00970e509431fa
-MISC ChangeLog 60826 SHA256 9c35564e0f21f0a6eb644dc7a2870bf0abd75fe82c714186e5f31e9556f39176 SHA512 79b4c976533482b5b9fbe66b24e261566206ae2c314736c7d411bd3b0389e87045f120a6263a7761a9d389a2e8a55a19a63e7cee89fb8ab52207740d64c7e789 WHIRLPOOL ae84fb627f2e6244b50fd8384fec2a7a584112748f11159dd34beaa4d19970d533cd9f97a14e542b0cdb6d1dfc5b9d68d5243a542721c4f290a74255071aafb1
+MISC ChangeLog 61017 SHA256 84364b74fefa36bf9abf5b47323849dff1e685e9465f1a5c044a896447322c73 SHA512 0f396e18b2676fab4fda03a43028d4990afb4aab60d0ae36a662fef79bfe059558c9aa780c2c7ee5c9719a16b57228c31a4a35bf559263fb9de2eec04ffda6e3 WHIRLPOOL b6d2b162dd10ff4815c4cf343325d09d2900ef2c277ba96e9b64a3ff06541b4907557754895405a209775c0ffc536df57b69b7157a9cf0baec36fe2a3b6db4e8
 MISC ChangeLog-2006 112483 SHA256 108a7803efc91b08dd27ca4a83468637222a0685760f63bce724cb486fbc4022 SHA512 2887a66d03f4e1a9c60c743d7aa22147bdd95900b9e759c760a63f1a60c90008585b10b4f46ecc26e0149427bbdb8b83a9de4546d75e9ad935dd8e5377bf8870 WHIRLPOOL a2e1df0a7cead4373b5aeda333d952407049e1945f0a4e7774e1249e9f08ee33faafe0e74adec28b641bf037b8d6a350f45760a25c15e769b23eadb84b7ea48e
 MISC metadata.xml 2013 SHA256 908c83d1adcb78c343319c0730554e914cd8bc9fa1cf81b1eb86de338372d9df SHA512 36ea07edc9590441d66d49a9a61bd4849c15fac0e23cb49774af8d0b9ba8af4dc9c55ed303535ad6ac3fbdc7dc82f1df01bcdad5320bfef7451633a09b966b12 WHIRLPOOL 87a1601ac7ab333b6fb489458502d0918745b3d8d1e3b7d8ba28a4effc05ef2cac13c580cd28d829cfc0cc421f17c2b82ddb59decb09e24751a1665a409b2625
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTeHB3AAoJEO04vUmVeoRjM38H/A3R11j8+HPzoIfqv0HwtfYQ
-/jWLF3f7wnp5F7mc7GHrzRuyDM9q+pKrNLurOEEyELzsj2l6G/KBKHPmJnJTH8kP
-PMcBLESIwTqezISETcLpBnEI4VHPW5aZ9ntRuY+eG1A4iusScgEcwnYcV1hNQmVJ
-9b7qmRvztyNjIe8AnPZmzUvmKbnXMOI0DdBgL2DPThQRIeblczLHNwq4yX1zsDOx
-OkVlk6cDBhb8xwZ07YRSRFQW8+doPMe9EdewQ+QUbQZnMOQWKOyDzEhb5+qUN1AQ
-cPXqiwWLEtjeAn5QzvV/8rGIZL7IVlW9nARUNILAn5bEgahOlcPLqqQ74PPeDM8=
-=yj+r
+iQEcBAEBCAAGBQJTewuwAAoJEO04vUmVeoRj+YwH/0x8ALKUqmeXFJHolyLKKarn
+9wUSj4Qmy5X7cwe/Fivr9hLzZh9CNOEAy+BDIcaQ1p0LnglB0qeRLDP3IPfU9fyw
+TVVZ8TYjLUS+/0byxUEV/xT9hy43TQOqQKNChuydoKueDveYiyId+5u3mDKLe03W
+p31mIqEttNkuU0o4qmuq0QyMm71QEV7xYNJKBnPMQyIgbjfZxySYeehcqY6T4SUu
+XAEITzTFPDqzMQyyfA9TP00Jxb2ByErp1S9vkdPctJVz3/Uh050Xa+O4ZF2B1SnL
+P6fd5jqvjuzP3fcDmlsPH9uHnvrmHaiCXkwo4aKw/V6zB0S2R/AFE4zjLNXvWWU=
+=UdIY
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/gcc/files/fix_libtool_files.sh b/sys-devel/gcc/files/fix_libtool_files.sh
index c55250b6bacc..0c8a42bdc67d 100644
--- a/sys-devel/gcc/files/fix_libtool_files.sh
+++ b/sys-devel/gcc/files/fix_libtool_files.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/files/fix_libtool_files.sh,v 1.16 2012/05/18 21:28:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/files/fix_libtool_files.sh,v 1.17 2014/05/20 08:00:40 rhill Exp $
 
 usage() {
 cat << "USAGE_END"
@@ -38,10 +38,9 @@ ARGV2=$2
 ARGV3=$3
 
 . /etc/profile || exit 1
-. /etc/init.d/functions.sh || exit 1
 
 if [ ${EUID:-0} -ne 0 ] ; then
-	eerror "${0##*/}: Must be root."
+	echo "${0##*/}: Must be root."
 	exit 1
 fi
 
@@ -54,7 +53,7 @@ OLDCHOST=
 AWKDIR="/usr/share/gcc-data"
 
 if [ ! -r "${AWKDIR}/fixlafiles.awk" ] ; then
-	eerror "${0##*/}: ${AWKDIR}/fixlafiles.awk does not exist!"
+	echo "${0##*/}: ${AWKDIR}/fixlafiles.awk does not exist!"
 	exit 1
 fi
 
@@ -62,7 +61,7 @@ OLDVER=${ARGV1}
 
 export OLDVER OLDCHOST
 
-einfo "Scanning libtool files for hardcoded gcc library paths..."
+echo "Scanning libtool files for hardcoded gcc library paths..."
 exec gawk -f "${AWKDIR}/fixlafiles.awk"
 
 # vim:ts=4