summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2019-03-21 11:55:11 -0400
committerMike Gilbert <floppym@gentoo.org>2019-03-21 11:55:11 -0400
commit4f3038ea9d242d281bf24b550f40682867cc4143 (patch)
treefc060af7feb73d0dc40cc68b6c204970cd95d34e /sys-boot
parentwww-client/vivaldi-snapshot: Old (diff)
downloadgentoo-4f3038ea9d242d281bf24b550f40682867cc4143.tar.gz
gentoo-4f3038ea9d242d281bf24b550f40682867cc4143.tar.bz2
gentoo-4f3038ea9d242d281bf24b550f40682867cc4143.zip
sys-boot/grub: fix unifont handling
Closes: https://bugs.gentoo.org/681134 Package-Manager: Portage-2.3.62, Repoman-2.3.12_p83 Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/grub/grub-9999.ebuild11
1 files changed, 7 insertions, 4 deletions
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 7ae9bb427d9..1a043112525 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -136,11 +136,12 @@ QA_MULTILIB_PATHS="usr/lib/grub/.*"
src_unpack() {
if [[ ${PV} == 9999 ]]; then
git-r3_src_unpack
- cd "${P}" || die
+ pushd "${P}" >/dev/null || die
local GNULIB_URI="https://git.savannah.gnu.org/git/gnulib.git"
local GNULIB_REVISION=$(source bootstrap.conf >/dev/null; echo "${GNULIB_REVISION}")
git-r3_fetch "${GNULIB_URI}" "${GNULIB_REVISION}"
git-r3_checkout "${GNULIB_URI}" gnulib
+ popd >/dev/null || die
fi
default
}
@@ -224,10 +225,12 @@ grub_configure() {
$(usex efiemu '' '--disable-efiemu')
)
- # Set up font symlinks
- mv "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+ if use fonts; then
+ ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+ fi
+
if use themes; then
- mv "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
+ ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
fi
local ECONF_SOURCE="${S}"