floppym 14/09/16 18:07:47
Modified: grub-9999-r1.ebuild grub-2.02_beta2-r2.ebuild
ChangeLog
Log:
Always download/symlink unifont, bug 522956.
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key
0BBEEA1FEA4843A4)
Revision Changes Path
1.20 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.20&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild?rev=1.20&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild?r1=1.19&r2=1.20
Index: grub-9999-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- grub-9999-r1.ebuild 10 Sep 2014 01:20:36 -0000 1.19
+++ grub-9999-r1.ebuild 16 Sep 2014 18:07:47 -0000 1.20
@@ -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.19
2014/09/10 01:20:36 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999-r1.ebuild,v 1.20
2014/09/16 18:07:47 floppym Exp $
EAPI=5
@@ -38,10 +38,8 @@
DEJAVU=dejavu-sans-ttf-2.34
UNIFONT=unifont-7.0.01
-SRC_URI+=" truetype? (
- mirror://sourceforge/dejavu/${DEJAVU}.zip
- mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz
-)"
+SRC_URI+=" mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz
+ truetype? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
DESCRIPTION="GNU GRUB boot loader"
HOMEPAGE="http://www.gnu.org/software/grub/";
@@ -179,8 +177,10 @@
}
setup_fonts() {
- ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+ if use truetype; then
+ ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf
|| die
+ fi
}
grub_configure() {
@@ -227,10 +227,8 @@
myeconfargs+=( --program-transform-name="s,grub,grub2," )
fi
- if use truetype; then
- mkdir -p "${BUILD_DIR}" || die
- run_in_build_dir setup_fonts
- fi
+ mkdir -p "${BUILD_DIR}" || die
+ run_in_build_dir setup_fonts
autotools-utils_src_configure
}
1.2 sys-boot/grub/grub-2.02_beta2-r2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r2.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r2.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r2.ebuild?r1=1.1&r2=1.2
Index: grub-2.02_beta2-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grub-2.02_beta2-r2.ebuild 10 Sep 2014 20:50:40 -0000 1.1
+++ grub-2.02_beta2-r2.ebuild 16 Sep 2014 18:07:47 -0000 1.2
@@ -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-r2.ebuild,v
1.1 2014/09/10 20:50:40 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.02_beta2-r2.ebuild,v
1.2 2014/09/16 18:07:47 floppym Exp $
EAPI=5
@@ -36,10 +36,8 @@
DEJAVU=dejavu-sans-ttf-2.34
UNIFONT=unifont-7.0.01
-SRC_URI+=" truetype? (
- mirror://sourceforge/dejavu/${DEJAVU}.zip
- mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz
-)"
+SRC_URI+=" mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz
+ truetype? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
DESCRIPTION="GNU GRUB boot loader"
HOMEPAGE="http://www.gnu.org/software/grub/";
@@ -182,8 +180,10 @@
}
setup_fonts() {
- ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+ if use truetype; then
+ ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf
|| die
+ fi
}
grub_configure() {
@@ -230,10 +230,8 @@
myeconfargs+=( --program-transform-name="s,grub,grub2," )
fi
- if use truetype; then
- mkdir -p "${BUILD_DIR}" || die
- run_in_build_dir setup_fonts
- fi
+ mkdir -p "${BUILD_DIR}" || die
+ run_in_build_dir setup_fonts
autotools-utils_src_configure
}
1.318 sys-boot/grub/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.318&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.318&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.317&r2=1.318
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -r1.317 -r1.318
--- ChangeLog 10 Sep 2014 20:50:40 -0000 1.317
+++ ChangeLog 16 Sep 2014 18:07:47 -0000 1.318
@@ -1,6 +1,10 @@
# 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.317 2014/09/10
20:50:40 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.318 2014/09/16
18:07:47 floppym Exp $
+
+ 16 Sep 2014; Mike Gilbert <[email protected]> grub-2.02_beta2-r2.ebuild,
+ grub-9999-r1.ebuild:
+ Always download/symlink unifont, bug 522956.
*grub-2.02_beta2-r2 (10 Sep 2014)
