From 5527ba53d4ed34305f36b98e92d90aa5948a28c2 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Wed, 4 Feb 2015 02:25:03 +0000 Subject: [PATCH] DEPEND on freetype unconditionally so that we always build fonts for gfxterm. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x0BBEEA1FEA4843A4 --- sys-boot/grub/ChangeLog | 6 +++++- sys-boot/grub/Manifest | 12 ++++++------ sys-boot/grub/grub-2.02_beta2-r7.ebuild | 7 ++----- sys-boot/grub/grub-9999-r1.ebuild | 7 ++----- 4 files changed, 15 insertions(+), 17 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 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/Manifest b/sys-boot/grub/Manifest index 6bc18afff9be..8c07dc2a403b 100644 --- a/sys-boot/grub/Manifest +++ b/sys-boot/grub/Manifest @@ -24,14 +24,14 @@ EBUILD grub-0.97-r14.ebuild 10014 SHA256 2e9e0186fe10825696eea49800abba52c6b88a5 EBUILD grub-2.00_p5107-r2.ebuild 8176 SHA256 dd465775321948d280745f53ec053bbde5adba0ac9d2455dbfee12276797c11b SHA512 d9f94d5b5cf3c098ef4a4dc5c80ecfe67b0e507a6b4e9b2e950c4ca586176ef23cc5e4ca877e5409ca05bfad014a27a5c76f239813ca19e9ef4f37361119ccfc WHIRLPOOL 22bd70e31bbfc2d24b89b4e2ffd14410c139b6fb909cbe29f335fe6b924daf926e42404dbf69f37e2f34a7cfc9519f42ae130f10e7b6c6b777a7b8897d5b045d EBUILD grub-2.02_beta2-r3.ebuild 8348 SHA256 c1750499c8b3b454371f8ab1ea74e8f31e4f8480aa5e10759a18cdb9fde932c3 SHA512 15999e0d6f6f60f91c4ee9c4eb69e2f30f7f64df8fcd812589b8cad9eb6c571187c2ff51bcf6b7d6882f70f99339010da2719ae4006bb9639a03cff6fadc03d0 WHIRLPOOL 897cc2f01a91bcc31db44d781aa81ba59188bd00a363a39baa4352715d29194abb34dbc656a77d9aa2568a279700cb39f4f9412381cb97fe8f77f9be76f789be EBUILD grub-2.02_beta2-r6.ebuild 8596 SHA256 a6d5a30153af46aa865e59e45c7ce5ac0e8105a94c9cbda57b8d1bc14ecbc042 SHA512 25d90bd657251203e4318befa7238d691303b6789af87fe6cdda168886f6b248e510a36f33244e6bc698accb911954ee6ea42d557bcb3124178b69fca7b12d3d WHIRLPOOL 9bc224bd350b928ae1471437070bef2ef145913188e64b658bf181d2f61e75065862aa2b61bb8175e4832eaedb2e06704f5d4ce2258f1edd3a2b8ff67ab093ca -EBUILD grub-2.02_beta2-r7.ebuild 8596 SHA256 6fe8dabf7eb502a914f197dd398e8316823a9340656aacab5664230830f05bbb SHA512 69b12c442a5932721148d87bda1ad34aaa7d5aea600f1f9c82b1e3b58518f9e4e17d0bd0282af6848be7ee1015d55be431b5235224be3198a4bf24b49c437bba WHIRLPOOL 85b00e9d0f9b0b332e01547b4c9a5c11f8aa8c56bde8c2762a77c5eb07757f9cdd63cd9dadb7367e025b9a277d19cb3d6d018606ebf40879362bf5f53e3d1733 -EBUILD grub-9999-r1.ebuild 8302 SHA256 a5e9d83f0a47f04d1d34b22667e0b75a55839fe972bdfcefe6ed35f08ff1997f SHA512 4d5a087603527c759212e93d2ff855742ac7531e35b46b9cbf62316c935cb94e822cef66e663933a0c5c6fe7d2cda4a8b4ddf145f5101e2ce72b584048473072 WHIRLPOOL ee01fd4d456788008acff86dbb51170078716714ffa08bade06e138cb6fc14792249ab390544b02a826d1bcb69b215aa2da1fd8a7a7e32fd7cfb9c8086e7aa30 -MISC ChangeLog 65467 SHA256 3370d082b54a6d4881fe83079edb667396c93b456f2e982717ec5aaa21915ad7 SHA512 2bcb396482c57b5a5ffcbfcd4b8ac43c46665afcfd984dbe9952734b3e8e215960998c3cbec385c8c2d54f56f75b3261ea8069a193091f2f7e6d6d361e417e5f WHIRLPOOL 6421199829c17954b897c918441d066215021d3b6c2c8c4f518f11ed7e5474d3d7f7842e3336927e25547754e18463ce2011874e410a7bf260545341d6e225f9 +EBUILD grub-2.02_beta2-r7.ebuild 8415 SHA256 adb28f7b179f7a259cf24cefa768fe84755292bf6648d7bed9ea39536b96badf SHA512 8366cba9b69f2babd0e6800cdc5084c6d30f5074f6c6cdaaaee9f8bb7f2ef10cf24c08dbe85d46d81a7969e5f13127d5161decbf53c40f1dadf6215883dbbd1d WHIRLPOOL 452eb26ab2696f8979f527a733f8955e04de5e4bb968b2c844992e755958aceb7524cbe6704e77f70e3ef82c24d8971e9140993cb39be76c8315736dfbc5d162 +EBUILD grub-9999-r1.ebuild 8121 SHA256 70e195dba141268ad6cd1c6340a2c721821b13eba1af01af1fb3f3b0814e6664 SHA512 409909f9c655a5b9c87385a5b1da9bee5d6fdc7bd4304ceb6f5d401a78f1d7e3d7298c0f3b08ebee82d1e716340e63277e5d43399a415f9306ec5444b75dca96 WHIRLPOOL 3d1a4642c65e466e38f13f3aa79fd3597f2a9a7c7e9e7cfa3c039c831ccb8215ef60ffcb563829814bd1667a1c789679847e08234bcc36a823f7235974df38e9 +MISC ChangeLog 65647 SHA256 6e63d80d44826e6bdb0db79638826ac80cb52d3aa5298d60e05538cfe0eeb7bd SHA512 15a93b8621db1c865406d013e1587232141baa13023803aead10b442b0df9939270bcaa23dfac37da0275e046df277fe1639e8135de85da35e7a767d869b4e84 WHIRLPOOL eef5a2fab74da29aa451a11f17019b6f7f82d1ed5f77275edf6b705056d7e69e2c841e88d66bc8c19f3d11e5da34d268c2dc07a074147800c40e1e4cec541108 MISC metadata.xml 876 SHA256 dbd75c8e18ec8479718c0d802e6563535e9ffe5429727bea5b26133bb41abca2 SHA512 7a617c5f150445add695fda85610aae706070ca1368e250a4e3858c817e90322860174e436a60268d7ff66f33bc7672aa6d4cdb8b705e12851b25666eb51e13b WHIRLPOOL bf9ba7714a9f41789778c97c0387f5cb6be6e985f63953ab25f12bfad526ca48ef973f202cfd0d8a95dc8dd595d8b1a12483403ece3a5616e24f417e42b4c303 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlTOc+wACgkQC77qH+pIQ6QtKwEAtSKEM2eehvi+GW0P6Ulb7Ao1 -9yzs1u/50xu+V9Q0WrQA/iaxiBxY6rB2fYUzpKGIWK/0dngS6/UijYXRw1afngYu -=HfDs +iF4EAREIAAYFAlTRgv4ACgkQC77qH+pIQ6QAKQEAn3/6cJvl1PcsdbEt2f1pDj+e +zysZgLnB3E8Usj9qkp4A/iA7E402kjl2ls89n55LerC5p030s9Ki5X+t3gqLDu0a +=I+OY -----END PGP SIGNATURE----- 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(+)] -- 2.26.2