From 667a47d2541d4d6cbe18d40051c2011dbf239b3c Mon Sep 17 00:00:00 2001
From: Tomas Chvatal <tchvatal@suse.cz>
Date: Fri, 12 Aug 2011 14:19:17 +0200
Subject: Revert "[sys-boot/grub] disable nls as it causes issues on some
 setups. better safe than sorry."

This reverts commit de9cd56dbca81cbfd79ae1ac55bde244aeb12e9e.
---
 sys-boot/grub/Manifest         | 4 ++--
 sys-boot/grub/grub-1.99.ebuild | 5 ++---
 sys-boot/grub/grub-9999.ebuild | 6 +++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 09152de..d0200ce 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,5 +1,5 @@
 AUX grub.default 1127 RMD160 a884e842cb203687cac4cac6551b0feed58d3b7a SHA1 5878147845b5d4b4aac34ce046ead60b93c3170c SHA256 32664f2e0bdd05cf9579f8e098aa0add76ef7bf7b37eb103c6d0f625204f44d3
 DIST grub-1.99.tar.xz 2639224 RMD160 d59a47fa40b2be0d5ea5b2b00ff5538cfa147747 SHA1 a5ae9558f30ce7757a76aa130088b053a87e2fb6 SHA256 f308148d4c83c6f16a73b58a0cd39381656edb740929028cae7ad5f0d651021b
-EBUILD grub-1.99.ebuild 7719 RMD160 8069d5baaa5ca2e9c70eff53035ec422ab15bb9d SHA1 8e7b392335499be4d93221ae7ec6691acd4e6289 SHA256 f536f6564d8297caf6f4b7f51c89bd9cda156b9d812c73d10c5b1ef6910d0efd
-EBUILD grub-9999.ebuild 7718 RMD160 717708af5bf4ccdd1430275d0a102f7c5910b348 SHA1 8c4a2d7a35fe1ce2ce5e9d0c52515f07237078b5 SHA256 81ee11890c0e274b2beed7f89c09e6742df0ee3038393be644b11171e48e1dc8
+EBUILD grub-1.99.ebuild 7674 RMD160 873da5347010865f06807c51697384d54cf84608 SHA1 3b23be85a9e8415a70829edc1cf81702a0ec8b64 SHA256 1e618672cf0e467b13d9f9b7db51af56a65981f6993a62485f8f86b54c05264b
+EBUILD grub-9999.ebuild 7674 RMD160 ab45de997ecb84ea25e8e65f3ba2919096492a4a SHA1 308eeb35282fd7912b603eaf708e65fbf6a1be93 SHA256 ab89216e2a2f6896b0045421ec85849023d79b8effbfda6aa25c82e9c01f8dbf
 MISC metadata.xml 264 RMD160 3cb995676f964b9637fbfc0027a81b9409802608 SHA1 c4d35e3a71c545cdf1aae525de803126bf54f596 SHA256 9bd1ce830cf1b821978ab90c81b2e369177a8d7c1bfe2dd2868419872c097f64
diff --git a/sys-boot/grub/grub-1.99.ebuild b/sys-boot/grub/grub-1.99.ebuild
index 343ae88..f3e2eb8 100644
--- a/sys-boot/grub/grub-1.99.ebuild
+++ b/sys-boot/grub/grub-1.99.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.gnu.org/software/grub/"
 LICENSE="GPL-3"
 SLOT="2"
 [[ ${PV} != "9999" ]] && KEYWORDS="~amd64 ~x86 ~mips ~ppc ~ppc64"
-IUSE="custom-cflags debug device-mapper static sdl truetype"
+IUSE="custom-cflags debug device-mapper nls static sdl truetype"
 
 GRUB_PLATFORMS="coreboot efi-32 efi-64 emu ieee1275 multiboot pc qemu qemu-mips yeeloong"
 # everywhere:
@@ -148,10 +148,8 @@ grub_src_configure() {
 		fi
 	fi
 
-	# nls: cause various issues on boot, rather disable
 	ECONF_SOURCE="${WORKDIR}/${P}/" \
 	econf \
-		--disable-nls \
 		--disable-werror \
 		--sbindir=/sbin \
 		--bindir=/bin \
@@ -159,6 +157,7 @@ grub_src_configure() {
 		--disable-efiemu \
 		$(use_enable device-mapper) \
 		$(use_enable truetype grub-mkfont) \
+		$(use_enable nls) \
 		$(use_enable debug mm-debug) \
 		$(use sdl && use_enable debug grub-emu-sdl) \
 		$(use_enable debug grub-emu-usb) \
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index a56abc0..bd8ad8c 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.gnu.org/software/grub/"
 LICENSE="GPL-3"
 SLOT="2"
 [[ ${PV} != "9999" ]] && KEYWORDS="~amd64 ~x86 ~mips ~ppc ~ppc64"
-IUSE="custom-cflags debug device-mapper static sdl truetype"
+IUSE="custom-cflags debug device-mapper nls static sdl truetype"
 
 GRUB_PLATFORMS="coreboot efi-32 efi-64 emu ieee1275 multiboot pc qemu qemu-mips loongson"
 # everywhere:
@@ -147,10 +147,9 @@ grub_src_configure() {
 			platform=" --with-platform=${platform}"
 		fi
 	fi
-	# nls: cause various issues on boot, rather disable
+
 	ECONF_SOURCE="${WORKDIR}/${P}/" \
 	econf \
-		--disable-nls \
 		--disable-werror \
 		--sbindir=/sbin \
 		--bindir=/bin \
@@ -158,6 +157,7 @@ grub_src_configure() {
 		--disable-efiemu \
 		$(use_enable device-mapper) \
 		$(use_enable truetype grub-mkfont) \
+		$(use_enable nls) \
 		$(use_enable debug mm-debug) \
 		$(use sdl && use_enable debug grub-emu-sdl) \
 		$(use_enable debug grub-emu-usb) \
-- 
cgit v1.2.3-65-gdbad