--- /usr/repositories/gentoo/sys-boot/grub/grub-1.99_rc1.ebuild	2011-03-02 01:39:09.000000000 +0100
+++ /usr/repositories/gentoo/sys-boot/grub/grub-1.99_rc1.ebuild	2011-03-04 12:02:39.000000000 +0100
@@ -17,21 +17,24 @@ 
 	S=${WORKDIR}/${MY_P}
 fi
 
-DESCRIPTION="GNU GRUB 2 boot loader"
+DESCRIPTION="GNU GRUB boot loader"
 HOMEPAGE="http://www.gnu.org/software/grub/"
 
 LICENSE="GPL-3"
 use multislot && SLOT="2" || SLOT="0"
 KEYWORDS=""
-IUSE="custom-cflags debug truetype multislot static"
+IUSE="custom-cflags debug device-mapper truetype multislot static"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r5
 	dev-libs/lzo
+	debug? ( media-libs/libsdl )
+	device-mapper? ( || ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper ) )
 	truetype? ( media-libs/freetype >=media-fonts/unifont-5 )"
 DEPEND="${RDEPEND}
-	>=sys-devel/autogen-5.10
 	>=dev-lang/python-2.5.2"
-[[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man"
+[[ ${PV} == "9999" ]] && DEPEND="${DEPEND}
+		>=sys-devel/autogen-5.10
+		sys-apps/help2man"
 PROVIDE="virtual/bootloader"
 
 export STRIP_MASK="*/grub/*/*.mod"
@@ -65,11 +68,11 @@ 
 		--bindir=/bin \
 		--libdir=/$(get_libdir) \
 		--disable-efiemu \
+		$(use_enable device-mapper) \
 		$(use_enable truetype grub-mkfont) \
 		$(use_enable debug mm-debug) \
-		$(use_enable debug grub-emu) \
 		$(use_enable debug grub-emu-usb) \
-		$(use_enable debug grub-fstest)
+		$(use_enable debug grub-emu-sdl)
 	emake -j1 || die "making regular stuff"
 }