floppym 15/02/05 22:53:10
Modified: metadata.xml grub-9999-r1.ebuild
grub-2.02_beta2-r7.ebuild ChangeLog
Log:
Add 'fonts' use flag to toggle freetype DEPEND. Bug 538926.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
0BBEEA1FEA4843A4)
Revision Changes Path
1.21 sys-boot/grub/metadata.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/metadata.xml?rev=1.21&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/metadata.xml?rev=1.21&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/metadata.xml?r1=1.20&r2=1.21
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/metadata.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- metadata.xml 4 Feb 2015 02:50:01 -0000 1.20
+++ metadata.xml 5 Feb 2015 22:53:10 -0000 1.21
@@ -16,6 +16,7 @@
<flag name="efiemu">
Build and install the efiemu runtimes
</flag>
+ <flag name="fonts">Build and install fonts for the gfxterm module</flag>
<flag name="mount">
Build and install the grub-mount utility
</flag>
1.28 sys-boot/grub/grub-9999-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild?rev=1.28&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild?rev=1.28&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild?r1=1.27&r2=1.28
Index: grub-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- grub-9999-r1.ebuild 4 Feb 2015 02:50:01 -0000 1.27
+++ grub-9999-r1.ebuild 5 Feb 2015 22:53:10 -0000 1.28
@@ -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 @@
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 @@
)
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 @@
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 @@
dev-libs/libisoburn
app-emulation/qemu
)
- truetype? ( app-arch/unzip )
+ themes? ( app-arch/unzip )
"
RDEPEND+="
kernel_linux? (
@@ -177,7 +184,7 @@
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
}
1.5 sys-boot/grub/grub-2.02_beta2-r7.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r7.ebuild?rev=1.5&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r7.ebuild?rev=1.5&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r7.ebuild?r1=1.4&r2=1.5
Index: grub-2.02_beta2-r7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r7.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- grub-2.02_beta2-r7.ebuild 4 Feb 2015 02:50:01 -0000 1.4
+++ grub-2.02_beta2-r7.ebuild 5 Feb 2015 22:53:10 -0000 1.5
@@ -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 @@
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 @@
)
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 @@
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 @@
dev-libs/libisoburn
app-emulation/qemu
)
- truetype? ( app-arch/unzip )
+ themes? ( app-arch/unzip )
"
RDEPEND+="
kernel_linux? (
@@ -177,7 +184,7 @@
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
}
1.345 sys-boot/grub/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.345&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.345&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.344&r2=1.345
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -r1.344 -r1.345
--- ChangeLog 4 Feb 2015 02:50:01 -0000 1.344
+++ ChangeLog 5 Feb 2015 22:53:10 -0000 1.345
@@ -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 <[email protected]> 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 <[email protected]> grub-2.02_beta2-r7.ebuild,
grub-9999-r1.ebuild, metadata.xml:
