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 1QPKMK-00008F-V6 for garchives@archives.gentoo.org; Wed, 25 May 2011 20:07:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 90C231C331; Wed, 25 May 2011 20:07:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 511E01C331 for ; Wed, 25 May 2011 20:07:05 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A77CB1B402D for ; Wed, 25 May 2011 20:07:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id BDB7C80505 for ; Wed, 25 May 2011 20:07:03 +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: <93711e898411c4bfd49c0b21c1ef7f1c9367d940.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: 93711e898411c4bfd49c0b21c1ef7f1c9367d940 Date: Wed, 25 May 2011 20:07:03 +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: 484118fb29b5834a8431d1fbfad9e4de commit: 93711e898411c4bfd49c0b21c1ef7f1c9367d940 Author: Tomas Chvatal gentoo org> AuthorDate: Wed May 25 20:05:32 2011 +0000 Commit: Tomas Chvatal gentoo org> CommitDate: Wed May 25 20:05:32 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/scarabeus.git;= a=3Dcommit;h=3D93711e89 [sys-boot/grub] Add missing runtime dependencies. Add nls useflag. --- sys-boot/grub/Manifest | 4 ++-- sys-boot/grub/grub-1.99.ebuild | 15 +++++++++++---- sys-boot/grub/grub-9999.ebuild | 12 +++++++++--- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest index c8d038f..88c0f4c 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -1,5 +1,5 @@ AUX defaults 1020 RMD160 48ce6914d693bef9db7f41afecb92c18715ffb7f SHA1 a= f556abd7deb0d0939f4766df265aa6882707cbe SHA256 302a0cfa6e1f6acf52f5d558cd= 03f3631313a4b95de038f10f740439ea0a921f DIST grub-1.99.tar.xz 2639224 RMD160 d59a47fa40b2be0d5ea5b2b00ff5538cfa1= 47747 SHA1 a5ae9558f30ce7757a76aa130088b053a87e2fb6 SHA256 f308148d4c83c6= f16a73b58a0cd39381656edb740929028cae7ad5f0d651021b -EBUILD grub-1.99.ebuild 3795 RMD160 e228895b10916ed7923145b192f78e741919= 1f1a SHA1 2887688b4042ee8210753913ab8e2768a9a3b37e SHA256 02b14a8379e4d86= 5290e5665e8259e97c75e67abff2a6d774add74bace052973 -EBUILD grub-9999.ebuild 3794 RMD160 1aeb21498d98f574816cf4759232c9b8cecf= d513 SHA1 16dbda7f5c723db88c37f8cb986d2c2913e29819 SHA256 c87453c0f238ae5= 5ef9e505e7689b862183a1d0cb442f54b23894dc5d26d1132 +EBUILD grub-1.99.ebuild 3985 RMD160 78243ade51b85e9c146ab4e8503b550f414a= 3d83 SHA1 7fd5ccf79b788758ada16226fb757c685803bb50 SHA256 01ff20e822e3ea3= 81f249380378a693dafb488056174ca4576329fde3d63d663 +EBUILD grub-9999.ebuild 3985 RMD160 78243ade51b85e9c146ab4e8503b550f414a= 3d83 SHA1 7fd5ccf79b788758ada16226fb757c685803bb50 SHA256 01ff20e822e3ea3= 81f249380378a693dafb488056174ca4576329fde3d63d663 MISC metadata.xml 349 RMD160 8e5ecd3c757f94fbccafc8120f4c8a04567135b4 SH= A1 3ff0251dbb2863c4fbf0913b901bc27ed73a1acd SHA256 fcb983296ee15683397726= 68bcf236db0a24aabba6c328343d7bdb790978cbb9 diff --git a/sys-boot/grub/grub-1.99.ebuild b/sys-boot/grub/grub-1.99.ebu= ild index 3b6edc5..1fd2da9 100644 --- a/sys-boot/grub/grub-1.99.ebuild +++ b/sys-boot/grub/grub-1.99.ebuild @@ -26,11 +26,16 @@ HOMEPAGE=3D"http://www.gnu.org/software/grub/" =20 LICENSE=3D"GPL-3" SLOT=3D"0" -KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"custom-cflags debug device-mapper static sdl truetype" +[[ ${PV} !=3D "9999" ]] && KEYWORDS=3D"~amd64 ~x86" +IUSE=3D"custom-cflags debug device-mapper nls static sdl truetype" =20 -RDEPEND=3D">=3Dsys-libs/ncurses-5.2-r5 +# os-prober: Used on runtime to detect other OSes +# xorriso: Used on runtime for mkrescue +RDEPEND=3D" + app-cdr/xorriso dev-libs/lzo + sys-boot/os-prober + >=3Dsys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/libsdl ) ) @@ -61,8 +66,9 @@ src_prepare() { =20 # autogen.sh does more than just run autotools if [[ ${PV} =3D=3D "9999" ]] ; then - sed -i -e '/^autoreconf/s:^:e:' autogen.sh || die + sed -i -e '/^autoreconf/ d' autogen.sh || die (. ./autogen.sh) || die + eautoreconf fi } =20 @@ -78,6 +84,7 @@ 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 38ae008..1fd2da9 100644 --- a/sys-boot/grub/grub-9999.ebuild +++ b/sys-boot/grub/grub-9999.ebuild @@ -26,11 +26,16 @@ HOMEPAGE=3D"http://www.gnu.org/software/grub/" =20 LICENSE=3D"GPL-3" SLOT=3D"0" -KEYWORDS=3D"" -IUSE=3D"custom-cflags debug device-mapper static sdl truetype" +[[ ${PV} !=3D "9999" ]] && KEYWORDS=3D"~amd64 ~x86" +IUSE=3D"custom-cflags debug device-mapper nls static sdl truetype" =20 -RDEPEND=3D">=3Dsys-libs/ncurses-5.2-r5 +# os-prober: Used on runtime to detect other OSes +# xorriso: Used on runtime for mkrescue +RDEPEND=3D" + app-cdr/xorriso dev-libs/lzo + sys-boot/os-prober + >=3Dsys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/libsdl ) ) @@ -79,6 +84,7 @@ 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)