From: Mike Gilbert <floppym@gentoo.org>
Date: Thu, 21 Mar 2019 15:55:11 +0000 (-0400)
Subject: sys-boot/grub: fix unifont handling
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4f3038ea9d242d281bf24b550f40682867cc4143;p=gentoo.git

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>
---

diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 7ae9bb427d99..1a0431125250 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}"