move mount /boot to pkg_preinst

8 files changed, 7 insertions, 262 deletions

diff --git a/sys-apps/grub/ChangeLog b/sys-apps/grub/ChangeLog
index 2eddb4d6fad4..5483ac95cd2d 100644
--- a/sys-apps/grub/ChangeLog
+++ b/sys-apps/grub/ChangeLog
@@ -1,6 +1,9 @@
 # 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.16 2003/01/18 11:31:49 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grub/ChangeLog,v 1.17 2003/01/25 01:50:06 woodchip Exp $
+
+  24 Jan 2002; <woodchip@gentoo.org> *.ebuild : Reorder mount-boot.eclass
+  function, clean some fluff.
 
 *grub-0.93.20030118 (18 Jan 2003)
 
diff --git a/sys-apps/grub/files/digest-grub-0.90-r7 b/sys-apps/grub/files/digest-grub-0.90-r7
deleted file mode 100644
index ac01f8c63fea..000000000000
--- a/sys-apps/grub/files/digest-grub-0.90-r7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e435d871e5d06b3106342d880380605e grub-0.90.tar.gz 741583
diff --git a/sys-apps/grub/files/digest-grub-0.91-r3 b/sys-apps/grub/files/digest-grub-0.91-r3
deleted file mode 100644
index 4b6a825430bb..000000000000
--- a/sys-apps/grub/files/digest-grub-0.91-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 83f60ed38224c2f4921d72ed56f4fa90 grub-0.91.tar.gz 867276
diff --git a/sys-apps/grub/files/digest-grub-0.92 b/sys-apps/grub/files/digest-grub-0.92
deleted file mode 100644
index 72bf801ed46e..000000000000
--- a/sys-apps/grub/files/digest-grub-0.92
+++ /dev/null
@@ -1 +0,0 @@
-MD5 50f2786e7bf96b1115ee82b9c101a816 grub-0.92.tar.gz 877112
diff --git a/sys-apps/grub/grub-0.90-r7.ebuild b/sys-apps/grub/grub-0.90-r7.ebuild
deleted file mode 100644
index 5d69b5a143a9..000000000000
--- a/sys-apps/grub/grub-0.90-r7.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grub/grub-0.90-r7.ebuild,v 1.10 2003/01/06 09:11:03 seemant 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"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 -ppc -sparc -alpha"
-
-DEPEND=">=sys-devel/binutils-2.9.1.0.23
-	>=sys-libs/ncurses-5.2-r2"
-
-PROVIDE="virtual/bootloader"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	patch -p1 < ${FILESDIR}/${P}/grub-0.5.97-vga16.patch || die
-	patch -p1 < ${FILESDIR}/${P}/grub-0.5.96.1-special-raid-devices.patch || die
-	patch -p1 < ${FILESDIR}/${P}/grub-0.5.96.1-dont-give-mem-to-kernel.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-jfs+xfs-1.0-core.patch || die
-	patch -p1 < ${FILESDIR}/${P}/grub-jfs+xfs-1.0-build.patch || die
-	patch -p1 < ${FILESDIR}/${P}/grub-0.90-install.in.patch || die
-	patch -p1 < ${FILESDIR}/${P}/grub-0.90-installcopyonly.patch || die
-	cp -a ${FILESDIR}/${P}/configure .
-}
-
-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 \
-		--host=${CHOST} || die "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" || 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
-	cd ${D}/usr/share/grub/i386-pc
-	cp ${FILESDIR}/splash.xpm.gz ${D}/boot/grub
-	cd ${S}
-	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 GRUB to a'
-		einfo '*** 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
-}
diff --git a/sys-apps/grub/grub-0.91-r3.ebuild b/sys-apps/grub/grub-0.91-r3.ebuild
deleted file mode 100644
index d922f93169e4..000000000000
--- a/sys-apps/grub/grub-0.91-r3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grub/grub-0.91-r3.ebuild,v 1.11 2003/01/06 09:11:03 seemant 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/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 -ppc -sparc -alpha"
-
-DEPEND=">=sys-devel/binutils-2.9.1.0.23
-	>=sys-libs/ncurses-5.2-r2"
-
-PROVIDE="virtual/bootloader"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	patch -p1 < ${FILESDIR}/${P}/grub-0.91-vga16.patch || die
-	patch -p1 < ${FILESDIR}/${P}/grub-0.5.96.1-dont-give-mem-to-kernel.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-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.5.96.1-special-raid-devices.patch || die
-	patch -p1 < ${FILESDIR}/${P}/grub-0.91-splashimagehelp.patch || die
-	patch -p1 < ${FILESDIR}/${P}/grub-0.91-initrdusemem.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 \
-		--host=${CHOST} || die "Configuration of package failed."
-	
-	# Have to do this since the configure-script seems a little brooken
-	echo "#define VGA16 1" >> config.h
-	mv Makefile Makefile_orig
-	sed -e "s#config.h: stamp-h#config.h:#" Makefile_orig > Makefile
-
-	emake -e CPPFLAGS="-Wall -Wmissing-prototypes -Wunused \
-		-Wshadow -malign-jumps=1 -malign-loops=1 \
-		-malign-functions=1 -Wundef" || 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
-	cd ${D}/usr/share/grub/i386-pc
-	cp ${FILESDIR}/splash.xpm.gz ${D}/boot/grub
-	cd ${S}
-	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 GRUB"
-		einfo "*** 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
-}
diff --git a/sys-apps/grub/grub-0.92.ebuild b/sys-apps/grub/grub-0.92.ebuild
deleted file mode 100644
index 3998a4004513..000000000000
--- a/sys-apps/grub/grub-0.92.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grub/grub-0.92.ebuild,v 1.13 2003/01/06 09:11:03 seemant 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/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 -ppc -sparc -alpha"
-
-RDEPEND=">=sys-libs/ncurses-5.2-r5"
-
-PROVIDE="virtual/bootloader"
-
-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."
-
-	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
-	cd ${D}/usr/share/grub/i386-pc
-	cp ${FILESDIR}/splash.xpm.gz ${D}/boot/grub
-	cd ${S}
-	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 GRUB to a'
-		einfo '*** 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."
-		einfo "*** Note that menu.lst now is called grub.conf."
-	fi
-}
diff --git a/sys-apps/grub/grub-0.93.20030118.ebuild b/sys-apps/grub/grub-0.93.20030118.ebuild
index ee1619642dac..742c1ff9c036 100644
--- a/sys-apps/grub/grub-0.93.20030118.ebuild
+++ b/sys-apps/grub/grub-0.93.20030118.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/grub/grub-0.93.20030118.ebuild,v 1.3 2003/01/18 11:36:17 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/grub/grub-0.93.20030118.ebuild,v 1.4 2003/01/25 01:50:06 woodchip Exp $
 
-inherit mount-boot
+inherit mount-boot eutils
 
 NEWP=${PN}-${PV%.*}
 S=${WORKDIR}/${NEWP}
@@ -19,7 +19,6 @@ PROVIDE="virtual/bootloader"
 src_unpack() {
 	unpack ${A} || die
 	cd ${S} || die
-
 	# grub-0.93.20030118-gentoo.diff; <woodchip@gentoo.org> (18 Jan 2003)
 	# -fixes from grub CVS pulled on 20030118
 	# -vga16 patches; mined from Debian's grub-0.93+cvs20030102-1.diff
@@ -28,7 +27,7 @@ src_unpack() {
 	# -splashimagehelp.patch
 	# -configfile.patch
 	# -installcopyonly.patch
-	bzip2 -dc ${DISTDIR}/${P}-gentoo.diff.bz2 | patch -p1 || die
+	epatch ${DISTDIR}/${P}-gentoo.diff.bz2
 	WANT_AUTOCONF_2_5=1 autoconf || die
 }