gentoo auto-resync : 11:07:2023 - 16:30:06

3 files changed, 34 insertions, 1 deletions

diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index a870ef6d1166..d583d990e76a 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -6,6 +6,7 @@ AUX grub-2.06-grub-mkconfig-restore-umask.patch 1377 BLAKE2B ea5369b79a1ec0dbb4e
 AUX grub-2.06-locale.patch 2387 BLAKE2B 76b8751c55b8689ffa934cd0175ef5153abebfa4fdae63dee0247d1dd0dff920433435764b0ef04357a53687632d907e302a086382bab20c0db5758580698732 SHA512 d54d9c144c27fa4d6964bdc10d14b7d7cb6f3f3d2aa65c8213285a9a9cbab50e33955fc09d7d10cad6d3ec6a93ad834fd24d294875d44e51106ccaf3b916b37f
 AUX grub-2.06-riscv.patch 2205 BLAKE2B d324762742b57e18d1aa3ad82010b26ac9d50818bcd7643e73f40971517f297faff7d499d2a7d1896aa4f9cf76ba72f04a77ae904c480486bfaf2858b318ea98 SHA512 6d92d0608ed902e5f093bf3cbb96b60ab3b9cfa36d12cc1a6e86dcc649a57f9c98e428c55495c14d954f3954614133b00c42609154d131bc6623bb355cba86a6
 AUX grub-2.06-test-words.patch 2553 BLAKE2B 21d6167945b461be7cc73198451ae0dc15ce0dfe2a301342f1a3bb75d6fcb5d73da9997fb8a93f36dffb43a351f056a1a4db9eed3147b0f3e77c65034b805c64 SHA512 627422377bdad97d0197f178814d6616a0f7ec07357182b00166a455d38ba0c5a60185c5febf4dfb7a11b35f26c7af607508cb5f418acdb7290517240fbd99e4
+AUX grub-2.12_rc1-util-grub.d-25_bli.in-fix-shebang-on-unmerged-usr.patch 905 BLAKE2B c6a2c00eba44c5753dbcd10bb2929bd6e567cfcb04a33b825c3207209341dab561dcbac154239b375a839942a8a08a06dd1079cbea0627d66209240b708de04f SHA512 4d03f054d1d1fd01a31caa6a65dfe7d90d75c8b695caf26fbd858ec7fd4ae2aa6e645ee3bb28d4ebeaa23e35aa961d8d01dccfc45404c0053fd3e3eb7262ccf0
 AUX grub.default-4 2644 BLAKE2B a954461f46df2ea1be2b6a6ae0ba3c023bd72f75d1998ee3f124eadd4bdc05de86fba77b3f693cb567e85daa1cdf39aa1f9f75ec3ad4b0e67cf93608c73e3721 SHA512 4d9004f9d93ca8cf0918c587df29a423d4122c86bc6ae6b08438e094e5276c5a21d30688c99f4b52ce40df78739a72dbddbb2bcefbcdd582374a62f565d057bf
 DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B c8904f3cd5a49370a7dc10e456684c88aeae998a99090bf4d0a5baa4f36cc8fb8f70586cf6d610a5ffeee97261d28c80f55bbe9dcfc3ed796d5c2d60e79adb58 SHA512 ede5899daa1984c5aa8cacb1c850eb53f189dddef3d9bb78bf9774d8976b7c0d6eb0bcf86237cd7d11f5b36cf5b5058d42cd94d3bd76f2bd0931c7ceb1271fae
 DIST grub-2.06-backports-r2.tar.xz 40416 BLAKE2B d9b4a8274a24aa35023eef7450bc4311045d0872250b1d11b1714b9daa32f7862fe1444b5b86db8b885a9f7b3af2459a5b2f87f0beaf4326a982fd96ec51d602 SHA512 99cf40b3d3d10cf6ba928ccc571c3a8baab217f650267fa7de4ba4ce807a895ff9414156647cc4dcb34bfbe48747a0c486bf60fee1c188a2dc89f26c2db3840f
@@ -14,6 +15,6 @@ DIST grub-2.12~rc1.tar.xz 6589460 BLAKE2B edfad62a01970026ca4ad088056da6225ef131
 DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B 97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14 SHA512 b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
 DIST unifont-15.0.06.pcf.gz 1358322 BLAKE2B 81811e3de390ca35d1a2dc1f1dee73464e97f44907ba522c218ba9c5e39ca3c9d767552780a257a97c156eb623c17786d9c0d2b67786d61df5ca33a1e10db7ca SHA512 0a28a406629c604f5cbf51f501528239a7ed50d19f93ea505bc5bdc72639e4b926b03f4b8782a5733041f7cdb4aebb9948ac7cfd5a8ad9a0fe309944e595517b
 EBUILD grub-2.06-r7.ebuild 8678 BLAKE2B 92cad67d1751e45d31315c9952c0e79d9287344d03fd35d3e35e954c08ddf5a3e007a97a10471d6ec755b1696d353b55952d53309dbf705b0571969d877c9362 SHA512 021d34fc8e8aca25f729dd11100f530a3a2c845633f9deba48ed0bcdacbdce8ff89e246eba82dd077b9f90f5beb203167f5afd02aa27bc52b64c12630b5ede9a
-EBUILD grub-2.12_rc1.ebuild 8351 BLAKE2B 12744f5cf47262945370ce05ebac58bf6437189d4a89e336f13c73764503a0b63ada9f5f220c1aca40d257c76a21e38cb17ce7ce618eb46da18779a82d42016c SHA512 598bf54bbd72a6029a5f1f909b83a6a64d326532861c37f39aaf3cb2fcba373ac3c56afbbbac1dc835d0c92fada1adf7b65e17a3aa90098cd9a96db20d9577a5
+EBUILD grub-2.12_rc1-r1.ebuild 8436 BLAKE2B 32f7b3fdb45120af9627e1d614bb58e8fdb2c09442f23a71b43f18ce7b00dabea264323409e301faac071a67bdeb631baaa816400342f5ab93074636d4de6d8e SHA512 761a6577960f4e3fd4e086af6a9595e33e6f71499e769d0e2790bfa866ea8e33e48944e3bb7e91e1a2a42a9572a3c8aee94e29a71150f97a3dd129d9dc3b1111
 EBUILD grub-9999.ebuild 8350 BLAKE2B a837dcfb5ec8bbc0fa99ee5e7eaf5aeb270f923b45d6f7fea8f5d6de57f632edef949107fad12e077004f9a95bf2d8e968c9c4658d9c10c53168dccd970a05e3 SHA512 3d7ebdca907c937c7b638345dcbb13c408ff3dbf945b3b3685ac461de1b54e3b92db737506d68a3f7808d3aa4885940dddba8adca2a9063a84349b033bb1d6ef
 MISC metadata.xml 986 BLAKE2B 7c03fac1bf235c1d82e435926c5a9079a21eb16e9937c0ac4e6297bc2f129bc9022efa11c099df07fd9e3b6c47a13246e25ae1c4cc390878ead82394c9b9ed11 SHA512 eb62f4b746c87bf2756669d57e76e60f24cea493948b19429a45e52d02fc1a501b4465ba52940757409258f7ad0ceef0e0f473aeb80cbd9b693b866ae015f13c
diff --git a/sys-boot/grub/files/grub-2.12_rc1-util-grub.d-25_bli.in-fix-shebang-on-unmerged-usr.patch b/sys-boot/grub/files/grub-2.12_rc1-util-grub.d-25_bli.in-fix-shebang-on-unmerged-usr.patch
new file mode 100644
index 000000000000..6c5096d35e70
--- /dev/null
+++ b/sys-boot/grub/files/grub-2.12_rc1-util-grub.d-25_bli.in-fix-shebang-on-unmerged-usr.patch
@@ -0,0 +1,31 @@
+From f827aac60d760a026db642b9d5c1ecbf587cfefc Mon Sep 17 00:00:00 2001
+From: Oskari Pirhonen <xxc3ncoredxx@gmail.com>
+Date: Mon, 10 Jul 2023 23:55:43 -0500
+Subject: [PATCH] util/grub.d/25_bli.in: fix shebang on unmerged-usr
+
+On an unmerged-usr system, grub-mkconfig errors out with the following
+error due to /usr/bin/sh not existing:
+
+/usr/sbin/grub-mkconfig: /etc/grub.d/25_bli: /usr/bin/sh: bad interpreter: No such file or directory
+
+Use a /bin/sh shebang to fix the error as well as match the other
+existing files.
+
+Signed-off-by: Oskari Pirhonen <xxc3ncoredxx@gmail.com>
+---
+ util/grub.d/25_bli.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util/grub.d/25_bli.in b/util/grub.d/25_bli.in
+index 6e4538716..26e27a019 100644
+--- a/util/grub.d/25_bli.in
++++ b/util/grub.d/25_bli.in
+@@ -1,4 +1,4 @@
+-#!/usr/bin/sh
++#! /bin/sh
+ set -e
+ 
+ # grub-mkconfig helper script.
+-- 
+2.41.0
+
diff --git a/sys-boot/grub/grub-2.12_rc1.ebuild b/sys-boot/grub/grub-2.12_rc1-r1.ebuild
index 96f3d98c6f01..ba4eb3b5a34b 100644
--- a/sys-boot/grub/grub-2.12_rc1.ebuild
+++ b/sys-boot/grub/grub-2.12_rc1-r1.ebuild
@@ -54,6 +54,7 @@ PATCHES=(
 	"${FILESDIR}"/gfxpayload.patch
 	"${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
 	"${FILESDIR}"/grub-2.06-test-words.patch
+	"${FILESDIR}"/grub-2.12_rc1-util-grub.d-25_bli.in-fix-shebang-on-unmerged-usr.patch
 )
 
 DEJAVU=dejavu-sans-ttf-2.37