diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-05-25 22:05:32 +0200 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-05-25 22:05:32 +0200 |
| commit | 93711e898411c4bfd49c0b21c1ef7f1c9367d940 (patch) | |
| tree | 59892bbce197dcbedc518928ddab3f966932d63f | |
| parent | [sys-boot/grub] Fix eautoreconf failing the phase. (diff) | |
| download | scarabeus-93711e898411c4bfd49c0b21c1ef7f1c9367d940.tar.gz scarabeus-93711e898411c4bfd49c0b21c1ef7f1c9367d940.tar.bz2 scarabeus-93711e898411c4bfd49c0b21c1ef7f1c9367d940.zip | |
[sys-boot/grub] Add missing runtime dependencies. Add nls useflag.
| -rw-r--r-- | sys-boot/grub/Manifest | 4 | ||||
| -rw-r--r-- | sys-boot/grub/grub-1.99.ebuild | 15 | ||||
| -rw-r--r-- | 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 af556abd7deb0d0939f4766df265aa6882707cbe SHA256 302a0cfa6e1f6acf52f5d558cd03f3631313a4b95de038f10f740439ea0a921f DIST grub-1.99.tar.xz 2639224 RMD160 d59a47fa40b2be0d5ea5b2b00ff5538cfa147747 SHA1 a5ae9558f30ce7757a76aa130088b053a87e2fb6 SHA256 f308148d4c83c6f16a73b58a0cd39381656edb740929028cae7ad5f0d651021b -EBUILD grub-1.99.ebuild 3795 RMD160 e228895b10916ed7923145b192f78e7419191f1a SHA1 2887688b4042ee8210753913ab8e2768a9a3b37e SHA256 02b14a8379e4d865290e5665e8259e97c75e67abff2a6d774add74bace052973 -EBUILD grub-9999.ebuild 3794 RMD160 1aeb21498d98f574816cf4759232c9b8cecfd513 SHA1 16dbda7f5c723db88c37f8cb986d2c2913e29819 SHA256 c87453c0f238ae55ef9e505e7689b862183a1d0cb442f54b23894dc5d26d1132 +EBUILD grub-1.99.ebuild 3985 RMD160 78243ade51b85e9c146ab4e8503b550f414a3d83 SHA1 7fd5ccf79b788758ada16226fb757c685803bb50 SHA256 01ff20e822e3ea381f249380378a693dafb488056174ca4576329fde3d63d663 +EBUILD grub-9999.ebuild 3985 RMD160 78243ade51b85e9c146ab4e8503b550f414a3d83 SHA1 7fd5ccf79b788758ada16226fb757c685803bb50 SHA256 01ff20e822e3ea381f249380378a693dafb488056174ca4576329fde3d63d663 MISC metadata.xml 349 RMD160 8e5ecd3c757f94fbccafc8120f4c8a04567135b4 SHA1 3ff0251dbb2863c4fbf0913b901bc27ed73a1acd SHA256 fcb983296ee1568339772668bcf236db0a24aabba6c328343d7bdb790978cbb9 diff --git a/sys-boot/grub/grub-1.99.ebuild b/sys-boot/grub/grub-1.99.ebuild 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="http://www.gnu.org/software/grub/" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="custom-cflags debug device-mapper static sdl truetype" +[[ ${PV} != "9999" ]] && KEYWORDS="~amd64 ~x86" +IUSE="custom-cflags debug device-mapper nls static sdl truetype" -RDEPEND=">=sys-libs/ncurses-5.2-r5 +# os-prober: Used on runtime to detect other OSes +# xorriso: Used on runtime for mkrescue +RDEPEND=" + app-cdr/xorriso dev-libs/lzo + sys-boot/os-prober + >=sys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/libsdl ) ) @@ -61,8 +66,9 @@ src_prepare() { # autogen.sh does more than just run autotools if [[ ${PV} == "9999" ]] ; then - sed -i -e '/^autoreconf/s:^:e:' autogen.sh || die + sed -i -e '/^autoreconf/ d' autogen.sh || die (. ./autogen.sh) || die + eautoreconf fi } @@ -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.ebuild index 38ae008..1fd2da9 100644 --- a/sys-boot/grub/grub-9999.ebuild +++ b/sys-boot/grub/grub-9999.ebuild @@ -26,11 +26,16 @@ HOMEPAGE="http://www.gnu.org/software/grub/" LICENSE="GPL-3" SLOT="0" -KEYWORDS="" -IUSE="custom-cflags debug device-mapper static sdl truetype" +[[ ${PV} != "9999" ]] && KEYWORDS="~amd64 ~x86" +IUSE="custom-cflags debug device-mapper nls static sdl truetype" -RDEPEND=">=sys-libs/ncurses-5.2-r5 +# os-prober: Used on runtime to detect other OSes +# xorriso: Used on runtime for mkrescue +RDEPEND=" + app-cdr/xorriso dev-libs/lzo + sys-boot/os-prober + >=sys-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) |