diff options
Diffstat (limited to 'sys-boot')
| -rw-r--r-- | sys-boot/grub/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-boot/grub/grub-2.02_beta2-r1.ebuild | 13 | ||||
| -rw-r--r-- | sys-boot/grub/grub-2.02_beta2.ebuild | 13 | ||||
| -rw-r--r-- | sys-boot/grub/grub-9999-r1.ebuild | 13 |
4 files changed, 27 insertions, 19 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index a1381cb9e2ab..835c3452ba79 100644 --- a/sys-boot/grub/ChangeLog +++ b/sys-boot/grub/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-boot/grub # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.315 2014/09/09 21:59:41 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.316 2014/09/10 01:20:36 floppym Exp $ + + 10 Sep 2014; Mike Gilbert <floppym@gentoo.org> grub-2.02_beta2-r1.ebuild, + grub-2.02_beta2.ebuild, grub-9999-r1.ebuild: + Add build-time dep on freetype for coreboot, qemu, ieee1275 and loongson. Bug + 522464 by Stuart Shelton. *grub-2.02_beta2-r1 (09 Sep 2014) diff --git a/sys-boot/grub/grub-2.02_beta2-r1.ebuild b/sys-boot/grub/grub-2.02_beta2-r1.ebuild index 9595dfde6fa1..e833283bf515 100644 --- a/sys-boot/grub/grub-2.02_beta2-r1.ebuild +++ b/sys-boot/grub/grub-2.02_beta2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r1.ebuild,v 1.1 2014/09/09 21:59:41 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r1.ebuild,v 1.2 2014/09/10 01:20:36 floppym Exp $ EAPI=5 @@ -53,7 +53,7 @@ GRUB_ALL_PLATFORMS=( # everywhere: emu # mips only: - qemu-mips yeeloong + qemu-mips loongson # amd64, x86, ppc, ppc64: ieee1275 # amd64, x86: @@ -63,9 +63,6 @@ GRUB_ALL_PLATFORMS=( ) IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}" -REQUIRED_USE="grub_platforms_qemu? ( truetype ) - grub_platforms_yeeloong? ( truetype )" - # os-prober: Used on runtime to detect other OSes # xorriso (dev-libs/libisoburn): Used on runtime for mkrescue RDEPEND=" @@ -77,7 +74,7 @@ RDEPEND=" device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs ) mount? ( sys-fs/fuse ) - truetype? ( media-libs/freetype ) + truetype? ( media-libs/freetype:2= ) ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) " @@ -88,6 +85,10 @@ DEPEND="${RDEPEND} sys-devel/bison sys-apps/help2man sys-apps/texinfo + grub_platforms_coreboot? ( media-libs/freetype:2 ) + grub_platforms_qemu? ( media-libs/freetype:2 ) + grub_platforms_ieee1275? ( media-libs/freetype:2 ) + grub_platforms_loongson? ( media-libs/freetype:2 ) grub_platforms_xen? ( app-emulation/xen-tools ) static? ( app-arch/xz-utils[static-libs(+)] diff --git a/sys-boot/grub/grub-2.02_beta2.ebuild b/sys-boot/grub/grub-2.02_beta2.ebuild index 77744238046e..f19536b36d83 100644 --- a/sys-boot/grub/grub-2.02_beta2.ebuild +++ b/sys-boot/grub/grub-2.02_beta2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2.ebuild,v 1.10 2014/09/09 19:55:09 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2.ebuild,v 1.11 2014/09/10 01:20:36 floppym Exp $ EAPI=5 @@ -53,7 +53,7 @@ GRUB_ALL_PLATFORMS=( # everywhere: emu # mips only: - qemu-mips yeeloong + qemu-mips loongson # amd64, x86, ppc, ppc64: ieee1275 # amd64, x86: @@ -63,9 +63,6 @@ GRUB_ALL_PLATFORMS=( ) IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}" -REQUIRED_USE="grub_platforms_qemu? ( truetype ) - grub_platforms_yeeloong? ( truetype )" - # os-prober: Used on runtime to detect other OSes # xorriso (dev-libs/libisoburn): Used on runtime for mkrescue RDEPEND=" @@ -77,7 +74,7 @@ RDEPEND=" device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs ) mount? ( sys-fs/fuse ) - truetype? ( media-libs/freetype ) + truetype? ( media-libs/freetype:2= ) ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) " @@ -88,6 +85,10 @@ DEPEND="${RDEPEND} sys-devel/bison sys-apps/help2man sys-apps/texinfo + grub_platforms_coreboot? ( media-libs/freetype:2 ) + grub_platforms_qemu? ( media-libs/freetype:2 ) + grub_platforms_ieee1275? ( media-libs/freetype:2 ) + grub_platforms_loongson? ( media-libs/freetype:2 ) grub_platforms_xen? ( app-emulation/xen-tools ) static? ( app-arch/xz-utils[static-libs(+)] diff --git a/sys-boot/grub/grub-9999-r1.ebuild b/sys-boot/grub/grub-9999-r1.ebuild index 1de899fe5db1..8015b3c41ec7 100644 --- a/sys-boot/grub/grub-9999-r1.ebuild +++ b/sys-boot/grub/grub-9999-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild,v 1.18 2014/09/09 22:03:39 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild,v 1.19 2014/09/10 01:20:36 floppym Exp $ EAPI=5 @@ -55,7 +55,7 @@ GRUB_ALL_PLATFORMS=( # everywhere: emu # mips only: - qemu-mips yeeloong + qemu-mips loongson # amd64, x86, ppc, ppc64: ieee1275 # amd64, x86: @@ -65,9 +65,6 @@ GRUB_ALL_PLATFORMS=( ) IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}" -REQUIRED_USE="grub_platforms_qemu? ( truetype ) - grub_platforms_yeeloong? ( truetype )" - # os-prober: Used on runtime to detect other OSes # xorriso (dev-libs/libisoburn): Used on runtime for mkrescue RDEPEND=" @@ -79,7 +76,7 @@ RDEPEND=" device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs ) mount? ( sys-fs/fuse ) - truetype? ( media-libs/freetype ) + truetype? ( media-libs/freetype:2= ) ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils ) " @@ -90,6 +87,10 @@ DEPEND="${RDEPEND} sys-devel/bison sys-apps/help2man sys-apps/texinfo + grub_platforms_coreboot? ( media-libs/freetype:2 ) + grub_platforms_qemu? ( media-libs/freetype:2 ) + grub_platforms_ieee1275? ( media-libs/freetype:2 ) + grub_platforms_loongson? ( media-libs/freetype:2 ) grub_platforms_xen? ( app-emulation/xen-tools ) static? ( app-arch/xz-utils[static-libs(+)] |