From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QrqiB-0003aF-BL for garchives@archives.gentoo.org; Fri, 12 Aug 2011 12:19:39 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E235521C08C; Fri, 12 Aug 2011 12:19:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9DDBD21C08C for ; Fri, 12 Aug 2011 12:19:30 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 145AB1B4022 for ; Fri, 12 Aug 2011 12:19:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id DDBA680040 for ; Fri, 12 Aug 2011 12:19:28 +0000 (UTC) From: "Tomas Chvatal" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tomas Chvatal" Message-ID: <667a47d2541d4d6cbe18d40051c2011dbf239b3c.scarabeus@gentoo> Subject: [gentoo-commits] dev/scarabeus:master commit in: sys-boot/grub/ X-VCS-Repository: dev/scarabeus X-VCS-Files: sys-boot/grub/Manifest sys-boot/grub/grub-1.99.ebuild sys-boot/grub/grub-9999.ebuild X-VCS-Directories: sys-boot/grub/ X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal X-VCS-Revision: 667a47d2541d4d6cbe18d40051c2011dbf239b3c Date: Fri, 12 Aug 2011 12:19:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 427c682dc23248762c1cb7fc356bd231 commit: 667a47d2541d4d6cbe18d40051c2011dbf239b3c Author: Tomas Chvatal suse cz> AuthorDate: Fri Aug 12 12:19:17 2011 +0000 Commit: Tomas Chvatal gentoo org> CommitDate: Fri Aug 12 12:19:17 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/scarabeus.git;= a=3Dcommit;h=3D667a47d2 Revert "[sys-boot/grub] disable nls as it causes issues on some setups. b= etter 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 SH= A1 5878147845b5d4b4aac34ce046ead60b93c3170c SHA256 32664f2e0bdd05cf9579f8= e098aa0add76ef7bf7b37eb103c6d0f625204f44d3 DIST grub-1.99.tar.xz 2639224 RMD160 d59a47fa40b2be0d5ea5b2b00ff5538cfa1= 47747 SHA1 a5ae9558f30ce7757a76aa130088b053a87e2fb6 SHA256 f308148d4c83c6= f16a73b58a0cd39381656edb740929028cae7ad5f0d651021b -EBUILD grub-1.99.ebuild 7719 RMD160 8069d5baaa5ca2e9c70eff53035ec422ab15= bb9d SHA1 8e7b392335499be4d93221ae7ec6691acd4e6289 SHA256 f536f6564d8297c= af6f4b7f51c89bd9cda156b9d812c73d10c5b1ef6910d0efd -EBUILD grub-9999.ebuild 7718 RMD160 717708af5bf4ccdd1430275d0a102f7c5910= b348 SHA1 8c4a2d7a35fe1ce2ce5e9d0c52515f07237078b5 SHA256 81ee11890c0e274= b2beed7f89c09e6742df0ee3038393be644b11171e48e1dc8 +EBUILD grub-1.99.ebuild 7674 RMD160 873da5347010865f06807c51697384d54cf8= 4608 SHA1 3b23be85a9e8415a70829edc1cf81702a0ec8b64 SHA256 1e618672cf0e467= b13d9f9b7db51af56a65981f6993a62485f8f86b54c05264b +EBUILD grub-9999.ebuild 7674 RMD160 ab45de997ecb84ea25e8e65f3ba291909649= 2a4a SHA1 308eeb35282fd7912b603eaf708e65fbf6a1be93 SHA256 ab89216e2a2f689= 6b0045421ec85849023d79b8effbfda6aa25c82e9c01f8dbf MISC metadata.xml 264 RMD160 3cb995676f964b9637fbfc0027a81b9409802608 SH= A1 c4d35e3a71c545cdf1aae525de803126bf54f596 SHA256 9bd1ce830cf1b821978ab9= 0c81b2e369177a8d7c1bfe2dd2868419872c097f64 diff --git a/sys-boot/grub/grub-1.99.ebuild b/sys-boot/grub/grub-1.99.ebu= ild 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=3D"http://www.gnu.org/software/grub/" LICENSE=3D"GPL-3" SLOT=3D"2" [[ ${PV} !=3D "9999" ]] && KEYWORDS=3D"~amd64 ~x86 ~mips ~ppc ~ppc64" -IUSE=3D"custom-cflags debug device-mapper static sdl truetype" +IUSE=3D"custom-cflags debug device-mapper nls static sdl truetype" =20 GRUB_PLATFORMS=3D"coreboot efi-32 efi-64 emu ieee1275 multiboot pc qemu = qemu-mips yeeloong" # everywhere: @@ -148,10 +148,8 @@ grub_src_configure() { fi fi =20 - # nls: cause various issues on boot, rather disable ECONF_SOURCE=3D"${WORKDIR}/${P}/" \ econf \ - --disable-nls \ --disable-werror \ --sbindir=3D/sbin \ --bindir=3D/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.ebu= ild index a56abc0..bd8ad8c 100644 --- a/sys-boot/grub/grub-9999.ebuild +++ b/sys-boot/grub/grub-9999.ebuild @@ -24,7 +24,7 @@ HOMEPAGE=3D"http://www.gnu.org/software/grub/" LICENSE=3D"GPL-3" SLOT=3D"2" [[ ${PV} !=3D "9999" ]] && KEYWORDS=3D"~amd64 ~x86 ~mips ~ppc ~ppc64" -IUSE=3D"custom-cflags debug device-mapper static sdl truetype" +IUSE=3D"custom-cflags debug device-mapper nls static sdl truetype" =20 GRUB_PLATFORMS=3D"coreboot efi-32 efi-64 emu ieee1275 multiboot pc qemu = qemu-mips loongson" # everywhere: @@ -147,10 +147,9 @@ grub_src_configure() { platform=3D" --with-platform=3D${platform}" fi fi - # nls: cause various issues on boot, rather disable + ECONF_SOURCE=3D"${WORKDIR}/${P}/" \ econf \ - --disable-nls \ --disable-werror \ --sbindir=3D/sbin \ --bindir=3D/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) \