Add build-time dep on freetype for coreboot, qemu, ieee1275 and loongson. Bug 522464 by Stuart Shelton.

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

5 files changed, 34 insertions, 26 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/Manifest b/sys-boot/grub/Manifest
index 5cf00cfdcebf..e75d24ac202f 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -22,15 +22,15 @@ DIST unifont-7.0.01.pcf.gz 1358916 SHA256 7618a96ad50703213848af8ecae816828f528b
 EBUILD grub-0.97-r12.ebuild 9233 SHA256 d5486666e1f8339a8308489607c9108cd34e8ebc696a956e2ff8dafad1c71815 SHA512 332a89395331ef04654345f960f2939340ce9b47ae6ac755e54f4ecc85f6243060890e7553b515468aaffd8346bbb5a0b7fbd26d23911b847f12c557854e96f1 WHIRLPOOL 1a20c9df999954ce431ca50eaaa5651721c939229b3a55d820445620218ffa64d43ba6251e88b1df6f54163f6914265596698db513a47d3c415ccaa01b51e61d
 EBUILD grub-0.97-r13.ebuild 9384 SHA256 c694ab37f477548da2b98c9beb2c5432ddd799e40fcbf82273cd2da3fdb072e1 SHA512 615e4d11ba91c7bc2fcb926bfc791d1aa3151a06dd336f9597ccc5b22a4b6a1bbffde5f7622ec6cc4c04216c63d99becfc9cf38bcf8fed476773bd3b7930fad2 WHIRLPOOL 91d94e1f90393bb5137b791bfa2d73b418938091d81ec44b783d749ea08ee3a615a5ca4d07a841c66429f6ff7d480ae2ad4f0626576ddaab459f111106160761
 EBUILD grub-2.00_p5107-r2.ebuild 8180 SHA256 1db3f6266e63332ef89d9c32895189fee3307a5ca2f687620df43c5a9d52547a SHA512 f95264d8eff99a1dd8420d64539aef4b7eb464edc8119076af7c175fac418d0e554ee7bb0ae4edb57c3a1a5b82f32da51db6b7ffc4a9a62dc7541d3694b65faa WHIRLPOOL d1dd247120f6de17aaea2899760fd7daf3eb242a3945f6ae2c03eae71c33e3c6bb780639a030d9ba46f4b9b8f23d383fc6559306e40a82be293466ce6d6270a5
-EBUILD grub-2.02_beta2-r1.ebuild 8254 SHA256 31cb7ffb3f0b1dfeec383a51fdeb6f338cd2bebf77ee553b2f5b3ec7e9b8aa3d SHA512 d6abaaf104dc01b54d3dd1566a0892f0b2bfece90d6cd489edb80d4b056055f5443ba4c73ba0577e70ff238897ef9aedd083869e6c3e0fafb0f7a08fe9a9d35b WHIRLPOOL bb4a4307450e39192a7f44caea4082260c0c577b660f5db9527e891424f86895b75dc5aa0d8163e6f9ce76798b2b0a25ccb7eb1046c2514ada9601c9b108d409
-EBUILD grub-2.02_beta2.ebuild 8186 SHA256 b897e016bc9f2f688c502a9769c59139e310d374ba3ba25ae3826292b9d34ac8 SHA512 37884943b62a58d4bab43914392d06d04610741ac76f36228b206d394c58facc0054e0050282bb74cc83a9e5e169309fce7cc8a96998771b94999c7453c2e3f2 WHIRLPOOL 1b1fe4e0ab6605f9685e4e02fee605d0283fcae833b1558c067f7baa8e35acc39aeeefbe924bb742057664da8a14bc12c025feecdc86ba4ec874af5a545056d7
-EBUILD grub-9999-r1.ebuild 8190 SHA256 4a2d89856d5ad449bc4ea5fbbf551b9a67614390bddb59e09244f5c436a7f0d0 SHA512 e2115d59708ceb57be0884ba6c7a3297fa429eff63866e542c82e7495a7648977cb79f3e80ad2ecb19fa30c593149b815d59ad375e21ee6a604efde58887ee07 WHIRLPOOL 1d48e83ee66e5579465064a397f97da0ce79b4fbabe99add785a92ba85183d4b67d28c726c48432468c46b0064b33c7ff578c886b96a2c335b2130dfa1f7e20b
-MISC ChangeLog 60113 SHA256 b0051f14e9a8a02673430ea765b763726865f6cf1501cd875c4606cd910ff5fc SHA512 59c89a0a6a2e33d5e818469590e50299f87e2d4b77616b986df6015108c87c5f8df620367b8a65debbc8fbed2e9128b21b02b94afee3d72d94dac8337e61dd2d WHIRLPOOL 7d9c624acd760b6cdb2154cae8dfff60c08278fb1a063095082e7a1d7cde99b700fd3124afcb459e89de4d123fae1eb8b9168625c77b9f51de1538231039bfa0
+EBUILD grub-2.02_beta2-r1.ebuild 8372 SHA256 f6d471f82189477c546b43b6bc877ff7f76926a235efceb78ffa335eb94aeaa3 SHA512 3eaec87917b6ad6f78f1933b8e41fd45d760e9cfe51c5781603280b7e292fc55ca8816cad188356e105c974f286014661d376dae9ed811d3d19d6874b7942300 WHIRLPOOL fbc4b67bcb84b13655c802bce826af7f27f5edefedf5c1906a9dc7f2aa2c35416036c4e6995d8d1bf2735b897af97d031f96a96ccbaf9644cb91c4ad54dffcfc
+EBUILD grub-2.02_beta2.ebuild 8304 SHA256 7c41c4abbb6daef697960d00f9f44f2779095b4918ac975c97799c0fd38b958f SHA512 07ee0e1605e12899d5544db3e3672d4c91f7dcc6b65556d27c32ab1edf9a39a183a6b7be6eeb4ad1f5c4be84dee3a0e18af90867241069c253e4be7185163f54 WHIRLPOOL dc310d7dbea7e310da6f7ee3b1f0563014cba9102f325603cf7d3f7ce6047a93fa4f50777e3b86097c04a372c659eb12ab06ded3293585b0c87c74872c31b5fc
+EBUILD grub-9999-r1.ebuild 8308 SHA256 e6a8a3c6f0a9540802f65b43e63c20648cea25c5cc1261534d254c31f5d97193 SHA512 51939a575a06e299e860621c3d5bc23c059b27fdff0336fef8a005afe813435af6ca50a07ee71aa02dee09a158bb437bb7690bc9bc4c794d5431045db601052c WHIRLPOOL b59e25ce068dfce03d8fb4c413e890af414209f4d44045fe29d255e0c7d52299527db2468cb1e187a8678b4774279ad407c1decced069fa22a441fbfd9a9bd6d
+MISC ChangeLog 60345 SHA256 9a8f27369dd9be0615e57bd1347be40cb2c95e57c78beae499538720521c7c25 SHA512 f1f4baadf3f5212a5caff0e4c07bbc6e8188bbd6d035976ee0c9247d373440403ea2906780932fc2cf44913aa3971bf215d83311f9ddebaf56d52dd71018a66e WHIRLPOOL 4d42e412e2f0f12c08cfc566e74d751bf924dd8644c44f13ed5f09be4d5db80e885f7e340fd8e459a4adff3ae773efdd19c2933b72c43158b796c9cb7d079e15
 MISC metadata.xml 838 SHA256 01beea9f20f03e00fdc21576a1311d3c21874980cdd57a9f2ed08a9d7cda1c46 SHA512 f6266f2f77db089d2f9289be079ef5a3637726b0906c5e96a7d8b7e29a8105cb7c48b9739f5607c0fdac2545db0e87f35132769f82b12db11a6f0018cc3c92f2 WHIRLPOOL 528d4f57ca38b0f0d4c34cd6bd60c7aeefc0fabd1e1e7be8efe0fcba04824d047a6e04288f1fbbd8e865c7435b53e84caffe7d4196809b157ee76e0d2be6f8df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlQPeTwACgkQC77qH+pIQ6Re5QEAt8HiIZ9z1K9vLewoxiNGmRbn
-S8/3ua5DtnsQc7rLELMA/1NnhF50Q5s61uoYlIF8dvD/RNQ8FJcTGs+ViV9Ggh6V
-=PeNH
+iF4EAREIAAYFAlQPp2YACgkQC77qH+pIQ6SZIgD9F65Vt9RozFJgdsze+XKzeNdo
+BQeTrjR6tu1D8PJBbb4A/3gmKRTM6La0jtesbJpUmrNwuWLBy18aw5DF7leJcwzn
+=MJiW
 -----END PGP SIGNATURE-----
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(+)]