--- /usr/portage/sys-boot/grub/grub-9999.ebuild	2009-05-15 10:07:41.000000000 +0600
+++ grub-9999.ebuild	2009-06-18 07:09:47.000000000 +0600
@@ -19,12 +19,13 @@ HOMEPAGE="http://www.gnu.org/software/gr
 LICENSE="GPL-3"
 use multislot && SLOT="2" || SLOT="0"
 KEYWORDS=""
-IUSE="custom-cflags multislot static"
+IUSE="custom-cflags multislot static debug"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r5
 	dev-libs/lzo"
 DEPEND="${RDEPEND}
-	dev-lang/ruby"
+	dev-lang/ruby
+	media-fonts/unifont"
 PROVIDE="virtual/bootloader"
 
 export STRIP_MASK="*/grub/*/*.mod"
@@ -49,11 +50,17 @@ src_compile() {
 	use custom-cflags || unset CFLAGS CPPFLAGS LDFLAGS
 	use static && append-ldflags -static
 
+	local grub_opts="--enable-efiemu --enable-grub-mkfont --enable-grub-pe2elf"
+
+	if use debug; then
+		grub_opts="${grub_opts} --enable-mm-debug --enable-grub-emu-usb --enable-grub-fstest"
+	fi
+
 	econf \
 		--sbindir=/sbin \
 		--bindir=/bin \
 		--libdir=/$(get_libdir) \
-		|| die "econf failed"
+		${grub_opts} || die "econf failed"
 	emake -j1 || die "making regular stuff"
 }
 
@@ -74,15 +81,16 @@ setup_boot_dir() {
 	local boot_dir=$1
 	local dir=${boot_dir}/grub
 
+	if [[ ! -e ${dir}/unifont.pf2 ]] ; then
+		einfo "Making up unifont for gfxmenu"
+		hex2bdf < /usr/share/unifont/unifont.hex > "${WORKDIR}/unifont.bdf"
+		grub-mkfont --output="${dir}unifont.pf2" "${WORKDIR}/unifont.bdf"
+	fi
+
 	if [[ ! -e ${dir}/grub.cfg ]] ; then
 		einfo "Running: grub-mkconfig -o '${dir}/grub.cfg'"
 		grub-mkconfig -o "${dir}/grub.cfg"
 	fi
-
-	#local install=grub-install
-	#use multislot && install="grub2-install --grub-setup=/bin/true"
-	#einfo "Running: ${install} "
-	#${install}
 }
 
 pkg_postinst() {