From d3bf991899cb4791a15dfab7d927be38bf1735c2 Mon Sep 17 00:00:00 2001
From: David Guglielmi <david.guglielmi@gmail.com>
Date: Wed, 8 May 2024 20:54:26 +0200
Subject: [PATCH] sys-boot/grub-efi-image: comsetic changes

---
 sys-boot/grub-efi-image/Manifest              |  5 ---
 .../grub-efi-image/grub-efi-image-0-r2.ebuild | 36 +++++++++----------
 sys-boot/grub-efi-image/metadata.xml          | 12 +++++++
 3 files changed, 29 insertions(+), 24 deletions(-)
 delete mode 100644 sys-boot/grub-efi-image/Manifest
 create mode 100644 sys-boot/grub-efi-image/metadata.xml

diff --git a/sys-boot/grub-efi-image/Manifest b/sys-boot/grub-efi-image/Manifest
deleted file mode 100644
index 91a0abd..0000000
--- a/sys-boot/grub-efi-image/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX grub-bootstrap.cfg 26 BLAKE2B 9acd7b63bca7b4ef14c9e676de6b827afecb7f1b4e92b23e36b6f1042f234bd9e5ca52b5a48363c66c2a935b77199b14b251356eceebd586b57894a7198aa9ab SHA512 ab7b22bfb260408aa695212a346d9e6a33f75584c23f2f3e611b74e4a211d9484bdf529894b79af7bb6bb2c30081edcda2802b03ac4dde646d3c9710c7903a22
-AUX grub-efi-modules 781 BLAKE2B ee58cdb8f4c3e605b9f8d497e8bba038df9fbeaa179da0940df87308902f3c48eb737667773c0a8a95ce46d3bf85e76dac8477aa7207506c6175d6021bd804a1 SHA512 3d82163af9bd84a6e4bd210122fd2608d40e1c09ed81639e45b15e45c140988de90116e48f15c9853515b21c1aae37a46b129631db86a2c90e93e9d9a63df180
-AUX grub-memdisk.cfg.in 210 BLAKE2B 8cfe27ae2a3a0ac2985346d084667ec0fd9e3f6bd4700067c1cfcd5c32e315575416c5c03c4b8a4a2499c23491beddf18b04240842bcb43b5f117afec9f16ba9 SHA512 12e253f257adaba922ebf58380356ed7161c0004b9a3068b5aea99d1489a52545c349dbf9ad3f9377275f8c70ff046ad862b4ebf90d5aa0af0fe6c5063037a04
-AUX sbat.csv.in 258 BLAKE2B 77503b5b144c9eae944458f56c79ebc67db6ee5d69d6ce2619cbd6e3f429da02541db3fa3dd53df99ce8003429396d6d4547dfe1aa7e6403c4d51147153e2a05 SHA512 2f2006873107170c9758f85aa23931a0bcb14589e04b290bca3cd599d23b962eeaa0186743ae94e52e34b7f2e994fd6c351faf52afd0f52190d19c4e0385a92c
-EBUILD grub-efi-image-0-r2.ebuild 2008 BLAKE2B 009060ac56517f5491c983eb662fce84195621f87c2df7f5d0d74b4f5b2c8ffdd152aba2e7ff8e92529be3d841750d9b6708b50b6c71424228eb4986b44a1a1d SHA512 978d3d6f7b461df62690e7532459a38b5db5c90c47e79926084081ee915519126c0b2e8999e7a938a546d4ae6d1df7f380654898f1b79aa208c83588cc62f3fd
diff --git a/sys-boot/grub-efi-image/grub-efi-image-0-r2.ebuild b/sys-boot/grub-efi-image/grub-efi-image-0-r2.ebuild
index 6b62d27..305d636 100644
--- a/sys-boot/grub-efi-image/grub-efi-image-0-r2.ebuild
+++ b/sys-boot/grub-efi-image/grub-efi-image-0-r2.ebuild
@@ -7,13 +7,14 @@ inherit mount-boot
 
 DESCRIPTION="Make GRUB EFI boot image"
 HOMEPAGE="https://www.gentoo.org/"
-SRC_URI=""
+
+S="${WORKDIR}"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 
-IUSE="+grub_platforms_efi-64 grub_platforms_efi-32 grub_font_size_24 grub_font_size_32"
+IUSE="+grub_platforms_efi-64 grub_platforms_efi-32 fontsize-24 fontsize-32"
 
 DEPEND="
 	sys-boot/grub:2=[fonts]
@@ -24,26 +25,24 @@ BDEPEND="
 	media-fonts/dejavu
 "
 
-GRUB_VERSION="2.12-r3"
+GRUB_VERSION="2.12-r4"
 EFI_VENDOR="gentoo"
 GRUB_FONT_SIZE="16"
 
-S="${WORKDIR}"
-
 src_prepare() {
 	# grub-probe --target=fs_uuid doesn't work here
-	BOOT_DEV="$(grub-probe --target=device ${ROOT}/boot)"
+	BOOT_DEV="$(grub-probe --target=device /boot)"
 	BOOT_PART_UUID="$(lsblk -o UUID -n ${BOOT_DEV})"
 
 	[[ -z $BOOT_PART_UUID ]] && die "Can't find /boot partition UUID"
 	sed -e 's#@GENTOO_GRUB_VERSION@#'${GRUB_VERSION}'#g' \
-		"${FILESDIR}/sbat.csv.in" > sbat.csv || die
+		"${FILESDIR}"/sbat.csv.in > sbat.csv || die
 
 	mkdir -p "${WORKDIR}/memdisk/fonts" || die
 	sed -e 's#@BOOT_PART_UUID@#'${BOOT_PART_UUID}'#g' \
 		"${FILESDIR}/grub-memdisk.cfg.in" > memdisk/grub.cfg || die
 
-	cp "${FILESDIR}/grub-bootstrap.cfg" "${WORKDIR}/"
+	cp "${FILESDIR}"/grub-bootstrap.cfg "${WORKDIR}"/
 
 	eapply_user
 }
@@ -62,32 +61,31 @@ src_compile() {
 		die "Unsupported platform"
 	fi
 
-	if use grub_font_size_24; then
+	if use fontsize-24; then
 		GRUB_FONT_SIZE="24"
-	elif use grub_font_size_32; then
+	elif use fontsize-32; then
 		GRUB_FONT_SIZE="32"
 	fi
 
 	grub-mkfont \
 		-s "${GRUB_FONT_SIZE}" \
-		-o "${WORKDIR}/memdisk/fonts/unicode.pf2" \
+		-o "${WORKDIR}"/memdisk/fonts/unicode.pf2 \
 		/usr/share/fonts/dejavu/DejaVuSansMono.ttf
 
-	tar -cf "${WORKDIR}/memdisk.tar" -C "${WORKDIR}/memdisk" .
-
+	tar -cf "${WORKDIR}"/memdisk.tar -C "${WORKDIR}"/memdisk .
 
 	grub-mkimage \
 		-O "${platform}" \
-		-o "${WORKDIR}/grub${efi_name}.efi" \
-		-c "${WORKDIR}/grub-bootstrap.cfg" \
+		-o "${WORKDIR}"/grub${efi_name}.efi \
+		-c "${WORKDIR}"/grub-bootstrap.cfg \
 		-d "/usr/lib/grub/${platform}" \
-		-m "${WORKDIR}/memdisk.tar" \
+		-m "${WORKDIR}"/memdisk.tar \
 		-p "/EFI/gentoo" \
-		--sbat "${WORKDIR}/sbat.csv" \
-		$(cat "${FILESDIR}/grub-efi-modules")
+		--sbat "${WORKDIR}"/sbat.csv \
+		$(cat "${FILESDIR}"/grub-efi-modules)
 }
 
 src_install() {
-	insinto /usr/lib/${PN}
+	insinto /usr/lib/"${PN}"
 	doins grub*.efi
 }
diff --git a/sys-boot/grub-efi-image/metadata.xml b/sys-boot/grub-efi-image/metadata.xml
new file mode 100644
index 0000000..8c232ff
--- /dev/null
+++ b/sys-boot/grub-efi-image/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>david.guglielmi@gmail.com</email>
+		<name>David GUGLIELMI</name>
+	</maintainer>
+	<use>
+		<flag name="fontsize-24">GRUB default font size 24px</flag>
+		<flag name="fontsize-32">GRUB default font size 32px</flag>
+	</use>
+</pkgmetadata>