RC1 befor merge in portage

6 files changed, 17 insertions, 762 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
deleted file mode 100644
index fbc0d7e1..00000000
--- a/sys-boot/grub/ChangeLog
+++ /dev/null
@@ -1,531 +0,0 @@
-# ChangeLog for sys-boot/grub
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.88 2008/04/07 08:14:09 robbat2 Exp $
-
-  07 Apr 2008; Robin H. Johnson <robbat2@gentoo.org> grub-0.97-r5.ebuild:
-  Bump of patchset only to fix bug #216307. Revbump will happen when I have
-  finished tracing the pager bug.
-
-  06 Apr 2008; Mike Frysinger <vapier@gentoo.org> grub-0.97-r5.ebuild:
-  Create /boot/boot symlink for people #194201, and dont bother creating
-  menu.lst symlink.
-
-  30 Mar 2008; Robin H. Johnson <robbat2@gentoo.org> grub-0.97-r5.ebuild:
-  Bring in the warning from bug #98768, as it's now important with the new
-  Grub patches.
-
-  30 Mar 2008; Robin H. Johnson <robbat2@gentoo.org> grub-0.97-r5.ebuild:
-  Per bug #160801, Grub needs modification to support kernels larger than
-  3Mb. However, this may have negative consequences, so the actual value is
-  configurable at compile-time via the GRUB_MAX_KERNEL_SIZE environment
-  variable.
-
-  29 Mar 2008; Mike Frysinger <vapier@gentoo.org> grub-0.97-r5.ebuild:
-  Pull in app-emulation/emul-linux-x86-baselibs for USE=ncurses on amd64 #128249.
-
-  28 Mar 2008; Mike Frysinger <vapier@gentoo.org> grub-0.97-r5.ebuild:
-  Make ncurses optional.
-
-*grub-0.97-r5 (25 Mar 2008)
-
-  25 Mar 2008; Robin H. Johnson <robbat2@gentoo.org> +grub-0.97-r5.ebuild:
-  New version of the Gentoo grub patchset. Provides support for 256-byte
-  ext3 inodes per bug #214563. Fixes unhide bugs with GPT patch per bug
-  #211584. Long commandlines per bug #183443. Xen memorysize fix per bug
-  #188312.
-
-  21 Mar 2008; Stefan Schweizer <genstef@gentoo.org> grub-1.96.ebuild:
-  fails to build with two threads
-
-  09 Mar 2008; Mike Frysinger <vapier@gentoo.org> grub-0.97-r4.ebuild:
-  Clean up the /boot update code a bit and generate the "default" file by
-  default so people dont have to painfully debug this failure themselves.
-
-  25 Feb 2008; Steve Dibb <beandog@gentoo.org> grub-0.97-r4.ebuild:
-  amd64 stable, bug 211419
-
-  25 Feb 2008; Christian Faulhammer <opfer@gentoo.org> grub-0.97-r4.ebuild:
-  stable x86, bug 211419
-
-  25 Feb 2008; Robin H. Johnson <robbat2@gentoo.org> grub-0.92-r1.ebuild,
-  grub-0.94-r1.ebuild, grub-0.96-r1.ebuild, grub-0.96-r2.ebuild,
-  grub-0.96-r3.ebuild, grub-0.97.ebuild, grub-0.97-r2.ebuild,
-  grub-0.97-r3.ebuild, grub-0.97-r4.ebuild:
-  Fix up all quoting to make repoman happy.
-
-*grub-0.97-r4 (24 Feb 2008)
-
-  25 Feb 2008; Robin H. Johnson <robbat2@gentoo.org> grub-0.97-r4.ebuild:
-  Bug #178586, include support for booting from a GPT-style disk.
-
-*grub-1.96 (16 Feb 2008)
-
-  16 Feb 2008; Mike Frysinger <vapier@gentoo.org> +grub-1.96.ebuild:
-  Version bump #210403 by Leonardo Valeri Manera.
-
-  25 Aug 2007; Mike Frysinger <vapier@gentoo.org>
-  +files/grub-1.95-build.patch, grub-1.95.ebuild:
-  Fix from Kevin Lacquement for building in parallel #185361.
-
-  24 Jun 2007; Piotr Jaroszyński <peper@gentoo.org> grub-1.95.ebuild:
-  (QA) Don't use KEYWORDS="-*". bug #160519.
-
-  04 Apr 2007; Markus Ullmann <jokey@gentoo.org> grub-0.97-r3.ebuild:
-  testing on fbsd for ufs-aware grub
-
-  15 Jan 2007; Luis Medinas <metalgod@gentoo.org> grub-0.97-r3.ebuild:
-  Stable on amd64. Bug #159636.
-
-  02 Jan 2007; Andrej Kacian <ticho@gentoo.org> grub-0.97-r3.ebuild:
-  Stable on x86, bug #159636.
-
-  03 Dec 2006; Mike Frysinger <vapier@gentoo.org> grub-0.97-r3.ebuild:
-  Fix running with newer autotools (need AC_PROG_AS) #156524.
-
-*grub-1.95 (21 Oct 2006)
-
-  21 Oct 2006; Mike Frysinger <vapier@gentoo.org> +grub-1.95.ebuild:
-  Version bump #152232 by Arthur Koziel.
-
-*grub-0.97-r3 (08 Sep 2006)
-
-  08 Sep 2006; Mike Frysinger <vapier@gentoo.org> +grub-0.97-r3.ebuild:
-  Grab a bunch of patches from Debian.
-
-  30 Aug 2006; Joshua Jackson <tsunam@gentoo.org> grub-0.97-r2.ebuild:
-  Stable x86; bug #144998
-
-  25 Aug 2006; Luis Medinas <metalgod@gentoo.org> grub-0.97-r2.ebuild:
-  Stable on amd64.
-
-*grub-1.94 (18 Jun 2006)
-
-  18 Jun 2006; Mike Frysinger <vapier@gentoo.org> +grub-1.94.ebuild:
-  Version bump.
-
-  13 May 2006; Mike Frysinger <vapier@gentoo.org> grub-0.97-r2.ebuild:
-  Add a pkg_config() by Petteri Räty for users to configure other devices
-  #133129.
-
-  27 Apr 2006; Alec Warner <antarus@gentoo.org> files/digest-grub-0.92-r1,
-  files/digest-grub-0.94-r1, files/digest-grub-0.96-r1, Manifest:
-  Fixing SHA256 digest, pass four
-
-*grub-1.93 (21 Apr 2006)
-
-  21 Apr 2006; Mike Frysinger <vapier@gentoo.org> +grub-1.93.ebuild:
-  Version bump #130586 by Anthony Red.
-
-  22 Mar 2006; Mike Frysinger <vapier@gentoo.org> grub-0.97-r2.ebuild:
-  Fix building netbot with gcc-4 #112713.
-
-  05 Feb 2006; Simon Stelling <blubb@gentoo.org> grub-1.92.ebuild:
-  remove old 2004.3 multilib checks
-
-*grub-1.92 (16 Jan 2006)
-
-  16 Jan 2006; Mike Frysinger <vapier@gentoo.org> +grub-1.92.ebuild:
-  Version bump and add lzo to DEPEND as noted by Ron in #119149.
-
-*grub-1.91 (25 Nov 2005)
-
-  25 Nov 2005; Mike Frysinger <vapier@gentoo.org> +grub-1.91.ebuild:
-  Version bump #113556 by Thomas Bettler.
-
-*grub-0.97-r2 (10 Nov 2005)
-
-  10 Nov 2005; Mike Frysinger <vapier@gentoo.org> -grub-0.97-r1.ebuild,
-  +grub-0.97-r2.ebuild:
-  Punt reiser4 patch since it breaks booting for some #111885.
-
-*grub-0.97-r1 (08 Nov 2005)
-
-  08 Nov 2005; Mike Frysinger <vapier@gentoo.org> +grub-0.97-r1.ebuild:
-  Fixes by Jon Bernard/Roy Walker for address checks on machines with lots of
-  ram #99897 and add support for Reiser4 #69590.
-
-  21 Aug 2005; Mike Frysinger <vapier@gentoo.org> grub-0.94-r1.ebuild,
-  grub-0.96-r1.ebuild, grub-0.96-r2.ebuild, grub-0.96-r3.ebuild,
-  grub-0.97.ebuild:
-  Make sure netboot files are installed into /usr/lib/grub/${CHOST}/ so the
-  pkg_postinst step works #103084 by Thomas Schweikle.
-
-*grub-0.97 (20 Aug 2005)
-
-  20 Aug 2005; Mike Frysinger <vapier@gentoo.org> grub-0.96-r1.ebuild,
-  grub-0.96-r2.ebuild, grub-0.96-r3.ebuild, +grub-0.97.ebuild:
-  Version bump #91959 by R Hill.
-
-  20 Aug 2005; Mike Frysinger <vapier@gentoo.org> grub-0.96-r1.ebuild,
-  grub-0.96-r2.ebuild, grub-0.96-r3.ebuild:
-  Add support for USE=custom-cflags #72196 by basic.
-
-*grub-0.96-r3 (03 Aug 2005)
-
-  03 Aug 2005; Mike Frysinger <vapier@gentoo.org> +grub-0.96-r3.ebuild:
-  Add patch from upstream cvs to fix #83287 by Martin Mokrejs / David James.
-
-  01 Aug 2005; Simon Stelling <blubb@gentoo.org> grub-0.96-r2.ebuild:
-  stable on amd64
-
-  28 Jul 2005; Seemant Kulleen <seemant@gentoo.org>
-  -files/grub-0.93-gcc3.3.diff, -files/grub-0.94-gcc3.4.patch,
-  -files/grub-0.94-grub.conf.patch,
-  -files/grub-0.95.20040823-warnings.patch, -files/grub-0.96-PIC.patch,
-  -files/grub-0.96-bounced-checks.patch, -files/grub-0.96-gcc2.patch,
-  -files/grub-0.96-gcc4.patch, -files/grub-0.96-i2o-raid.patch,
-  -files/grub-0.96-netboot-pic.patch, -files/grub-0.96-nxstack.patch,
-  -files/grub-0.96-r1-gcc4.patch,
-  -files/grub-0.96-xfs-writable-string.patch, -files/splash.xpm.gz,
-  grub-0.92-r1.ebuild, grub-0.94-r1.ebuild, grub-0.96-r1.ebuild,
-  grub-0.96-r2.ebuild:
-  patches, configs, splash screens are all now on mirrors and being tracked in
-  gentoo/src/patchsets/grub
-
-  28 Jul 2005; Seemant Kulleen <seemant@gentoo.org> +grub-0.92-r1.ebuild,
-  +grub-0.94-r1.ebuild:
-  add back 92 and 94 for vapier
-
-  28 Jul 2005; Seemant Kulleen <seemant@gentoo.org> -grub-0.92-r1.ebuild,
-  -grub-0.93.20030118.ebuild, -grub-0.94-r1.ebuild, -grub-0.94-r2.ebuild,
-  -grub-0.95.20040823.ebuild, -grub-0.96.ebuild:
-  remove cruft ebuilds
-
-  24 Jul 2005; Martin Schlemmer <azarah@gentoo.org>
-  +files/grub-0.96-gcc2.patch, grub-0.96-r2.ebuild:
-  Fix building with gcc2.
-
-  04 Jul 2005; Sven Wegener <swegener@gentoo.org> grub-0.95.20040823.ebuild,
-  grub-0.96.ebuild, grub-0.96-r1.ebuild, grub-0.96-r2.ebuild:
-  Updated the postinst message for bug #97882.
-
-  01 Jul 2005; Sven Wegener <swegener@gentoo.org> grub-0.96-r2.ebuild:
-  Stable on x86 to make the XFS writable-string fix available for all users.
-
-  30 May 2005; Sven Wegener <swegener@gentoo.org> grub-0.92-r1.ebuild,
-  grub-0.94-r1.ebuild, grub-0.94-r2.ebuild, grub-0.95.20040823.ebuild,
-  grub-0.96.ebuild:
-  Moved from gcc.eclass to toolchain-funcs.eclass, bug #92745.
-
-  29 May 2005; Marcus D. Hanwell <marcus@gentoo.org> grub-0.96-r1.ebuild:
-  Stable on amd64.
-
-  09 May 2005; Mike Frysinger <vapier@gentoo.org>
-  +files/grub-0.96-netboot-pic.patch, grub-0.96-r2.ebuild:
-  Add patch by the PaX Team to fix PIC/PIE issues in the netboot code and
-  remove the chpax/paxctl stuff since the nxstack patch fixes hardened issues.
-
-*grub-0.96-r2 (08 May 2005)
-
-  08 May 2005; Sven Wegener <swegener@gentoo.org>
-  +files/grub-0.96-xfs-writable-string.patch, +grub-0.96-r2.ebuild:
-  Revision bump to pull in my writable-string patch I submitted to upstream.
-  Closes bug #90845.
-
-  20 Apr 2005; Stephen Bennett <spb@gentoo.org> grub-0.96-r1.ebuild:
-  Stable x86; older versions break with hardened gcc.
-
-  06 Apr 2005; Mark Loeser <halcy0n@gentoo.org>
-  +files/grub-0.96-r1-gcc4.patch, grub-0.96-r1.ebuild:
-  Updated gcc4 patch to apply to grub-0.96-r1
-
-  05 Apr 2005; Mark Loeser <halcy0n@gentoo.org> +files/grub-0.96-gcc4.patch,
-  grub-0.96.ebuild:
-  Backported fixes for GCC4.  Fixes bug #85016
-
-  15 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  grub-0.94-r1.ebuild, grub-0.94-r2.ebuild, grub-0.95.20040823.ebuild,
-  grub-0.96.ebuild, grub-0.96-r1.ebuild:
-  Putting ABI stuff inside an 'if use amd64' block.
-
-*grub-0.96-r1 (11 Mar 2005)
-
-  11 Mar 2005; Mike Frysinger <vapier@gentoo.org>
-  +files/grub-0.96-PIC.patch, +files/grub-0.96-i2o-raid.patch,
-  +files/grub-0.96-nxstack.patch, +grub-0.96-r1.ebuild:
-  Add patches/fixes for a bunch of bugs ... basically lets fix i2o-raid
-  support, NX segfaults on amd64, PIC build failures, and hardened objcopy
-  funk. Thanks to Ryan Hill and everyone on #80693.
-
-*grub-0.96 (05 Mar 2005)
-
-  05 Mar 2005; Martin Schlemmer <azarah@gentoo.org> +grub-0.96.ebuild:
-  Update version.  Some cleanups.
-
-  03 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  grub-0.94-r1.ebuild, grub-0.94-r2.ebuild, grub-0.95.20040823.ebuild:
-  Multilib fixes.
-
-  20 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
-  grub-0.94-r1.ebuild, grub-0.94-r2.ebuild, grub-0.95.20040823.ebuild:
-  Updates to work with amd64's 2005.0.
-
-  20 Dec 2004; Simon Stelling <blubb@gentoo.org> grub-0.95.20040823.ebuild:
-  changed WANT_AUTOMAKE to 1.8
-
-  07 Dec 2004; Robin H. Johnson <robbat2@gentoo.org>
-  grub-0.95.20040823.ebuild:
-  Bug #70111, fix tc-getCC invocation.
-
-  30 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org>
-  grub-0.95.20040823.ebuild:
-  fix use invocation
-
-  22 Nov 2004; <robmoss@gentoo.org>
-  +files/grub-0.95.20040823-warnings.patch, grub-0.95.20040823.ebuild:
-  USE flagging the network booting stuff with a new local "netboot" USE flag.
-  Adding ~amd64. General tidying up of the ebuild. Adding a patch to prevent
-  use of -fwritable-strings, which doesn't do anything but throw up warnings.
-  Adding a comment to explain that FFS and UFS2 support is broken still.
-  Fixing the amd64 installation procedure.
-
-  13 Oct 2004; Travis Tilley <lv@gentoo.org> grub-0.94-r1.ebuild:
-  stable on amd64
-
-  12 Sep 2004; <rmoss@gentoo.org> grub-0.94-r1.ebuild, grub-0.94-r2.ebuild,
-  grub-0.95.20040823.ebuild:
-  Adding >=automake-1.7 dep for grub-0.9{4,5} as per bug 63509.
-
-  05 Sep 2004; <rmoss@gentoo.org> grub-0.95.20040823.ebuild:
-  The grub binary is in /sbin, not /usr/sbin. Fixing.
-
-  26 Aug 2004; <rmoss@gentoo.org> grub-0.95.20040823.ebuild:
-  gnuconfig belongs in src_unpack, not src_compile. Thanks tigger :-)
-
-  24 Aug 2004; <rmoss@gentoo.org> grub-0.95.20040823.ebuild:
-  Marking ~x86 after some overnight testing.
-
-*grub-0.95.20040823 (24 Aug 2004)
-
-  24 Aug 2004; <rmoss@gentoo.org> metadata.xml, +grub-0.95.20040823.ebuild:
-  Initial commit of grub-0.95 with CVS snapshot update. Supports (amongst other
-  things) savedefault (server-friendly feature) and uclibc (I hope...).
-
-*grub-0.94-r2 (22 Aug 2004)
-
-  22 Aug 2004; <rmoss@gentoo.org> +files/grub-0.94-grub.conf.patch,
-  +grub-0.94-r2.ebuild:
-  Trying to get rid of the need for that filthy menu.lst -> grub.conf symlink.
-
-  10 Jun 2004; Travis Tilley <lv@gentoo.org> grub-0.94-r1.ebuild:
-  fixed multilib check
-
-  09 Jun 2004; Travis Tilley <lv@gentoo.org> grub-0.94-r1.ebuild:
-  added multilib check and ~amd64 keyword
-
-  12 May 2004; Alexander Gabert <pappy@gentoo.org> grub-0.94-r1.ebuild:
-  added new hardened PIE SSP switches
-
-  12 May 2004; Alexander Gabert <pappy@gentoo.org> grub-0.93.20030118.ebuild:
-  removed hardened-gcc logic, added logic for suppressing PIE and SSP
-
-  06 May 2004; Mike Frysinger <vapier@gentoo.org>
-  +files/grub-0.94-gcc3.4.patch, grub-0.94-r1.ebuild:
-  add gcc-3.4 patch #49558 by Robert Moss + ecco@piggy.demon.nl
-
-  14 Apr 2004; Scott W Taylor <swtaylor@gentoo.org> :
-  Cleanup checks for hardened
-
-  06 Apr 2004; <solar@gentoo.org> grub-0.94-r1.ebuild:
-  stable on x86
-
-  17 Mar 2004; <solar@gentoo.org> grub-0.94-r1.ebuild:
-  grub will end up with a 100+ meg stage2 file if the user has LDFLAGS=-pie, so
-  lets filter that flag out in the src_compile
-
-  25 Feb 2004; Seemant Kulleen <seemant@gentoo.org> grub-0.92-r1.ebuild:
-  global scope fixing
-
-*grub-0.94-r1 (25 Feb 2004)
-
-  25 Feb 2004; Seemant Kulleen <seemant@gentoo.org> grub-0.93.20031222.ebuild,
-  grub-0.93.20040125.ebuild, grub-0.94-r1.ebuild, grub-0.94.ebuild:
-  revision bump for spock's change
-
-  15 Feb 2004; Michal Januszewski <spock@gentoo.org> grub-0.94.ebuild:
-  Added the 'grubsplash' patch, closes #40827.
-
-*grub-0.94 (02 Feb 2004)
-
-  02 Feb 2004; Brandon Low <lostlogic@gentoo.org> grub-0.94.ebuild:
-  This ebuild isn't perfect yet, but it is better than the last few versions,
-  still no splash image, but now at least it uses the config. It appears that
-  menu.lst is back in style or something
-
-*grub-0.93.20031222 (25 Jan 2004)
-
-  25 Jan 2004; Seemant Kulleen <seemant@gentoo.org> grub-0.93.20031222.ebuild,
-  grub-0.93.20040125.ebuild:
-  new cvs snapshots of grub. Both have the acl/ext2 and acl/ext3 issues sorted
-  out. I'll be adding another snapshot to take advantage of the SuSE prettiness
-  capabilities to grub. This should close bug #30859 by Chris PeBenito
-  <pebenito@gentoo.org>
-
-  15 Dec 2003; Seemant Kulleen <seemant@gentoo.org> grub-0.93.20030118.ebuild:
-  Added autoconf to compile dependencies, closing bug #33321 by Scott Taylor
-  <scott@303underground.com>
-
-  15 Dec 2003; Seemant Kulleen <seemant@gentoo.org> grub-0.92-r1.ebuild,
-  grub-0.93.20030118.ebuild,
-  files/grub-0.92/grub-0.5.96.1-special-raid-devices.patch,
-  files/grub-0.92/grub-0.90-addsyncs.patch,
-  files/grub-0.92/grub-0.90-append.patch,
-  files/grub-0.92/grub-0.90-configfile.patch,
-  files/grub-0.92/grub-0.90-install.in.patch,
-  files/grub-0.92/grub-0.90-installcopyonly.patch,
-  files/grub-0.92/grub-0.90-passwordprompt.patch,
-  files/grub-0.92/grub-0.90-staticcurses.patch,
-  files/grub-0.92/grub-0.90-symlinkmenulst.patch,
-  files/grub-0.92/grub-0.90-vga16-keypressclear.patch,
-  files/grub-0.92/grub-0.91-bootonce.patch,
-  files/grub-0.92/grub-0.91-splashimagehelp.patch,
-  files/grub-0.92/grub-0.91-vga16-serial.patch,
-  files/grub-0.92/grub-0.92-automake16.patch,
-  files/grub-0.92/grub-0.92-nodeprecatedflags.patch,
-  files/grub-0.92/grub-0.92-usbfix.patch,
-  files/grub-0.92/grub-0.92-vga16.patch:
-  move the patches to the mirrors isntead, and add the gcc3.3 patch to 0.92 as
-  well
-
-*grub-0.93.20030118 (08 Dec 2003)
-
-  08 Dec 2003; Seemant Kulleen <seemant@gentoo.org> grub-0.92-r1.ebuild,
-  grub-0.93.20030118.ebuild, metadata.xml, files/grub-0.93-gcc3.3.diff,
-  files/splash.xpm.gz,
-  files/grub-0.92/grub-0.5.96.1-special-raid-devices.patch,
-  files/grub-0.92/grub-0.90-addsyncs.patch,
-  files/grub-0.92/grub-0.90-append.patch,
-  files/grub-0.92/grub-0.90-configfile.patch,
-  files/grub-0.92/grub-0.90-install.in.patch,
-  files/grub-0.92/grub-0.90-installcopyonly.patch,
-  files/grub-0.92/grub-0.90-passwordprompt.patch,
-  files/grub-0.92/grub-0.90-staticcurses.patch,
-  files/grub-0.92/grub-0.90-symlinkmenulst.patch,
-  files/grub-0.92/grub-0.90-vga16-keypressclear.patch,
-  files/grub-0.92/grub-0.91-bootonce.patch,
-  files/grub-0.92/grub-0.91-splashimagehelp.patch,
-  files/grub-0.92/grub-0.91-vga16-serial.patch,
-  files/grub-0.92/grub-0.92-automake16.patch,
-  files/grub-0.92/grub-0.92-nodeprecatedflags.patch,
-  files/grub-0.92/grub-0.92-usbfix.patch,
-  files/grub-0.92/grub-0.92-vga16.patch:
-  moved from sys-apps to sys-boot
-
-  01 Dec 2003; Alexander Gabert <pappy@gentoo.org> grub-0.93.20030118.ebuild:
-  added CC -yno_propolice because configure has problems with -nostdlib
-  requesting __guard symbol but cannot be resolved, future releases of
-  hardened-gcc will honour this behaviour
-
-  07 Sep 2003; Alexander Gabert <pappy@gentoo.org> grub-0.93.20030118.ebuild:
-  added hardened-gcc excludes
-
-  14 Sep 2003; John Mylchreest <johnm@gentoo.org>; grub-0.93.20030118.ebuild,
-  files/grub-0.93-gcc3.3.diff:
-  Updating for gcc 3.3 compat
-
-  27 Jul 2003; Olivier Crete <tester@gentoo.org> grub-0.93.20030118.ebuild:
-  Added support for static building
-
-  24 Jan 2002; <woodchip@gentoo.org> *.ebuild : Reorder mount-boot.eclass
-  function, clean some fluff.
-
-*grub-0.93.20030118 (18 Jan 2003)
-
-  11 Apr 2003; Joshua Brindle <method@gentoo.org> grub-0.92-r1.ebuild,
-  grub-0.93.20030118.ebuild:
-  Added filter-flags -fstack-protector
-
-  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> grub-0.93.20030118.ebuild :
-  This is definitely not for mips.  Maybe sometime in the future...
-
-  18 Jan 2003; Donny Davies <woodchip@gentoo.org> grub-0.93.20030118.ebuild :
-  New testing release; closing #11821, #13242, #9180.  See the ebuild
-  for the detailed patch list.
-
-*grub-0.92-r1 (02 Oct 2002)
-
-  10 Mar 2003; Seemant Kulleen <seemant@gentoo.org> grub-0.92-r1.ebuild:
-  change to use epatch instead, much prettier output
-
-  24 Feb 2003; Nicholas Wourms <dragon@gentoo.org> grub-0.92-r1.ebuild :
-  This is definitely not for mips.  Maybe sometime in the future...
-
-  06 Jan 2002; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
-  PROVIDE virtual/bootloader
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-  02 Oct 2002; Donny Davies <woodchip@gentoo.org> :
-  Merge changes from Markus Krainer <markus-krainer@chello.at> to fix:
-  bootlogo; #6820.  menu.lst was renamed to grub.conf; #6300.
-
-*grub-0.92 (25 Jun 2002)
-
-  29 Sep 2002; Donny Davies <woodchip@gentoo.org> grub-0.92.ebuild :
-  Now uses mount-boot eclass; from #7903.
-
-  13 Aug 2002; Joachim Blaabjerg <styx@gentoo.org> grub-0.92.ebuild :
-  Added grub-0.92-usbfix.patch to hopefully fix bug #6372. It still compiles!
-
-  14 Jul 2002; phoen][x <phoenix@gentoo.org> grub-0.92.ebuild :
-  Added KEYWORDS.
-
-  25 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
-  Add the latest version thanks to good work from (bug #4020)
-  Markus Krainer <markus-krainer@chello.at>.  Slotified the lot,
-  as well as move splash.xpm.gz to ${FILESDIR}/, as having three
-  seems a bit much.
-
-*grub-0.90-r7 (14 July 2002)
-
-  29 Sep 2002; Donny Davies <woodchip@gentoo.org> grub-0.90-r7.ebuild :
-  Now uses mount-boot eclass; from #7903.
-
-  21 Jul 2002; Mark Guertin <gerk@gentoo.org>:
-  updated keywords (-ppc -sparc -sparc64)
-
-  14 Jul 2002; phoen][x <phoenix@gentoo.org> grub-0.90-r7.ebuild :
-  Added KEYWORDS.
-
-*grub-0.90-r4 (8 Mar 2002)
-*grub-0.91-r3 (8 Mar 2002)
-
-  29 Sep 2002; Donny Davies <woodchip@gentoo.org> grub-0.91-r3.ebuild :
-  Now uses mount-boot eclass; from #7903.
-
-  19 Aug 2002; Sascha Schwabbauer <cybersystem@gentoo.org> grub-0.91-r3.ebuild :
-  Added -ppc to keywords
-
-  14 Jul 2002; phoen][x <phoenix@gentoo.org> grub-0.91-r3.ebuild :
-  Added KEYWORDS.
-
-  8 Mar 2002; Bruce A. Locke <blocke@shivan.org> : grub-0.90-r4.ebuild,
-  grub-0.91-r3.ebuild: made check of /etc/fstab not match on commented out
-  entries and added a notice telling users to remove invalid /boot entries
-  from their /etc/fstab (a user had this problem while installing)
-
-*grub-0.90-r6 (4 Feb 2002)
-*grub-0.91-r1 (4 Feb 2002)
-
-  4 Feb 2002; Daniel Robbins <drobbins@gentoo.org>: grub-0.90-r6.ebuild,
-  grub-0.91-r1.ebuild: unset CFLAGS to ensure that GRUB code is i486-compatible,
-  a good thing for a boot loader.  Upgraded /boot mounting code to be compatible
-  with systems without a dedicated /boot filesystem.  Tweaked GRUB installation
-  so that the /boot/grub/*stage* files don't get overwritten, since this could
-  mess up the currently-in-the-MBR GRUB.  These fixes also close bug #527.
-
-*grub-0.90-r5 (4 Feb 2002)
-
-  4 Feb 2002; G.Bevin <gbevin@gentoo.org> grub-0.90-r5.ebuild, grub-0.91.ebuild :  
-  Added new setup function which detects if /boot is mounted or not, in case
-  it's not mounted it will try to do it automatically and in case of a failure
-  exit with an error message.
-
-*grub-0.90-r4 (1 Feb 2002)
-
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :  
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index ce0e950a..046434b8 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,8 +1,6 @@
+AUX grub-0.97-gcc4-hardened.patch 462 RMD160 f1429fd7ebddede7dcc243e897ae3ff24ee19e06 SHA1 75860a643ac0588ef60fcc8e26fca734b11b3dae SHA256 24f135ba1404ac68a379d21885563adec58a38a7e2c05735a9328cd78aef19c2
 AUX grub.conf.gentoo 659 RMD160 9ab841d6fdd03be3f99f109ed3dfe0a5027e66d2 SHA1 26455e5c3ba2043be970bf64ce2386119fd35f30 SHA256 5e3a209af537090456546704e52e0dee8f8600944a34184f79776523cdaa9a25
 DIST grub-0.97-patches-1.7.tar.bz2 31190 RMD160 f72f956c36d07e914bb7b4512ff9c88349123ab0 SHA1 6c5e011a8a55fc986abc84c43d59266a42f2ac9c SHA256 6dfb17ff874ce8f737211a728c319a133b90e3633a80daf5ef370c15ee625389
 DIST grub-0.97.tar.gz 971783 RMD160 7fb5674edf0c950bd38e94f85ff1e2909aa741f0 SHA1 2580626c4579bd99336d3af4482c346c95dac4fb SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b
 DIST splash.xpm.gz 33856 RMD160 2fead61f91c368429e80936248bb02af2bdf15ff SHA1 98e679f9698be43426f971f89a088c053e8c804a SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf
-EBUILD grub-0.97-r5.ebuild 6898 RMD160 00d4a87e2273f5cd8ead38a934a1572053121752 SHA1 e5019218012a5cc7d73a5f8601997632d01057c5 SHA256 a81d63bd13db11305d9042b450f90b48e7f02ec3ddbb56ae48b1f81d4df3ef9a
-EBUILD grub-0.97-r6.ebuild 7498 RMD160 bfb8392f724b112e5b7ff851531f05076af4e61d SHA1 7307dc4caad45d268e6ab0134c0b51bd77f0c55d SHA256 cef8eca75706875cb0f6aea4bc577e73f124ddad2844acb59b9e6fb8a6fd13ed
-MISC ChangeLog 21214 RMD160 c2c890da5fd715ed7291d6fd345474aa355a935e SHA1 baa4c04623ebeb3bd8ba846a313a4fe2962e55a8 SHA256 57ccaa96108f99dfe829c2758716a40d69339623ade6d0d796e5b81342237e2a
-MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+EBUILD grub-0.97-r7.ebuild 7601 RMD160 a41997883273e69d2751847edce5af253b4519b1 SHA1 3941eaab8b4480ec0ba8d9a19702fa0a0178c0f5 SHA256 f4165449654e44bd4d626a7a6e808879a20d0eb1801eae663e54686d64ab7ff1
diff --git a/sys-boot/grub/files/grub-0.97-gcc4-hardened.patch b/sys-boot/grub/files/grub-0.97-gcc4-hardened.patch
new file mode 100644
index 00000000..cf851888
--- /dev/null
+++ b/sys-boot/grub/files/grub-0.97-gcc4-hardened.patch
@@ -0,0 +1,11 @@
+diff -ruN /var/tmp/portage/sys-boot/grub-0.97-r6/work/grub-0.97/configure.ac /root/hardened/grub-0.97/configure.ac
+--- /work/grub-0.97/configure.ac	2008-06-03 16:09:34.000000000 +0200
++++ /grub-0.97/configure.ac	2008-06-04 00:24:01.000000000 +0200
+@@ -106,6 +106,7 @@
+     ])
+     if test "x$no_stack_protector_flag" = xyes; then
+       STAGE2_CFLAGS="$STAGE2_CFLAGS -fno-stack-protector"
++      GRUB_CFLAGS="$GRUB_CFLAGS -fno-stack-protector"
+     fi
+   fi
+ fi
diff --git a/sys-boot/grub/grub-0.97-r5.ebuild b/sys-boot/grub/grub-0.97-r5.ebuild
deleted file mode 100644
index 9ec3ad57..00000000
--- a/sys-boot/grub/grub-0.97-r5.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r5.ebuild,v 1.12 2008/05/10 09:00:56 vapier Exp $
-
-# XXX: we need to review menu.lst vs grub.conf handling.  We've been converting
-#      all systems to grub.conf (and symlinking menu.lst to grub.conf), but
-#      we never updated any of the source code (it still all wants menu.lst),
-#      and there is no indication that upstream is making the transition.
-
-inherit mount-boot eutils flag-o-matic toolchain-funcs autotools
-
-PATCHVER="1.7"
-DESCRIPTION="GNU GRUB Legacy boot loader"
-HOMEPAGE="http://www.gnu.org/software/grub/"
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
-	mirror://gentoo/splash.xpm.gz
-	mirror://gentoo/${P}-patches-${PATCHVER}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE="custom-cflags ncurses netboot static"
-
-DEPEND="ncurses? (
-		>=sys-libs/ncurses-5.2-r5
-		amd64? ( app-emulation/emul-linux-x86-baselibs )
-	)"
-PROVIDE="virtual/bootloader"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# patch breaks booting for some people #111885
-	rm "${WORKDIR}"/patch/400_*
-
-	# Grub will not handle a kernel larger than EXTENDED_MEMSIZE Mb as
-	# discovered in bug 160801. We can change this, however, using larger values
-	# for this variable means that Grub needs more memory to run and boot. For a
-	# kernel of size N, Grub needs (N+1)*2.  Advanced users should set a custom
-	# value in make.conf, it is possible to make kernels ~16Mb in size, but it
-	# needs the kitchen sink built-in.
-	local t="custom"
-	if [[ -z ${GRUB_MAX_KERNEL_SIZE} ]] ; then
-		case $(tc-arch) in
-			amd64) GRUB_MAX_KERNEL_SIZE=7 ;;
-			x86)   GRUB_MAX_KERNEL_SIZE=3 ;;
-		esac
-		t="default"
-	fi
-	einfo "Grub will support the ${t} maximum kernel size of ${GRUB_MAX_KERNEL_SIZE} Mb (GRUB_MAX_KERNEL_SIZE)"
-
-	sed -i \
-		-e "/^#define.*EXTENDED_MEMSIZE/s,3,${GRUB_MAX_KERNEL_SIZE},g" \
-		"${S}"/grub/asmstub.c \
-		|| die "Failed to hack memory size"
-
-	if [[ -n ${PATCHVER} ]] ; then
-		EPATCH_SUFFIX="patch"
-		epatch "${WORKDIR}"/patch
-		eautoreconf
-	fi
-}
-
-src_compile() {
-	filter-flags -fPIE -fstack-protector #168834
-
-	use amd64 && multilib_toolchain_setup x86
-
-	unset BLOCK_SIZE #73499
-
-	### i686-specific code in the boot loader is a bad idea; disabling to ensure
-	### at least some compatibility if the hard drive is moved to an older or
-	### incompatible system.
-
-	# grub-0.95 added -fno-stack-protector detection, to disable ssp for stage2,
-	# but the objcopy's (faulty) test fails if -fstack-protector is default.
-	# create a cache telling configure that objcopy is ok, and add -C to econf
-	# to make use of the cache.
-	#
-	# CFLAGS has to be undefined running econf, else -fno-stack-protector detection fails.
-	# STAGE2_CFLAGS is not allowed to be used on emake command-line, it overwrites
-	# -fno-stack-protector detected by configure, removed from netboot's emake.
-	use custom-cflags || unset CFLAGS
-
-	export grub_cv_prog_objcopy_absolute=yes #79734
-	use static && append-ldflags -static
-
-	# Per bug 216625, the emul packages do not provide .a libs for performing
-	# suitable static linking
-	if use amd64 && use static ; then
-		die "You must use the grub-static package if you want a static Grub on amd64!"
-	fi
-
-	# build the net-bootable grub first, but only if "netboot" is set
-	if use netboot ; then
-		econf \
-		--libdir=/lib \
-		--datadir=/usr/lib/grub \
-		--exec-prefix=/ \
-		--disable-auto-linux-mem-opt \
-		--enable-diskless \
-		--enable-{3c{5{03,07,09,29,95},90x},cs89x0,davicom,depca,eepro{,100}} \
-		--enable-{epic100,exos205,ni5210,lance,ne2100,ni{50,65}10,natsemi} \
-		--enable-{ne,ns8390,wd,otulip,rtl8139,sis900,sk-g16,smc9000,tiara} \
-		--enable-{tulip,via-rhine,w89c840} || die "netboot econf failed"
-
-		emake w89c840_o_CFLAGS="-O" || die "making netboot stuff"
-
-		mv -f stage2/{nbgrub,pxegrub} "${S}"/
-		mv -f stage2/stage2 stage2/stage2.netboot
-
-		make clean || die "make clean failed"
-	fi
-
-	# Now build the regular grub
-	# Note that FFS and UFS2 support are broken for now - stage1_5 files too big
-	econf \
-		--libdir=/lib \
-		--datadir=/usr/lib/grub \
-		--exec-prefix=/ \
-		--disable-auto-linux-mem-opt \
-		$(use_with ncurses curses) \
-		|| die "econf failed"
-
-	# sanity check due to common failure
-	use ncurses && ! grep -qs "HAVE_LIBCURSES.*1" config.h && die "USE=ncurses but curses not found"
-
-	emake || die "making regular stuff"
-}
-
-src_test() {
-	# non-default block size also give false pass/fails.
-	unset BLOCK_SIZE
-	make check || die "make check failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	if use netboot ; then
-		exeinto /usr/lib/grub/${CHOST}
-		doexe nbgrub pxegrub stage2/stage2.netboot || die "netboot install"
-	fi
-
-	dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
-	newdoc docs/menu.lst grub.conf.sample
-
-	insinto /boot/grub
-	doins "${DISTDIR}"/splash.xpm.gz
-}
-
-setup_boot_dir() {
-	local boot_dir=$1
-	local dir=${boot_dir}
-
-	[[ ! -e ${dir} ]] && die "${dir} does not exist!"
-	[[ ! -L ${dir}/boot ]] && ln -s . "${dir}/boot"
-	dir="${dir}/grub"
-	if [[ ! -e ${dir} ]] ; then
-		mkdir "${dir}" || die "${dir} does not exist!"
-	fi
-
-	# change menu.lst to grub.conf
-	if [[ ! -e ${dir}/grub.conf ]] && [[ -e ${dir}/menu.lst ]] ; then
-		mv -f "${dir}"/menu.lst "${dir}"/grub.conf
-		ewarn
-		ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
-		ewarn
-	fi
-
-	if [[ ! -e ${dir}/menu.lst ]]; then
-		einfo "Linking from new grub.conf name to menu.lst"
-		ln -snf grub.conf "${dir}"/menu.lst
-	fi
-
-	if [[ -e ${dir}/stage2 ]] ; then
-		mv "${dir}"/stage2{,.old}
-		ewarn "*** IMPORTANT NOTE: you must run grub and install"
-		ewarn "the new version's stage1 to your MBR.  Until you do,"
-		ewarn "stage1 and stage2 will still be the old version, but"
-		ewarn "later stages will be the new version, which could"
-		ewarn "cause problems such as an unbootable system."
-		ebeep
-	fi
-
-	einfo "Copying files from /lib/grub and /usr/lib/grub to ${dir}"
-	for x in "${ROOT}"/lib*/grub/*/* "${ROOT}"/usr/lib*/grub/*/* ; do
-		[[ -f ${x} ]] && cp -p "${x}" "${dir}"/
-	done
-
-	if [[ -e ${dir}/grub.conf ]] ; then
-		egrep \
-			-v '^[[:space:]]*(#|$|default|fallback|initrd|password|splashimage|timeout|title)' \
-			"${dir}"/grub.conf | \
-		/sbin/grub --batch \
-			--device-map="${dir}"/device.map \
-			> /dev/null
-	fi
-
-	# the grub default commands silently piss themselves if
-	# the default file does not exist ahead of time
-	if [[ ! -e ${dir}/default ]] ; then
-		grub-set-default --root-directory="${boot_dir}" default
-	fi
-}
-
-pkg_postinst() {
-	[[ -n ${DONT_MOUNT_BOOT} ]] && return 0
-	setup_boot_dir "${ROOT}"/boot
-	einfo "To install grub files to another device (like a usb stick), just run:"
-	einfo "   emerge --config =${PF}"
-}
-
-pkg_config() {
-	local dir
-	einfo "Enter the directory where you want to setup grub:"
-	read dir
-	setup_boot_dir "${dir}"
-}
diff --git a/sys-boot/grub/grub-0.97-r6.ebuild b/sys-boot/grub/grub-0.97-r7.ebuild
index 58a5c9a0..7e386c82 100644
--- a/sys-boot/grub/grub-0.97-r6.ebuild
+++ b/sys-boot/grub/grub-0.97-r7.ebuild
@@ -55,7 +55,9 @@ src_unpack() {
 		-e "/^#define.*EXTENDED_MEMSIZE/s,3,${GRUB_MAX_KERNEL_SIZE},g" \
 		"${S}"/grub/asmstub.c \
 		|| die "Failed to hack memory size"
-
+	# Ticket 20 https://hardened.gentooexperimental.org/secure/report/1
+	epatch "$FILESDIR}"/grub-0.97-gcc4-hardened.patch
+	
 	if [[ -n ${PATCHVER} ]] ; then
 		EPATCH_SUFFIX="patch"
 		epatch "${WORKDIR}"/patch
@@ -64,7 +66,7 @@ src_unpack() {
 }
 
 src_compile() {
-	filter-flags -fPIE -fstack-protector #168834
+	filter-flags -fPIE #168834
 
 	use amd64 && multilib_toolchain_setup x86
 
diff --git a/sys-boot/grub/metadata.xml b/sys-boot/grub/metadata.xml
deleted file mode 100644
index 96a2d586..00000000
--- a/sys-boot/grub/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>base-system</herd>
-</pkgmetadata>