last of #7903, with #6820, #6300. Thanks to markus-krainer@chello.at.

diff --git a/sys-apps/grub/ChangeLog b/sys-apps/grub/ChangeLog
index 32a1103885b13a727d9566b8ce59c99aa3147de4..df227313a74ad489b5032d4ea702e6f018b8b6d5 100644 (file)
--- a/sys-apps/grub/ChangeLog
+++ b/sys-apps/grub/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/grub
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grub/ChangeLog,v 1.10 2002/09/30 01:30:15 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grub/ChangeLog,v 1.11 2002/10/02 12:03:49 woodchip Exp $
+
+*grub-0.92-r1 (02 Oct 2002)
+
+  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)
 

diff --git a/sys-apps/grub/files/digest-grub-0.92-r1 b/sys-apps/grub/files/digest-grub-0.92-r1
new file mode 100644 (file)
index 0000000..72bf801
--- /dev/null
+++ b/sys-apps/grub/files/digest-grub-0.92-r1
@@ -0,0 +1 @@
+MD5 50f2786e7bf96b1115ee82b9c101a816 grub-0.92.tar.gz 877112

diff --git a/sys-apps/grub/grub-0.92-r1.ebuild b/sys-apps/grub/grub-0.92-r1.ebuild
new file mode 100644 (file)
index 0000000..7cd2347
--- /dev/null
+++ b/sys-apps/grub/grub-0.92-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grub/grub-0.92-r1.ebuild,v 1.1 2002/10/02 12:03:49 woodchip Exp $
+
+inherit mount-boot
+
+S=${WORKDIR}/${P}
+DESCRIPTION="GNU GRUB boot loader"
+SRC_URI="ftp://alpha.gnu.org/gnu/grub/${P}.tar.gz"
+HOMEPAGE="http://www.gnu.org/software/grub"
+KEYWORDS="x86 -ppc -sparc -sparc64"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND=">=sys-libs/ncurses-5.2-r5"
+RDEPEND="virtual/glibc"
+
+src_unpack() {
+       unpack ${A} || die
+       cd ${S} || die
+       patch -p1 < ${FILESDIR}/${P}/grub-0.92-vga16.patch || die
+       patch -p1 < ${FILESDIR}/${P}/grub-0.5.96.1-special-raid-devices.patch || die
+       patch -p1 < ${FILESDIR}/${P}/grub-0.90-configfile.patch || die
+       patch -p1 < ${FILESDIR}/${P}/grub-0.90-vga16-keypressclear.patch || die
+       patch -p1 < ${FILESDIR}/${P}/grub-0.90-passwordprompt.patch || die
+       patch -p1 < ${FILESDIR}/${P}/grub-0.90-install.in.patch || die
+       patch -p1 < ${FILESDIR}/${P}/grub-0.90-installcopyonly.patch || die
+       patch -p1 < ${FILESDIR}/${P}/grub-0.90-staticcurses.patch || die
+       patch -p1 < ${FILESDIR}/${P}/grub-0.90-symlinkmenulst.patch || die
+       patch -p1 < ${FILESDIR}/${P}/grub-0.90-append.patch || die
+       patch -p1 < ${FILESDIR}/${P}/grub-0.90-addsyncs.patch || die
+       patch -p1 < ${FILESDIR}/${P}/grub-0.91-splashimagehelp.patch || die
+       patch -p1 < ${FILESDIR}/${P}/grub-0.91-bootonce.patch || die
+       patch -p1 < ${FILESDIR}/${P}/grub-0.92-automake16.patch || die
+       patch -p0 < ${FILESDIR}/${P}/grub-0.92-nodeprecatedflags.patch || die
+       patch -p1 < ${FILESDIR}/${P}/grub-0.91-vga16-serial.patch || die
+       patch -p1 < ${FILESDIR}/${P}/grub-0.92-usbfix.patch || die
+}
+
+src_compile() {
+       #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.
+       unset CFLAGS
+       ./configure --prefix=/usr \
+               --sbindir=/sbin \
+               --mandir=/usr/share/man \
+               --infodir=/usr/share/info \
+               --disable-auto-linux-mem-opt \
+               || die "Configuration of package failed."
+
+       #the vga16.patch changes configure.in but not configure so
+       #--enable-vga16 doesnt work.  config.h gets overwritten by make.
+       echo "#define VGA16 1" >> config.h.in
+
+       emake || die "Building failed!"
+}
+
+src_install() {
+       make prefix=${D}/usr \
+               sbindir=${D}/sbin \
+               mandir=${D}/usr/share/man \
+               infodir=${D}/usr/share/info \
+               install || die "Installation failed."
+
+       dodir /boot/grub
+       cp ${FILESDIR}/splash.xpm.gz ${D}/boot/grub
+       dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
+}
+
+pkg_postinst() {
+       [ "$ROOT" != "/" ] && return 0
+       if [ ! -e /boot/grub/stage1 ]
+       then
+               #if the boot loader files aren't in place, copy them over.
+               cd /usr/share/grub/i386-pc
+               cp stage1 stage2 *stage1_5 /boot/grub
+       else
+               einfo '*** A new GRUB has been installed. If you need to reinstall'
+               einfo '*** GRUB to a boot record on your drive, please remember to'
+               einfo '*** "cp /usr/share/grub/i386-pc/*stage* /boot/grub" first.'
+               einfo "*** If you're using XFS, unmount and remount /boot as well."
+       fi
+
+       # change menu.lst to grub.conf
+       if [ ! -e /boot/grub/grub.conf -a -e /boot/grub/menu.lst ]
+       then
+               mv /boot/grub/menu.lst /boot/grub/grub.conf
+               ln -s grub.conf /boot/grub/menu.lst
+               einfo "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
+       fi
+}