diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2014-12-06 03:09:58 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2014-12-06 03:09:58 +0000 |
| commit | 41ef3d9adee3796bde36c9180644717f1e1ca6a8 (patch) | |
| tree | 339d7337327e4c0da82af4877376a66b593d4034 /sys-boot | |
| parent | Add missing dep on dev-texlive/texlive-genericextra (bug #531664). (diff) | |
| download | gentoo-2-41ef3d9adee3796bde36c9180644717f1e1ca6a8.tar.gz gentoo-2-41ef3d9adee3796bde36c9180644717f1e1ca6a8.tar.bz2 gentoo-2-41ef3d9adee3796bde36c9180644717f1e1ca6a8.zip | |
Fix bash completion symlinks.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'sys-boot')
| -rw-r--r-- | sys-boot/grub/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-boot/grub/grub-2.02_beta2-r5.ebuild | 28 |
2 files changed, 13 insertions, 20 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/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 |