Touch up style/messages to match grub-static -- no functional changes.

Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64

3 files changed, 24 insertions, 14 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index b1dabc1b6663..b7f7214d188e 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.233 2012/07/23 08:06:44 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.234 2012/07/24 15:49:35 vapier Exp $
+
+  24 Jul 2012; Mike Frysinger <vapier@gentoo.org> grub-0.97-r13.ebuild:
+  Touch up style/messages to match grub-static -- no functional changes.
 
   23 Jul 2012; Ryan Hill <dirtyepic@gentoo.org> grub-0.97-r13.ebuild:
   Remove ebeep due to EAPI 4. Improve output readability.
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 765a5848a0ba..e4d9ec844611 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX 1.99-call_proper_grub_probe.patch 536 SHA256 0e27b4ba6a0deedef2f65822e3b76aea4a817cb7219b01c29c8f682c450bd5e8 SHA512 db4188ed7e5ed3a736580cb17b3a41b984e81d65036254e699a3cba409cfdcbe342341a467c2e01d351800f70ec1b4c61c0fd23c2c4c5fbdf9949a16b43c4d4b WHIRLPOOL eda7dece32b1c3f74227b4f0e53e8846e30f0d56239c512ae17d852fa36825294b314d2c1af8d10807cf345201e31e37762fd556f2c2390ae9de9327129a8df0
 AUX 1.99-do_not_stat_so_often.patch 1731 SHA256 a33fdbcab7fa4ad66b26598d9a6f1703f419229058c1e9c9c14edb6272783727 SHA512 66c0e7ea45228b1b58fd842316c35ce708a4fc3170f255165dc90073ea109a7e7f34a0673bca3f8228c392fbd9470cf36984e9e3d9de59c4cd6974ddf05da1b5 WHIRLPOOL bb8e382e4822a03028340092e67ccfc84f5608a4600b329b85c1b325b01d6c0476223e0e102b0948e4ea4cf7cbf310c56468f3c703a72edb5383b8eda30f7f8d
@@ -43,7 +43,7 @@ EBUILD grub-0.96-r3.ebuild 4291 SHA256 ce7a2a810dc1df885b6df4ba6e4bdb9e2db68954b
 EBUILD grub-0.97-r10.ebuild 9459 SHA256 86413acb2ff57ab54b2f53499ccef341fc734edda73506ac56063667e473fec6 SHA512 c5d6a183140e1637300db264068c08347145d2808df0206e775458a9ccdc7f2a76c48b76545d563a27f141c8bcace0f17ef71e99e3d8e1de0c5cd6d45ac8b18d WHIRLPOOL 16ef1de80a08205af1be71b3cfe4b0959591f8827bc26a138a8a92e173944f0589df7e466263c074c96ab1e25eb7dc7669f352526d3a6f433581218812aa004d
 EBUILD grub-0.97-r11.ebuild 9460 SHA256 adab9a8ca3381cc500b81f48315a7ccdc01aff8bab661a498357b28df580c1e5 SHA512 c5314029baba3a32d805c5ab55d8f9d886cd6954610b7989df30bf0272412c9b1fca734c968e7462cee9d17e46c8a6a2e3144ed09ea8f41cbbf6b02217ad3dde WHIRLPOOL 64b82c6aee372085aefb530d248d192e61fe05e29ed1b577c9c7923caaba18ff309a904fca4ba813e9e5505eaf8b57b3b8ced3c0acd91a4f556e7a546407be46
 EBUILD grub-0.97-r12.ebuild 9234 SHA256 46c69ba461d3f60faf21692428a4bea98df721769639fd4e9c52ba5b9cde9e65 SHA512 6ad5911f986a311510c83ddee23a6e891cb15c7f2d9f5d04102655688a9e976d548cff8af1e8d400f5a1bfd910292f7740de0aac09b792be857e2e5feb6372d0 WHIRLPOOL ccec014b627b53837b09e883391fb8ece5536148396e55383290994065b1da62eec24ca1dc897289b224adb20caa320747f07049bd1eff2bff852566b5eb5ac2
-EBUILD grub-0.97-r13.ebuild 9401 SHA256 ac1d04b12e5099aacfa4d2eb734be17d1f464dc12fb15e5d7135caf7b842dfb7 SHA512 5225bd9bf4978e765386a57d26b2f75dffa07f9ecf2e2cdf7b59570cbd2e609a11e041d5e8a415d94bb0df712aa0079b4e833171a54f377310a99f5ed6c18f63 WHIRLPOOL 771da0e50e77a4b28bdda137527b3fee73d11efb90ea269fbf65c5b19662f95ba2e853806ada8308e91416c81257ea3d123add70a15215ef4e25c5525872f25a
+EBUILD grub-0.97-r13.ebuild 9384 SHA256 c694ab37f477548da2b98c9beb2c5432ddd799e40fcbf82273cd2da3fdb072e1 SHA512 615e4d11ba91c7bc2fcb926bfc791d1aa3151a06dd336f9597ccc5b22a4b6a1bbffde5f7622ec6cc4c04216c63d99becfc9cf38bcf8fed476773bd3b7930fad2 WHIRLPOOL 91d94e1f90393bb5137b791bfa2d73b418938091d81ec44b783d749ea08ee3a615a5ca4d07a841c66429f6ff7d480ae2ad4f0626576ddaab459f111106160761
 EBUILD grub-0.97-r2.ebuild 4820 SHA256 e76d0df0f865851a7ed5aba91b4f275ad099d9dd61f897c8a27ac0df31880a2d SHA512 c021917b2b54ed54205dd9d0c74be86882367e04f94e69460cb5c44cc15d05a2762140d286823b8abe8650ae72c0f85c646225d8c463ecadca9742b0ea391a23 WHIRLPOOL 4c741c97cec4820bfd7db26da9fd2d07722c2dc68ecee0388a34cf284c401dfe47700e517c427a55a76644f3cfdf52cb5bf47f7ff3e2a229cd6a07e4dab21f23
 EBUILD grub-0.97-r3.ebuild 4697 SHA256 fc6caf4957afda2029324f73403248c2916e5736a0e779fe1492d0c69fb8d358 SHA512 255f3628d98d4e0f9ecb17bb7e1f09c256abd5da2388034374a80700d7c8d0fb016e69b5fedc109e1bd2bef0e49e090612e77ae5531552252dc35f7110b026b8 WHIRLPOOL 7ef1de92ab6ecfdfdf3b1e64f50924de3702e37c0c142120b3898ba58eebaf15ca42d65aa63c5972acc8124d2e0196503e4cdde00545ab64a7185ffdd6e066d7
 EBUILD grub-0.97-r4.ebuild 4942 SHA256 28e7599759c86df56eedb0390553c85cd5b59ca4188cac2af7d9024b2d8743d4 SHA512 939469c8504dc60a56846d8a5a329673b363feef3e41b54c43b178bb254a3d24f1667b0bde738dbd04a3e5499060def55d758a49110bd89caeb9d388526448ac WHIRLPOOL 9187ee32dc340a66ebdcb9775fda2be3bb6990ae9352b34b0c5c6381c425a3b26140ed2e39fb9832e7fbc9643364392f116a0d1030dbcf6f616b87fabefeeb07
@@ -56,12 +56,22 @@ EBUILD grub-1.99-r2.ebuild 8413 SHA256 13a1281843b801804a5f2dc491cd21d6ac4d068c5
 EBUILD grub-2.00.ebuild 8167 SHA256 d53b92f81ef51be633e7f9f880d1f9e67673a37a8dd47cd0c079c77bada0bdad SHA512 2cd34bbba2f440748c47e80b9053cef4348c7d9f94a56e88a54256cb515e925491e487fe9977cc02ef432b9ee729b07b193e307d2fef44fb315c4ddf433c29b3 WHIRLPOOL c63ff472880b84078e3ae55676e121ea4694bb88092f1dcaa6b17d600187c9dc0f4ab3a4cc7e9d1e8c45ebb5173496814f7fef28b33613f43d13adc2f2e1a5e5
 EBUILD grub-2.00_beta6.ebuild 7140 SHA256 8026d9d32d21863e5427cac5b641fbc5f799662437bd9a40daa3f9a377a0de68 SHA512 35b5a7aa5224ba1f0d3dabaeb03d915b86a3c16419f6ef012c8092b198e8bbc054f22e4658930f704402066622b98c67c869f0c9cf5d74637c34ae786b0861fa WHIRLPOOL 54839cae4be956d12f8c62524923e9087f76c5e2c3c7db7cca074084deba71cd870238e514227a73a1131748fac501566afe29866231b68e4bbddbf2b465a71b
 EBUILD grub-9999.ebuild 8167 SHA256 58b9b6099fcb0f17a5bfd59f412c8fea80c10b17e79ad231327c871f8734167b SHA512 d0cf36393967713075fd0070b16146cd2729c25416960b240ad50b12e65dce9bf2c6cd64d1c0dc5f746d048542293ff2914492fb4841ec8a9ca111bbb33bb257 WHIRLPOOL f77488cd92c7b8b655431f43e421cf2bd02f55c6ff57b61debeabf0b2d2b69eb006b388813ff7e0e6dcba970a25acc0444efa240d4bf675b94a1f87eb537229e
-MISC ChangeLog 45873 SHA256 583c3de379433972de6e77b5dba879dd24e2a98ab36da1da765b7dce5bc539df SHA512 fec456598de672268e725b1f1653aa482dc122561935615f018f643c9600b051e2da099bb1f0c66f37b43978f2fada4e21cf2822939ac3a203672017c0461bdb WHIRLPOOL b10d54a7f0b9fcb5c77630619398f012f5508fce59fb0ea19279cf29e3efbffcdc57634ce2299529686bd913c14f4d3777fbd288ccf3667c2ec304abcc19b885
+MISC ChangeLog 46016 SHA256 29047ca5eac8f121ca4c93d938602856e0a0036c2e1c08ee0d9ae9e07ed078fa SHA512 3c8553471f4b9c2f9d52bf3b636ffa553ba2fa09540af22460a2bb8deaaebd879ac9999ff5e4bd217e7bcadf3335afccadf91e50f79e9eb74d102f4a71ec4359 WHIRLPOOL 35004eb2ed9c06ebe7be78030b7205315636ffd084261f5e5b89b89ead632bde5b9c97cfaca810141361d9763d301eb6a9a3fbb77f4fc6053c13ceecc648d759
 MISC metadata.xml 607 SHA256 5deec975010a509f536573e173aa1918e0c5b8993191064d1fd7914edc0c13e8 SHA512 5aee5daf3e1b9a32ed3e09046bcc131145d9d24ad0ac46f2df9d4ff7e5245bdcbf37bb694080b6d206115c2c4a542eb6a954755b3a049fba8267981852d9ea72 WHIRLPOOL 173e6be80665e0605e174f61553677baff64fa4306ed5f1448fce9d9741cb36224e5db5fff33f9a58788232a977f9779d0f95c0039c552049394e87b8582477a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlANCJcACgkQiqiDRvmkBmLmNwCg6fnVMuYlt0DdPhfx43viBvUT
-5wEAnjdncr09bah+cnODUhi9GvABeA0k
-=f/wy
+iQIcBAEBAgAGBQJQDsRWAAoJELEHsLL7fEFW7Z4P/0tD/QsaalaLHIRbt+WTU3Jj
+RCv8MpUse2/2tS6+9mmYM40P3DFStVyw4zHAS3MVYqXVRn2AhbVwKkG/O8MNuCHg
+r5UoIvc8HLh+mqyrYrcK4KpzmIy36jBZ0h/agxQniY4Daa/D4FO0DKfXp6CtS/q3
+NoMfG6tP6pXElZ27aRSG4Bi9q6qf6VTtOnIMzwcNwF9liCHrZ0bWblAzMwECxOmc
+epM9irppDi1RDN/t2aNr7YT1XY1ecE8doJ49OAwdvC+IRqtLc4pqkPTNoxH+pYZb
+Q/it43uXxOwlUDB4M3qgcZy1PCQ98ryXIKvDpKQ4oeW9nOXGmPPiIW+cEEUpCUF5
+I975a+5ORGEq/Bl0AMc5wzy30AMhMzFVacq6HEPQK6dHni5FJ/2kT9/IDc3i/91O
+WQm1QZ3J0bRYCwt+VWc0l3+prLsQfrmxNv0t4h4B26qRL9jKhig8NKgLoaxe6wvc
+e7iQfhaLemqGwvzslIM62+5eBsDflZBqXACtBJe2PQxuGAA/q1/46zTjnt4aC8oU
+eG+Obx7cRCxeYpTmB+ByMmicUSPBpIZTswTqmrR0i+dLsz26mzVRITn3SIvlatFe
+n2XiL66dcSEyjpUswGj9J4C/Yg9kwLbR9roGf0/tLQXJdi4XiVSoLbCNQKtJorqe
+wrTL3Z21IgV7Sk/LzE3e
+=fOOw
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-0.97-r13.ebuild b/sys-boot/grub/grub-0.97-r13.ebuild
index 99627b88162b..382bbfc45e72 100644
--- a/sys-boot/grub/grub-0.97-r13.ebuild
+++ b/sys-boot/grub/grub-0.97-r13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r13.ebuild,v 1.2 2012/07/23 08:06:44 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r13.ebuild,v 1.3 2012/07/24 15:49:35 vapier Exp $
 
 # XXX: we need to review menu.lst vs grub.conf handling.  We've been converting
 #      all systems to grub.conf (and symlinking menu.lst to grub.conf), but
@@ -18,7 +18,7 @@
 
 EAPI="4"
 
-inherit mount-boot eutils flag-o-matic toolchain-funcs autotools linux-info pax-utils multiprocessing
+inherit eutils mount-boot toolchain-funcs linux-info flag-o-matic autotools pax-utils multiprocessing
 
 PATCHVER="1.14" # Should match the revision ideally
 DESCRIPTION="GNU GRUB Legacy boot loader"
@@ -263,21 +263,18 @@ pkg_postinst() {
 		elog "WARNING: you have DONT_MOUNT_BOOT in effect, so you must apply"
 		elog "the following instructions for your /boot!"
 		elog "Neglecting to do so may cause your system to fail to boot!"
-		echo
+		elog
 	else
 		setup_boot_dir "${ROOT}"/boot
 		# Trailing output because if this is run from pkg_postinst, it gets mixed into
 		# the other output.
-		echo
+		einfo ""
 	fi
 	elog "To interactively install grub files to another device such as a USB"
 	elog "stick, just run the following and specify the directory as prompted:"
-	elog
 	elog "   emerge --config =${PF}"
-	elog
 	elog "Alternately, you can export GRUB_ALT_INSTALLDIR=/path/to/use to tell"
 	elog "grub where to install in a non-interactive way."
-	echo
 
 	# needs to be after we call setup_boot_dir
 	mount-boot_pkg_postinst