floppym 14/12/06 03:09:58 Modified: grub-2.02_beta2-r5.ebuild ChangeLog Log: Fix bash completion symlinks. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Revision Changes Path 1.2 sys-boot/grub/grub-2.02_beta2-r5.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r5.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r5.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r5.ebuild?r1=1.1&r2=1.2 Index: grub-2.02_beta2-r5.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r5.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- grub-2.02_beta2-r5.ebuild 5 Dec 2014 08:06:44 -0000 1.1 +++ grub-2.02_beta2-r5.ebuild 6 Dec 2014 03:09:58 -0000 1.2 @@ -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 @@ multibuild_foreach_variant autotools-utils_src_install \ bashcompletiondir="$(get_bashcompdir)" - mv "${ED}"/$(get_bashcompdir)/grub{,2-install} || die + 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-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 + 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 1.333 sys-boot/grub/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.333&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.333&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.332&r2=1.333 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v retrieving revision 1.332 retrieving revision 1.333 diff -u -r1.332 -r1.333 --- ChangeLog 5 Dec 2014 08:06:44 -0000 1.332 +++ ChangeLog 6 Dec 2014 03:09:58 -0000 1.333 @@ -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 <[email protected]> grub-2.02_beta2-r5.ebuild: + Fix bash completion symlinks. *grub-2.02_beta2-r5 (05 Dec 2014)
