fixums

4 files changed, 11 insertions, 163 deletions

diff --git a/sys-apps/grub/grub-0.5.96.1-r2.ebuild b/sys-apps/grub/grub-0.5.96.1-r2.ebuild
deleted file mode 100644
index 58f2e734c0a5..000000000000
--- a/sys-apps/grub/grub-0.5.96.1-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Daniel Robbins <drobbins@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grub/grub-0.5.96.1-r2.ebuild,v 1.3 2001/08/05 22:22:40 blocke Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU GRUB boot loader"
-SRC_URI="ftp://alpha.gnu.org/gnu/grub/${A}"
-HOMEPAGE="http://www.gnu.org/software/grub"
-
-DEPEND="virtual/glibc
-        >=sys-libs/ncurses-5.2-r2"
-
-src_compile() {
-
-	try     ./configure --prefix=/usr  \
-                --mandir=/usr/share/man --infodir=/usr/share/info --host=${CHOST}
-
-	try make ${MAKEOPTS} -e  CPPFLAGS="-Wall -Wmissing-prototypes -Wunused -Wshadow -malign-jumps=1 -malign-loops=1 -malign-functions=1 -Wundef"
-}
-
-src_install() {
-
-	try make prefix=${D}/usr mandir=${D}/usr/share/man infodir=${D}/usr/share/info install
-
-        dodir /boot/boot/grub
-	cd ${D}/usr/share/grub/i386-pc
-	cp stage1 stage2 *stage1_5 ${D}/boot/boot/grub
-
-        cd ${S}
-	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
-}
-
-
-
diff --git a/sys-apps/grub/grub-0.5.96.1-r3.ebuild b/sys-apps/grub/grub-0.5.96.1-r3.ebuild
deleted file mode 100644
index bbfeb4ede583..000000000000
--- a/sys-apps/grub/grub-0.5.96.1-r3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Daniel Robbins <drobbins@gentoo.org>
-# /home/cvsroot/gentoo-x86/sys-apps/grub/grub-0.5.96.1-r2.ebuild,v 1.2 2001/02/07 20:05:43 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grub/grub-0.5.96.1-r3.ebuild,v 1.4 2001/08/31 03:23:39 pm Exp $
-
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU GRUB boot loader"
-SRC_URI="ftp://alpha.gnu.org/gnu/grub/${A}"
-HOMEPAGE="http://www.gnu.org/software/grub"
-
-DEPEND="virtual/glibc
-        >=sys-libs/ncurses-5.2-r2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	try patch -p1 < ${FILESDIR}/${PF}-gentoo.diff
-}
-
-src_compile() {
-
-	try     ./configure --prefix=/usr  \
-                --mandir=/usr/share/man --infodir=/usr/share/info --host=${CHOST}
-
-	try make ${MAKEOPTS} -e  CPPFLAGS="-Wall -Wmissing-prototypes -Wunused -Wshadow -malign-jumps=1 -malign-loops=1 -malign-functions=1 -Wundef"
-}
-
-src_install() {
-
-	try make prefix=${D}/usr mandir=${D}/usr/share/man infodir=${D}/usr/share/info install
-
-        dodir /boot/boot/grub
-	cd ${D}/usr/share/grub/i386-pc
-	cp stage1 stage2 *stage1_5 ${D}/boot/boot/grub
-
-        cd ${S}
-	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
-}
-
-
-
diff --git a/sys-apps/grub/grub-0.5.96.1-r4.ebuild b/sys-apps/grub/grub-0.5.96.1-r4.ebuild
index b637650e5c83..6c429ae06d13 100644
--- a/sys-apps/grub/grub-0.5.96.1-r4.ebuild
+++ b/sys-apps/grub/grub-0.5.96.1-r4.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Daniel Robbins <drobbins@gentoo.org>
-# /home/cvsroot/gentoo-x86/sys-apps/grub/grub-0.5.96.1-r2.ebuild,v 1.2 2001/02/07 20:05:43 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grub/grub-0.5.96.1-r4.ebuild,v 1.6 2001/08/31 03:23:39 pm Exp $
-
+# Author: Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grub/grub-0.5.96.1-r4.ebuild,v 1.7 2001/10/06 17:04:49 drobbins Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="GNU GRUB boot loader"
@@ -15,7 +13,7 @@ DEPEND="virtual/glibc >=sys-libs/ncurses-5.2-r2"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	try patch -p1 < ${FILESDIR}/${PF}-gentoo.diff
+	patch -p1 < ${FILESDIR}/${PF}-gentoo.diff || die
 }
 
 src_compile() {
@@ -24,17 +22,11 @@ src_compile() {
 }
 
 src_install() {
-	try make prefix=${D}/usr sbindir=${D}/sbin mandir=${D}/usr/share/man infodir=${D}/usr/share/info install
-	
-	if [ -z "`use bootcd`" ]
-	then
-        dodir /boot/grub
-		cd ${D}/usr/share/grub/i386-pc
-		cp stage1 stage2 *stage1_5 ${D}/boot/grub
-		dosym . /boot/boot		
-        cd ${S}
-		dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
-	else
-		rm -rf ${D}/usr/share/{man,info,doc}
-	fi
+	make prefix=${D}/usr sbindir=${D}/sbin mandir=${D}/usr/share/man infodir=${D}/usr/share/info install || die
+	dodir /boot/grub
+	cd ${D}/usr/share/grub/i386-pc
+	cp stage1 stage2 *stage1_5 ${D}/boot/grub
+	dosym . /boot/boot		
+	cd ${S}
+	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
 }
diff --git a/sys-apps/grub/grub-0.90.ebuild b/sys-apps/grub/grub-0.90.ebuild
deleted file mode 100644
index f9ae69469a47..000000000000
--- a/sys-apps/grub/grub-0.90.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Mikael Hallendal <hallski@gentoo.org>
-# /home/cvsroot/gentoo-x86/sys-apps/grub/grub-0.5.96.1-r2.ebuild,v 1.2 2001/02/07 20:05:43 achim Exp
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grub/grub-0.90.ebuild,v 1.4 2001/08/31 03:23:39 pm Exp $
-
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="GNU GRUB boot loader"
-SRC_URI="ftp://alpha.gnu.org/gnu/grub/${A}"
-HOMEPAGE="http://www.gnu.org/software/grub"
-
-DEPEND="virtual/glibc
-        >=sys-libs/ncurses-5.2-r2"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	try patch -p1 < ${FILESDIR}/${P}/grub-0.5.97-vga16.patch
-	try patch -p1 < ${FILESDIR}/${P}/grub-0.5.96.1-special-raid-devices.patch
-	try patch -p1 < ${FILESDIR}/${P}/grub-0.5.96.1-dont-give-mem-to-kernel.patch
-#	try patch -p1 < ${FILESDIR}/${P}/grub-0.90-configfile.patch
-	try patch -p1 < ${FILESDIR}/${P}/grub-0.90-vga16-keypressclear.patch
-	try patch -p1 < ${FILESDIR}/${P}/grub-0.90-passwordprompt.patch
-	try patch -p1 < ${FILESDIR}/${P}/grub-0.90-install.in.patch
-	try patch -p1 < ${FILESDIR}/${P}/grub-0.90-installcopyonly.patch
-}
-
-src_compile() {
-
-	./configure --prefix=/usr --sbindir=/sbin 			  \
-                    --mandir=/usr/share/man --infodir=/usr/share/info 	  \
-		    --host=${CHOST} 
-	assert "Configuration of package failed."
-
-	# Have to do this since the configure-script seems a little brooken
-	echo "#define VGA16 1" >> config.h
-
-	emake -e CPPFLAGS="-Wall -Wmissing-prototypes -Wunused 		  \
-	                   -Wshadow -malign-jumps=1 -malign-loops=1	  \
-		  	   -malign-functions=1 -Wundef"
-        assert "Building failed."
-}
-
-src_install() {
-	
-	make prefix=${D}/usr sbindir=${D}/sbin mandir=${D}/usr/share/man  \
-	     infodir=${D}/usr/share/info install
-	assert "Installation failed."
-	
-	if [ -z "`use bootcd`" ]
-	then
-        	dodir /boot/grub
-		cd ${D}/usr/share/grub/i386-pc
-		cp stage1 stage2 *stage1_5 ${D}/boot/grub
-                cp ${FILESDIR}/${P}/splash.xpm.gz ${D}/boot/grub
-		
-        	cd ${S}
-		dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
-	else
-		rm -rf ${D}/usr/share/{man,info,doc}
-	fi
-}