Fix bash completion symlinks.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

3 files changed, 20 insertions, 39 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 5f0ed1a8f642..5c6e3d6a15ba 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.332 2014/12/05 08:06:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.333 2014/12/06 03:09:58 floppym Exp $
+
+  06 Dec 2014; Mike Gilbert <floppym@gentoo.org> grub-2.02_beta2-r5.ebuild:
+  Fix bash completion symlinks.
 
 *grub-2.02_beta2-r5 (05 Dec 2014)
 
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 2bc69a6f22a7..ea3704e99243 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX grub-2.00-freetype-2.5.1.patch 752 SHA256 95ddb348097df2bdf51a36529935118ad4bb51cb780038d149ed0ae3bf0693c9 SHA512 e9d05de956364b923e01d8f71d77f05d6c0815b7ae21ec5d34875de09770ce42b52f7d410314f7e4a273256350d7cbf311cf95a5d83e469c7a83b9b69879caff WHIRLPOOL 67751eaad605cf064106f2a304657bf1fe1ea1f4bb3f6efe436f2d7e6b84e80b56327e51cff4db63a7f34e7f21a456d3c7517d6ee6da5f8f2cbd7816f34d4016
 AUX grub-2.02_beta2-bash-completions.patch 4262 SHA256 a375f26661a7795f33bc98dadfe56bea4ee048792d98073c27f940344baaa240 SHA512 5e9a3406ef6abc4b7b2f2ec75c538029729efb6c6257ef9fd90986d5d37eabcaa4a52ce19530a6afc0f5002739553697e4f4ad523cff849aa6ebfcf2c896ad83 WHIRLPOOL d12db12ef47b507ac3ea3adbd223f7d9393cfdd088eddbf994c81c57420840dd69c235ea81e853215fc309b64ffbef78bb02860011d89356d99aed1f3454a55d
@@ -22,26 +22,14 @@ EBUILD grub-0.97-r13.ebuild 9384 SHA256 c694ab37f477548da2b98c9beb2c5432ddd799e4
 EBUILD grub-0.97-r14.ebuild 10015 SHA256 ac4c43cee05874f5efb5b7c14f9709e8d60d230b6291924a6e1afdae7e6a288b SHA512 3c9673df98c57f3b9bc7a415ccc829ff89a06cb94ffb1562f74e78e0ee4286fe4b7b18c5f447ec4d772d07bfd3e7ed1238571b794f0fc3094cf247fe09fadfd3 WHIRLPOOL df766fd952d9bb2f1505a8dbae6d52d6014b3561de59b2c15ae4a751968cd0ce20674698a2415bef5719cfee5e7c2062ccae2a0e88a9283a88fc83d6daa0b9a9
 EBUILD grub-2.00_p5107-r2.ebuild 8180 SHA256 1db3f6266e63332ef89d9c32895189fee3307a5ca2f687620df43c5a9d52547a SHA512 f95264d8eff99a1dd8420d64539aef4b7eb464edc8119076af7c175fac418d0e554ee7bb0ae4edb57c3a1a5b82f32da51db6b7ffc4a9a62dc7541d3694b65faa WHIRLPOOL d1dd247120f6de17aaea2899760fd7daf3eb242a3945f6ae2c03eae71c33e3c6bb780639a030d9ba46f4b9b8f23d383fc6559306e40a82be293466ce6d6270a5
 EBUILD grub-2.02_beta2-r3.ebuild 8311 SHA256 faadf60c068832270094eb8d1c9a0eef02ba6373e3079afee0e997509f885bab SHA512 329cf6586b12cfacc2b853e48c2dd786694c73441d930f44e5712e9f999a9f96f6669708ef94760b4bd831f57766ebd079f5974e955e856ed8091ba7da5b4556 WHIRLPOOL 939484dceaa7a0c663ed3da420ec1233d04032817634fd046fb4c8732933c6031021e6f21b9c066e6a2531ebc721bb5a40ad8d3309a407d9d40b543a04b2c588
-EBUILD grub-2.02_beta2-r5.ebuild 8687 SHA256 57c225d582612139410a8c3d0024699a26f6b420e4c076ca0d5785acbc966943 SHA512 5765c4d83aeddcadff69eb38fd064375fe1a42decc6d36442319af3b79cdb89e7b1e47344faa7bf81d0e3a32269059afe6db6a47bc8391425b31ac8027ebd06f WHIRLPOOL 9cf83aa543bbc826030db877f1b8a24fd7675cbf0de08819b519bca71b2c75bb9ffe5c9ad42515afabb3cbba1c922f31f1ac006c1e1e45843152e51d5829885d
+EBUILD grub-2.02_beta2-r5.ebuild 8608 SHA256 a90b67c2bda4a4aad44616744a5b44457efcb2f4d8c95469a32afe2b48b8a3fb SHA512 943c777bce0b28fbd937949494cd54a8179997edca252950a2cecaffe39138494d5ab5caebff5ae7c18c3e3ce1b45cbe0df906475387efc2b758614e8342bd9d WHIRLPOOL 9731e428a2488666c3b523d53cd13a002598b53a18905689664beb871b035fcadfad6428ec82f2597a6cb5f9174cd725dd3568517f18c5e464c7f7ed5db03c60
 EBUILD grub-9999-r1.ebuild 8265 SHA256 4cbbf5b3b600b1c295c0b14b7157174d6817f9c2724db311868dc54572fcb286 SHA512 6ca182564c008970a68d340587773f62181497bb76c5ab5820e13fce6cd041045a320b29ae0a758f90820fd320cece8acb18b5c28507e54e11b6920fdc690085 WHIRLPOOL 889ffae3843a84c182bc48736084c5706c065e8144177292837d5291522002b8a75bcdf3a780204d7b34d7d2fa11a75730e324d4971a821d895c0842baf15554
-MISC ChangeLog 63986 SHA256 287b6b9e6eaeaefea1a137f5496bbb3585340bae015d6c530014f7c4cdf4b4cf SHA512 6521bee202d96dfed561f91120596c8d7ee626e7e8760e2664381b742329d1055cdc4e6d22d295ebc90b7c32b7e7ce6abc6c20ed5dc8a2f0f783d625f9b950a9 WHIRLPOOL 80365c98f8ae570486c65ad24afe7ca21ca089201f372fc003fc23b2e14db352fc73ec1971ea0e24e121eb6f8a17e49022502a273463e9059c2203f5b0ee28e2
+MISC ChangeLog 64098 SHA256 76c3f4478e67bce1a3a892774b3b9367561faa38020bf299d5ead0f0371d581b SHA512 bfaeaa016159fa72a3bce77f712891f6cd517d537576bb3fafacfbbb5a3138fa5254b4678468b670f565a0cb75e03b488d0e3911f80bb951072f34bf4fbc0830 WHIRLPOOL 2834d5ab8009df89cde13e4f30c3ef9317a2341041c22cfd7a875d387b020350f72f8d2653067fbf9e79cad1dc5e8c90d505d099af629a87b2d692bf7a4944b7
 MISC metadata.xml 876 SHA256 dbd75c8e18ec8479718c0d802e6563535e9ffe5429727bea5b26133bb41abca2 SHA512 7a617c5f150445add695fda85610aae706070ca1368e250a4e3858c817e90322860174e436a60268d7ff66f33bc7672aa6d4cdb8b705e12851b25666eb51e13b WHIRLPOOL bf9ba7714a9f41789778c97c0387f5cb6be6e985f63953ab25f12bfad526ca48ef973f202cfd0d8a95dc8dd595d8b1a12483403ece3a5616e24f417e42b4c303
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJUgWeVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirETAP/0hU++CioAbCs+EOQux7RAoZ
-nBobYg/W3XjqNpY4SRZ4dTH6bPw1fZgjvN8VwcwPCJ4BlH3UM+FVcvacVDhVzR/T
-r8+39YqkPXlyya47UfDPEQS+i21D8HORxS3y5dDWtCnI9pfc6h9Quw8RqtcMKOTL
-K6KlKhfZAid2t7yyTIFVnd38eW9/1ccRv9ZOSPSZGNnReHoXPwMtlJOoLnfEnzFP
-O/gOTlEOPE827u4Uo0pjLE5nZ6ZTqG3NjjAEH4GXA+cz9Q7xx5wQB0EGLK25KnIt
-ny32zMAiiLYhJnpa09C5JkhQ2PoYEpwlbqjB2E2HO5OTTnZzIiI3OXizp/pklxH+
-ao7ThFthYY2+s7rFeLKSexkyQ4ORoKPXsWBioh+Sh711+yOjqzvaTtmSIN/yDpB4
-9WmjltdSTLbSM4JClXx1MKB3M2pg17zvo0PmpNc3D4KoYlavc+KqcFSFQBM+65U5
-ytGkOYp1ICwJmat8qCPqZ+JNApo0kcYFxeW4zrVRUaKhuX2PumIvCdKAU30Y+zGm
-/5aqkRSVxU4xRRM/ZmrW+MwlxwCatM2UcM77++FfF+5Z3uCh6TWLi0S6va6/8/6z
-beRU10CGPcHEpYR+uqgfFRih92eb7BtLi3K9kXeUNRCxSzvYncjyX9mU1emTY//Y
-/Gn734gIU1oUHYajZqPm
-=TO9S
+iF4EAREIAAYFAlSCc4sACgkQC77qH+pIQ6TLSwD/dNl6ReQ8wE1ARAh+Drz3Swix
+0Be2l/3W7uecYB3BbD8A/iWcgXSQudVwxeo/O9oaryArDLz6/yfPay1/fraTmrJa
+=IqQg
 -----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-2.02_beta2-r5.ebuild b/sys-boot/grub/grub-2.02_beta2-r5.ebuild
index 0c08778ca9bb..c1aa7bbcaa87 100644
--- a/sys-boot/grub/grub-2.02_beta2-r5.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r5.ebuild,v 1.1 2014/12/05 08:06:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r5.ebuild,v 1.2 2014/12/06 03:09:58 floppym Exp $
 
 EAPI=5
 
@@ -279,28 +279,18 @@ src_install() {
 	multibuild_foreach_variant autotools-utils_src_install \
 		bashcompletiondir="$(get_bashcompdir)"
 
-	mv "${ED}"/$(get_bashcompdir)/grub{,2-install} || die
-
-	bashcomp_alias grub-install \
-		grub2-set-default \
-		grub2-mkrescue \
-		grub2-reboot \
-		grub2-script-check \
-		grub2-editenv \
-		grub2-sparc64-setup \
-		grub2-mkfont \
-		grub2-mkpasswd-pbkdf2 \
-		grub2-mkimage \
-		grub2-bios-setup \
-		grub2-mkconfig \
-		grub2-probe
+	local grub=grub
+	if use multislot; then
+		grub=grub2
+		mv "${ED%/}"/usr/share/info/grub{,2}.info || die
+		mv "${ED%/}"/$(get_bashcompdir)/grub{,2} || die
+	fi
+
+	bashcomp_alias ${grub} ${grub}-{install,set-default,mkrescue,reboot,script-check,editenv,sparc64-setup,mkfont,mkpasswd-pbkdf2,mkimage,bios-setup,mkconfig,probe}
 
 	use doc && multibuild_for_best_variant run_in_build_dir \
 		emake -C docs DESTDIR="${D}" install-html
 
-	if use multislot; then
-		mv "${ED%/}"/usr/share/info/grub{,2}.info || die
-	fi
 
 	insinto /etc/default
 	newins "${FILESDIR}"/grub.default-3 grub