--- /usr/portage/sys-boot/grub/grub-0.94-r1.ebuild	2005-02-04 01:17:00.000000000 +0100
+++ /usr/local/portage/sys-boot/grub/grub-0.94-r1.ebuild	2005-02-23 16:28:03.058341680 +0100
@@ -12,9 +12,10 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* x86 amd64"
-IUSE="static"
+IUSE="static netboot"
 
-DEPEND=">=sys-libs/ncurses-5.2-r5
+RDEPEND=">=sys-libs/ncurses-5.2-r5"
+DEPEND="${RDEPEND}
 	>=sys-devel/automake-1.7
 	>=sys-devel/autoconf-2.5"
 PROVIDE="virtual/bootloader"
@@ -50,14 +51,16 @@
 	[ `gcc-major-version` -eq 3 ] && append-flags -minline-all-stringops
 	use static && append-ldflags -static
 
-	has_pie && CC="${CC} `test_flag -fno-pic` `test_flag -nopie`"
-	has_ssp && CC="${CC} `test_flag -fno-stack-protector`"
+	has_pie && CFLAGS="${CFLAGS} `test_flag -fno-pic` `test_flag -nopie`"
+	has_ssp && CFLAGS="${CFLAGS} `test_flag -fno-stack-protector`"
 
 	autoconf || die
 	aclocal || die
 	WANT_AUTOMAKE=1.7 automake || die
 
 	# build the net-bootable grub first
+	if use netboot; then
+
 	CFLAGS="" \
 	econf \
 		--libdir=/lib \
@@ -77,6 +80,8 @@
 
 	make clean || die
 
+	fi
+
 	# now build the regular grub
 	CFLAGS="${CFLAGS}" \
 	econf \