Only build grub-mkfont when USE=truetype #275654 by Cameron Tacklind.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 29 insertions, 13 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index be2bf087b106..4feb5fe94302 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-boot/grub
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.128 2009/11/22 17:34:52 vapier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.129 2010/01/10 06:13:21 vapier Exp $
+
+  10 Jan 2010; Mike Frysinger <vapier@gentoo.org> grub-1.97.1.ebuild,
+  grub-9999.ebuild:
+  Only build grub-mkfont when USE=truetype #275654 by Cameron Tacklind.
 
   22 Nov 2009; Mike Frysinger <vapier@gentoo.org> grub-9999.ebuild:
   Switch from svn to bzr repo #294001 by Robin Kauffman.
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 9bf50c22b440..8150d336bcfc 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX grub-0.97-gpt.patch 10682 RMD160 53dd38d52f2b38fb28dfb670d6fd27e47a562bbb SHA1 6057a076110d469fb63e56e57711d281221f9b42 SHA256 5e38046cfb727420e5b4b19d71c7fb4ddff22cbcc356c9f888763b0c1963d389
 AUX grub-1.95-build.patch 522 RMD160 eec01af7250a0883604530f321b154c575b14c41 SHA1 6f93b47a212ed0b3fb807bcf96e04792fa196ba1 SHA256 26d45247376f1e42b4197088161146173ea5bee3800282a707b331c49aed6ccf
 AUX grub-1.96-genkernel.patch 298 RMD160 3acae46d0c9a6b0c97960728751c679e32f0521d SHA1 b496e4486a546cfb72b81b27d8642c7d2e5123cb SHA256 8cbbaf1db68c39dfcc30b59779d820e9e9dca7ef957431791cdc0fc24e258eaf
@@ -32,7 +35,14 @@ EBUILD grub-0.97-r6.ebuild 8833 RMD160 d49c9ecff3d451a318fdcf4d5367549b4ae946c6
 EBUILD grub-0.97-r8.ebuild 8871 RMD160 c6255b0e4de7b0c03611e7227d5fb3ce48db5cce SHA1 9557b2edc8ba61766cd35a2a4d37e26434aaeff7 SHA256 34a4d4ffb38e0bf0ba2647933b7aa341c72537add518bc4ec217419619c1f960
 EBUILD grub-0.97-r9.ebuild 8975 RMD160 14ff47a8de303aa73e2571ee1fcb1aae3f433be0 SHA1 46676679d76ba268bc650fbdb183893298f38c7c SHA256 3bc4b98c9e451a601eb120327bb5273629471cf6cc01c363ac4f9bfd52e0276a
 EBUILD grub-0.97.ebuild 4527 RMD160 bc8dec8916cd52bbd0403d3e504f8a407d9e897c SHA1 7fc00e33d980842ed65b242ac53522b51894fa7c SHA256 2c20b9c10a242d15b17b48d73e5136c7f350cd313f77dd177c54a08f663be02a
-EBUILD grub-1.97.1.ebuild 2566 RMD160 8163edaea016fad7c754ca60c69dd6c252ef9a74 SHA1 0c0b2db2cfd5f07a65c24804c4aa15c5853f48f5 SHA256 48a5c81ef53d51b2e2135db280bad55bc0f5a06662e482b387807d4e8f86dd03
-EBUILD grub-9999.ebuild 2559 RMD160 47df398bd210381b4ebf4d31682d35c90ed8e981 SHA1 143e6b8645accc67afa0533eb79326c10f6011f6 SHA256 8706a3c4a587e1b481eff9022bfd60015f0bee3ab7f66e6ab888ad69d2cb0acf
-MISC ChangeLog 27308 RMD160 94a12f6010a321d8cfd8ec61deec33ee35e52823 SHA1 632a694fa044d25a4d5f2ccf2235eba38384155d SHA256 1bb96af0e069777cdcdce7c7f4679ebe59033dab278e6a5745b723f5184785c1
+EBUILD grub-1.97.1.ebuild 2657 RMD160 11fda0ca2dcfdaa79b57ef21bfc0122870589cbf SHA1 95535a9a9fc7f3a7275cc82a1b991f3a7477dcdf SHA256 6ddbe9a1282e176030884330388751124fac38a90c85e282129816b0e9504721
+EBUILD grub-9999.ebuild 2663 RMD160 7416880739a921aa0fe2787935dcd791f130c58e SHA1 4047a18a93d21cceb331b39be1e02d86d8f5540a SHA256 f6695779b0d122529ea31730d07c1c4f46ff637abc00bfdbf91e70c60571ecfa
+MISC ChangeLog 27471 RMD160 1028a6e63d1b22d510eadc26a80a1ddfbd9e82ee SHA1 23d75df216bb4b5909177ae6eb61905330e840bb SHA256 b0c569e31b8453611f37ac32dfbcdaf578aee9e6c3e1978a240956c96a0d993c
 MISC metadata.xml 262 RMD160 afabce9377772aefb54102e9ef237de6bb1561f5 SHA1 c38f9b99d8a84beb40c114283d8d7ddd4ac43d9e SHA256 35a9c56d9c8418806062854a360c27690d25159524df71f28bbd4d644e8706f3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iF4EAREIAAYFAktJcBAACgkQTwhj9JtAlp5IjQD/W4DktfdRGCLnF5CLsuDIaHWQ
+u5OmKyxfeNH4p/V9gr0A/15h8WGFtIMGb7355WXuFOvfsNzX1ytR4e4E8eUOl/Ol
+=NcJC
+-----END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-1.97.1.ebuild b/sys-boot/grub/grub-1.97.1.ebuild
index 34a46c5d2fca..a5f3299c314e 100644
--- a/sys-boot/grub/grub-1.97.1.ebuild
+++ b/sys-boot/grub/grub-1.97.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.97.1.ebuild,v 1.2 2010/01/10 06:09:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.97.1.ebuild,v 1.3 2010/01/10 06:13:21 vapier Exp $
 
 inherit mount-boot eutils flag-o-matic toolchain-funcs
 
@@ -19,10 +19,11 @@ HOMEPAGE="http://www.gnu.org/software/grub/"
 LICENSE="GPL-3"
 use multislot && SLOT="2" || SLOT="0"
 KEYWORDS=""
-IUSE="custom-cflags debug multislot static"
+IUSE="custom-cflags debug truetype multislot static"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r5
-	dev-libs/lzo"
+	dev-libs/lzo
+	truetype? ( media-libs/freetype )"
 DEPEND="${RDEPEND}
 	dev-lang/ruby"
 PROVIDE="virtual/bootloader"
@@ -57,7 +58,7 @@ src_compile() {
 		--bindir=/bin \
 		--libdir=/$(get_libdir) \
 		--disable-efiemu \
-		--enable-grub-mkfont \
+		$(use_enable truetype grub-mkfont) \
 		$(use_enable debug mm-debug) \
 		$(use_enable debug grub-emu) \
 		$(use_enable debug grub-emu-usb) \
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index a3b073665a3d..01f53d768a76 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.17 2010/01/10 06:09:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.18 2010/01/10 06:13:21 vapier Exp $
 
 inherit mount-boot eutils flag-o-matic toolchain-funcs
 
@@ -19,10 +19,11 @@ HOMEPAGE="http://www.gnu.org/software/grub/"
 LICENSE="GPL-3"
 use multislot && SLOT="2" || SLOT="0"
 KEYWORDS=""
-IUSE="custom-cflags debug multislot static"
+IUSE="custom-cflags debug truetype multislot static"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r5
-	dev-libs/lzo"
+	dev-libs/lzo
+	truetype? ( media-libs/freetype )"
 DEPEND="${RDEPEND}
 	dev-lang/ruby"
 PROVIDE="virtual/bootloader"
@@ -57,7 +58,7 @@ src_compile() {
 		--bindir=/bin \
 		--libdir=/$(get_libdir) \
 		--disable-efiemu \
-		--enable-grub-mkfont \
+		$(use_enable truetype grub-mkfont) \
 		$(use_enable debug mm-debug) \
 		$(use_enable debug grub-emu) \
 		$(use_enable debug grub-emu-usb) \