From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AF08B138334 for ; Thu, 21 Mar 2019 15:55:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 70D70E0999; Thu, 21 Mar 2019 15:55:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4E6FBE0999 for ; Thu, 21 Mar 2019 15:55:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D60C8335CDE for ; Thu, 21 Mar 2019 15:55:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 29242266 for ; Thu, 21 Mar 2019 15:55:38 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1553183711.4f3038ea9d242d281bf24b550f40682867cc4143.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-boot/grub/grub-9999.ebuild X-VCS-Directories: sys-boot/grub/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 4f3038ea9d242d281bf24b550f40682867cc4143 X-VCS-Branch: master Date: Thu, 21 Mar 2019 15:55:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7f0c9794-4abe-4390-80c4-f6a84d5106aa X-Archives-Hash: a33dff7e6895c34def72a8a09a5ed51d commit: 4f3038ea9d242d281bf24b550f40682867cc4143 Author: Mike Gilbert gentoo org> AuthorDate: Thu Mar 21 15:55:11 2019 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Thu Mar 21 15:55:11 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f3038ea 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 gentoo.org> sys-boot/grub/grub-9999.ebuild | 11 +++++++---- 1 file 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}"