summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/grub/ChangeLog6
-rw-r--r--sys-boot/grub/grub-2.02_beta2-r7.ebuild7
-rw-r--r--sys-boot/grub/grub-9999-r1.ebuild7
3 files changed, 9 insertions, 11 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 5e16d054eb20..183e42234740 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-boot/grub
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.341 2015/02/01 18:43:52 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.342 2015/02/04 02:25:00 floppym Exp $
+
+ 04 Feb 2015; Mike Gilbert <floppym@gentoo.org> grub-2.02_beta2-r7.ebuild,
+ grub-9999-r1.ebuild:
+ DEPEND on freetype unconditionally so that we always build fonts for gfxterm.
*grub-2.02_beta2-r7 (01 Feb 2015)
diff --git a/sys-boot/grub/grub-2.02_beta2-r7.ebuild b/sys-boot/grub/grub-2.02_beta2-r7.ebuild
index abcebc145929..578e15c3890f 100644
--- a/sys-boot/grub/grub-2.02_beta2-r7.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 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-r7.ebuild,v 1.1 2015/02/01 18:43:52 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r7.ebuild,v 1.2 2015/02/04 02:25:00 floppym Exp $
EAPI=5
@@ -79,14 +79,11 @@ RDEPEND="
DEPEND="${RDEPEND}
${PYTHON_DEPS}
app-misc/pax-utils
+ media-libs/freetype:2
sys-devel/flex
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 a0a4c63869f4..1c60234a713e 100644
--- a/sys-boot/grub/grub-9999-r1.ebuild
+++ b/sys-boot/grub/grub-9999-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 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.24 2015/01/04 03:16:03 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild,v 1.25 2015/02/04 02:25:00 floppym Exp $
EAPI=5
@@ -81,14 +81,11 @@ RDEPEND="
DEPEND="${RDEPEND}
${PYTHON_DEPS}
app-misc/pax-utils
+ media-libs/freetype:2
sys-devel/flex
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(+)]