diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2009-10-14 00:06:34 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-10-14 00:06:34 +0000 |
| commit | 006d421c275b74267b1b231e24fb716af13cb66a (patch) | |
| tree | 52e30f91c068ce4c6907bdec9f91a3cba02b9161 /sys-boot | |
| parent | Stable for HPPA (bug #288572). (diff) | |
| download | gentoo-2-006d421c275b74267b1b231e24fb716af13cb66a.tar.gz gentoo-2-006d421c275b74267b1b231e24fb716af13cb66a.tar.bz2 gentoo-2-006d421c275b74267b1b231e24fb716af13cb66a.zip | |
Fix by pyon for USE=multislot and info collisions #288877.
(Portage version: 2.2_rc42/cvs/Linux x86_64)
Diffstat (limited to 'sys-boot')
| -rw-r--r-- | sys-boot/grub/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-boot/grub/grub-9999.ebuild | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index 0c1cec72ac47..1cadd626b8ea 100644 --- a/sys-boot/grub/ChangeLog +++ b/sys-boot/grub/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-boot/grub # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.123 2009/09/30 02:58:10 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.124 2009/10/14 00:06:34 vapier Exp $ + + 14 Oct 2009; Mike Frysinger <vapier@gentoo.org> grub-9999.ebuild: + Fix by pyon for USE=multislot and info collisions #288877. 30 Sep 2009; Mike Frysinger <vapier@gentoo.org> grub-9999.ebuild: Switch to --disable-werror #285776 by David Pyke. diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild index d3d27ed954ac..2794ccd903c7 100644 --- a/sys-boot/grub/grub-9999.ebuild +++ b/sys-boot/grub/grub-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.12 2009/09/30 02:58:10 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.13 2009/10/14 00:06:34 vapier Exp $ inherit autotools mount-boot eutils flag-o-matic toolchain-funcs @@ -73,6 +73,7 @@ src_install() { sed -i s:grub-install:grub2-install: "${D}"/sbin/grub-install mv "${D}"/sbin/grub{,2}-install || die mv "${D}"/usr/share/man/man8/grub{,2}-install.8 || die + mv "${D}"/usr/share/info/grub{,2}.info || die fi } |