[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/

[Mike Gilbert]

commit:     681309961f84916b14c7965ddcf7a8ca65af5a2c
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 27 18:08:12 2025 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Mar 27 18:39:29 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68130996

sys-boot/grub: switch to tarball for DejaVu font

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-boot/grub/Manifest         |  1 +
 sys-boot/grub/grub-9999.ebuild | 14 ++++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index a5e4971f3fec..553bc5923ab7 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,3 +1,4 @@
+DIST dejavu-fonts-ttf-2.37.tar.bz2 5429777 BLAKE2B 
d8614907887f20967fc7c75cb33b636a0eb5c682a076ccc7aef09f4ac243507afc005ef90d0b2aeee6a4a6a1ff3d5ce4fac0d1722a382525b3883ef53cdec26a
 SHA512 
bafa39321021097432777f0825d700190c23f917d754a4504722cd8946716c22c083836294dab7f3ae7cf20af63c4d0944f3423bf4aa25dbca562d1f30e00654
 DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B 
c8904f3cd5a49370a7dc10e456684c88aeae998a99090bf4d0a5baa4f36cc8fb8f70586cf6d610a5ffeee97261d28c80f55bbe9dcfc3ed796d5c2d60e79adb58
 SHA512 
ede5899daa1984c5aa8cacb1c850eb53f189dddef3d9bb78bf9774d8976b7c0d6eb0bcf86237cd7d11f5b36cf5b5058d42cd94d3bd76f2bd0931c7ceb1271fae
 DIST grub-2.12-bash-completion.patch.gz 3627 BLAKE2B 
6ba80fd4fb4b28ae2e5a2387133d815da126a4eaa4b5cb24b13f4ba5a2499ab4099d10ada366ed39f84be2c38774122f48e1a1894768c5bee29149528610d095
 SHA512 
a9ee6d2253ae48d7f90907a9e975a3a1d01346bc621d8b8cddf7cc815cd91e078f6c61392724d13556ee64f099fa15c94fcb88a49ff02d4a90ebd376252cea5c
 DIST grub-2.12.tar.xz 6675608 BLAKE2B 
a678f7fafb945d325c8cf47aa086f48357a8f6335b762f77038c30a3896b3b05491598d9931d5335841d224fffcbe4a9a43ca1479057c1f1ce52b8d2a952c431
 SHA512 
761c060a4c3da9c0e810b0ea967e3ebc66baa4ddd682a503ae3d30a83707626bccaf49359304a16b3a26fc4435fe6bea1ee90be910c84de3c2b5485a31a15be3

diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index c5816f955067..0cc833ac5a34 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -67,10 +67,13 @@ PATCHES=(
        "${FILESDIR}"/grub-2.06-test-words.patch
 )
 
-DEJAVU=dejavu-sans-ttf-2.37
+DEJAVU_VER=2.37
+DEJAVU=dejavu-fonts-ttf-${DEJAVU_VER}
 UNIFONT=unifont-16.0.02
-SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
-       themes? ( https://downloads.sourceforge.net/dejavu/${DEJAVU}.zip )"
+SRC_URI+="
+       fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
+       themes? ( 
https://downloads.sourceforge.net/project/dejavu/dejavu/${DEJAVU_VER}/${DEJAVU}.tar.bz2
 )
+"
 
 # Includes licenses for dejavu and unifont
 LICENSE="GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( 
CC-BY-SA-3.0 BitstreamVera )"
@@ -109,7 +112,6 @@ BDEPEND+="
                sys-fs/squashfs-tools
        )
        themes? (
-               app-arch/unzip
                media-libs/freetype:2
                virtual/pkgconfig
        )
@@ -231,11 +233,11 @@ grub_configure() {
        )
 
        if use fonts; then
-               ln -rs "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+               cp "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
        fi
 
        if use themes; then
-               ln -rs "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf 
|| die
+               cp "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || 
die
        fi
 
        local ECONF_SOURCE="${S}"