From: Mike Gilbert Date: Thu, 5 Feb 2015 22:53:12 +0000 (+0000) Subject: Add 'fonts' use flag to toggle freetype DEPEND. Bug 538926. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5b6ede3c7b35866d511993f894d8b8fc6b3f6880;p=gentoo.git Add 'fonts' use flag to toggle freetype DEPEND. Bug 538926. Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x0BBEEA1FEA4843A4 --- diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index 148fe5cd68a8..e92b4e4344fe 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.344 2015/02/04 02:50:01 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.345 2015/02/05 22:53:10 floppym Exp $ + + 05 Feb 2015; Mike Gilbert grub-2.02_beta2-r7.ebuild, + grub-9999-r1.ebuild, metadata.xml: + Add 'fonts' use flag to toggle freetype DEPEND. Bug 538926. 04 Feb 2015; Mike Gilbert grub-2.02_beta2-r7.ebuild, grub-9999-r1.ebuild, metadata.xml: diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest index 4021ee990aa4..9c5d7608efb8 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 8456 SHA256 e2e819241db5980bfdee5479310a0e167460671f6d40a65eb24e11a1d9a290f4 SHA512 b67b31d7619ae8e93971208cb5a681466a97f6151e126cbf1a90eb3aafa232d12a8953d9708bb7a2d2fcbc8176212ca47b2d8c5b1811b72b46ecaec3afeb8c50 WHIRLPOOL 604aa208e135f919c540ee48df742ceeb6e89c5343ccc48eb38069712a25271497c0ad7310f8825e84280379915c1e1b0baef1c90ea0c36af0f32e026960b9e6 -EBUILD grub-9999-r1.ebuild 8162 SHA256 9baa5e9edfcb485887a711a7b43b5dde68c406669e04f232a49c92768232c81a SHA512 a4e81c9ebb8aed257b7a9580b0ded4fa6f0fb533289540f5d1579e21a3e7fcb38e095a0b16234a79f517f9754df859ea5771da933e5246684700c0792fb8446f WHIRLPOOL 4f8a0c86c6bc8ea64e5b942210cf8a194a7a45af44eca2b86bbe440404116de7345dbdb010990d975ec9d3c3332ca5409d7f70b8467f19e7046576a723a692d2 -MISC ChangeLog 65942 SHA256 09a67560faf27297ca37215c7492cf5d40d4a473256d9251090dd28e712b7246 SHA512 c31d2c48bb5a00912411b4a717b7375ba56e4462a3564c61b1e88b93643d1cfb00d5ac5a5b701788fdae715730db790e3620d5ffe7b905da93571cce4c0af540 WHIRLPOOL 28380d1fd475f8e4fc2851e73c624b58837298561d73cb90e984073cdb72f748933bb134a36387d98b35c2e6883e1e616090557c2b96aa12f5751addee8ae909 -MISC metadata.xml 946 SHA256 e3c1e064dd6a621f6512cbce2d8786b8e1a9939476954a9b6f35165139d58f42 SHA512 de36dfdad9b4bf74bb2cb7a4b1752c903849b57e6e52e969818a87d04f998907a1d0f6b2e768e9f77e452a3fd80f0e4d0d21c1ac38e8bca81913fbb5747cd2d8 WHIRLPOOL 1af137f337820a29e4a4afea956d8ae80790b91476a412bab83c704dd39f4b1026dcd7b0c4cabf79e4bfba0007ca16c743a53ce437269113393da1aa932af94c +EBUILD grub-2.02_beta2-r7.ebuild 8648 SHA256 a4bfde4696013460bcecb523126c0b75e54b8517fbe5569ffb799b24deab4833 SHA512 bd1fdbe857c5e5fc70f3fc24d25e9d3c245f8c73e224ffd9a3fd37020ef4d2850632807bbd9f3370d0b71cdc589daacac6cecb4e8b972725570627521735716e WHIRLPOOL f161952a0186e81b858688b53cf44767e4d478e42aea099fe2a22b6fcc89161c371d8377f1947f5cba3cce681f844c0d806522773d0ebe4757b65990c1f49add +EBUILD grub-9999-r1.ebuild 8354 SHA256 d4594b501cd90100af74fd1cdc5d6a8072fe462365b57aa06e12e7fd231d467b SHA512 34919351915f92547bc5dbe3d1369871320b5da156459fcb876d0ebd7e0db8d9da0ac804b7408a6f388c5d1182411cef55c90267376179284579ad7161172ff1 WHIRLPOOL 127d3cf038f4aed5bb5383286aa529fc360d85e9ffbe28574f9aaf6d962084ff5863868cb2dbe96d4536cbbef148f7db4ce9e651bc5342b7461df663f4af6f16 +MISC ChangeLog 66118 SHA256 d2281efc410a7c3936b220988266d82479c65426af9d6ff0a892f00ebc6432ed SHA512 8842f036dd74c761b850de56bf70367599470c34858b723ee3d5144f3a9a6e7434cd896f2e052c7b58cf96d450eb0ee3549eeeed62e18230c590f11f46d7d397 WHIRLPOOL 2bd7b590da212683b4bb12ef129eb3e554e78bdd6b82a890fa916f19e71452e9d77a15412fe0b02b686f604700906d739fe520fb3d6379aaada345912802f13f +MISC metadata.xml 1020 SHA256 271b762f981271257df9a0703446240d3140e81a278f073cc5818f4d4ab3be9f SHA512 1c00a7b40547bda12cea9379b1b91147e4d53050f985e1907110411d7355d2d968f3ec9672eaf29377209f84b50e6ef4a00fc3e57abe20d85778f1d83104b4f4 WHIRLPOOL 2f74e89f29e18819bb8f7345395bd3e63662eb475893c54c06dc9f7aaf755f6e203b4084bbb99da404992f2a81919d4aecb897af96319580dabf5ca168aa7668 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlTRiNsACgkQC77qH+pIQ6Qo5gD/fFmlH/WuCws9PCjs8myjaioM -Uw4kggePrm0AIfZ3nEcBAJu67egTvRiCh6u2jkid7sbDR0nN7fm0VMCwFwA0x/i0 -=YWae +iF4EAREIAAYFAlTT9FcACgkQC77qH+pIQ6RgTgEAvWViWblJmWAnEDiEVw21ubvC +XG93CvOiypGAPbx5OXwA/0K9rT0XEQoxu8zGK6gkZ+EPsKtaYcJnGdttVi7du3oE +=BDTz -----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 02b5b8cbedd9..40dd4622dee8 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.4 2015/02/04 02:50:01 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r7.ebuild,v 1.5 2015/02/05 22:53:10 floppym Exp $ EAPI=5 @@ -36,16 +36,16 @@ fi DEJAVU=dejavu-sans-ttf-2.34 UNIFONT=unifont-7.0.06 -SRC_URI+=" mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz +SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz ) themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )" DESCRIPTION="GNU GRUB boot loader" HOMEPAGE="http://www.gnu.org/software/grub/" # Includes licenses for dejavu and unifont -LICENSE="GPL-3 truetype? ( BitstreamVera GPL-2-with-font-exception )" +LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )" SLOT="2" -IUSE="debug device-mapper doc efiemu mount +multislot nls static sdl test +themes truetype libzfs" +IUSE="debug device-mapper doc efiemu +fonts mount +multislot nls static sdl test +themes truetype libzfs" GRUB_ALL_PLATFORMS=( # everywhere: @@ -61,6 +61,13 @@ GRUB_ALL_PLATFORMS=( ) IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}" +REQUIRED_USE=" + grub_platforms_coreboot? ( fonts ) + grub_platforms_qemu? ( fonts ) + grub_platforms_ieee1275? ( fonts ) + grub_platforms_loongson? ( fonts ) +" + # os-prober: Used on runtime to detect other OSes # xorriso (dev-libs/libisoburn): Used on runtime for mkrescue RDEPEND=" @@ -79,11 +86,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 + fonts? ( media-libs/freetype:2 ) grub_platforms_xen? ( app-emulation/xen-tools ) static? ( app-arch/xz-utils[static-libs(+)] @@ -97,7 +104,7 @@ DEPEND="${RDEPEND} dev-libs/libisoburn app-emulation/qemu ) - truetype? ( app-arch/unzip ) + themes? ( app-arch/unzip ) " RDEPEND+=" kernel_linux? ( @@ -177,7 +184,7 @@ src_prepare() { setup_fonts() { ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die - if use truetype; then + if use themes; then ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die fi } diff --git a/sys-boot/grub/grub-9999-r1.ebuild b/sys-boot/grub/grub-9999-r1.ebuild index e4f9a60e92d7..31c3b0a827d7 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.27 2015/02/04 02:50:01 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild,v 1.28 2015/02/05 22:53:10 floppym Exp $ EAPI=5 @@ -38,16 +38,16 @@ fi DEJAVU=dejavu-sans-ttf-2.34 UNIFONT=unifont-7.0.06 -SRC_URI+=" mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz +SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz ) themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )" DESCRIPTION="GNU GRUB boot loader" HOMEPAGE="http://www.gnu.org/software/grub/" # Includes licenses for dejavu and unifont -LICENSE="GPL-3 truetype? ( BitstreamVera GPL-2-with-font-exception )" +LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )" SLOT="2" -IUSE="debug device-mapper doc efiemu mount +multislot nls static sdl test +themes truetype libzfs" +IUSE="debug device-mapper doc efiemu +fonts mount +multislot nls static sdl test +themes truetype libzfs" GRUB_ALL_PLATFORMS=( # everywhere: @@ -63,6 +63,13 @@ GRUB_ALL_PLATFORMS=( ) IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}" +REQUIRED_USE=" + grub_platforms_coreboot? ( fonts ) + grub_platforms_qemu? ( fonts ) + grub_platforms_ieee1275? ( fonts ) + grub_platforms_loongson? ( fonts ) +" + # os-prober: Used on runtime to detect other OSes # xorriso (dev-libs/libisoburn): Used on runtime for mkrescue RDEPEND=" @@ -81,11 +88,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 + fonts? ( media-libs/freetype:2 ) grub_platforms_xen? ( app-emulation/xen-tools ) static? ( app-arch/xz-utils[static-libs(+)] @@ -99,7 +106,7 @@ DEPEND="${RDEPEND} dev-libs/libisoburn app-emulation/qemu ) - truetype? ( app-arch/unzip ) + themes? ( app-arch/unzip ) " RDEPEND+=" kernel_linux? ( @@ -177,7 +184,7 @@ src_prepare() { setup_fonts() { ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die - if use truetype; then + if use themes; then ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die fi } diff --git a/sys-boot/grub/metadata.xml b/sys-boot/grub/metadata.xml index bb2fbdbdd921..3c18317bc52d 100644 --- a/sys-boot/grub/metadata.xml +++ b/sys-boot/grub/metadata.xml @@ -16,6 +16,7 @@ Build and install the efiemu runtimes + Build and install fonts for the gfxterm module Build and install the grub-mount utility