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 | a330670fcde6e7afbc042ae5c87eb3c481d0b163 (patch) | |
| tree | 2f5ed5d2e6f563500db3cc43cfc2b70fbc01f13c /sys-boot | |
| parent | Stable for HPPA (bug #288572). (diff) | |
| download | historical-a330670fcde6e7afbc042ae5c87eb3c481d0b163.tar.gz historical-a330670fcde6e7afbc042ae5c87eb3c481d0b163.tar.bz2 historical-a330670fcde6e7afbc042ae5c87eb3c481d0b163.zip | |
Fix by pyon for USE=multislot and info collisions #288877.
Package-Manager: portage-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/Manifest | 10 | ||||
| -rw-r--r-- | sys-boot/grub/grub-9999.ebuild | 3 |
3 files changed, 11 insertions, 7 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/Manifest b/sys-boot/grub/Manifest index e99651ab1cbb..663485bc52de 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -36,13 +36,13 @@ EBUILD grub-0.97-r8.ebuild 8871 RMD160 c6255b0e4de7b0c03611e7227d5fb3ce48db5cce EBUILD grub-0.97-r9.ebuild 8975 RMD160 14ff47a8de303aa73e2571ee1fcb1aae3f433be0 SHA1 46676679d76ba268bc650fbdb183893298f38c7c SHA256 3bc4b98c9e451a601eb120327bb5273629471cf6cc01c363ac4f9bfd52e0276a EBUILD grub-0.97.ebuild 4527 RMD160 bc8dec8916cd52bbd0403d3e504f8a407d9e897c SHA1 7fc00e33d980842ed65b242ac53522b51894fa7c SHA256 2c20b9c10a242d15b17b48d73e5136c7f350cd313f77dd177c54a08f663be02a EBUILD grub-1.96.ebuild 1980 RMD160 b9389115b1490a018a7c47f897884db95856d1e1 SHA1 317379e018b0c5b7310c4a54a7aee36e9cb4a518 SHA256 bf84649fb9543d9ba92774efb68f97a5bc8ae1cb7fc6895d48357eb309fd92f2 -EBUILD grub-9999.ebuild 2556 RMD160 ebc45c0a6ed75c7e76f7d38ab2b6cf5d7fd19b87 SHA1 e89668fecd9ee4ecc432c46c260e4afc04e5faf6 SHA256 21c2e784d53212a0236d408261ed04c2b8b8acc4cf7d088eb1b4fc39d8f9080b -MISC ChangeLog 26622 RMD160 4c6e97cc9b3c53a511269654678520b42639e544 SHA1 94704e4d48b51b47343467611ddafe818771b5fe SHA256 b48cfd0db59fe32e20b3c9d232d3fdeb4b3c59e3a129b57afc53546c4e093d08 +EBUILD grub-9999.ebuild 2604 RMD160 5057ede2ce347df09387528d068bf0427d4e8eff SHA1 91bf56783c2d9217060f797526363396572083ae SHA256 50be006d77f58bc575e9906c9dcf0c868c4a55f50be108bc8e5d14f1aff4f01f +MISC ChangeLog 26752 RMD160 714aa450899a19c821317cfae8bce3a1eddd87bc SHA1 0b8f8f176d9de9b539ebbbf6bd72a8e77e5222cf SHA256 61d30b0d5c8fd1ab814c5f8e6c16a2d71aed3f7f4dcaec20bac2bdd9e8fc8b2f MISC metadata.xml 262 RMD160 afabce9377772aefb54102e9ef237de6bb1561f5 SHA1 c38f9b99d8a84beb40c114283d8d7ddd4ac43d9e SHA256 35a9c56d9c8418806062854a360c27690d25159524df71f28bbd4d644e8706f3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAkrCyUgACgkQlPl3HsVfCDrF8ACfZyplbLGxrwNgkaDlnoKtCxVi -vdYAnAurHJ4fcXkUHBly3gCcXwJpsDQm -=23M+ +iEYEARECAAYFAkrVFhAACgkQlPl3HsVfCDrePgCfe2QEi8NJmQn00sK5xU+7lVNK +DpcAnR17qZt9dT3WJ3aNkIeOmoXs1ZzJ +=SwUY -----END PGP SIGNATURE----- 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 } |