gentoo auto-resync : 10:07:2023 - 04:26:23

4 files changed, 74 insertions, 2 deletions

diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 06be04f6ab4e..ee58fadc789d 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -3,6 +3,7 @@ AUX grub-2.02_beta2-KERNEL_GLOBS.patch 2355 BLAKE2B c120f06d3597a2ff9566778afd69
 AUX grub-2.06-fs-ext2-ignore-checksum-seed.patch 2744 BLAKE2B b80d0a513a3bfc3f245308775b358e508595be496e0472faa91155fd03ab08f7da2d9dc3fb5cb393f4393fd1f0fdb198b12cc7f87cc63299db77208c69c36ba3 SHA512 7f74055f95ac89e3e2110a83329169e3e3cf6aab3dad5c13c45cc2d9b942fb7e541a09dcbf3f1cc3736c9d439b59243d128a4a10c07fc18874bc583592f68bf5
 AUX grub-2.06-gentpl.py-Remove-.interp-section-from-.img-files.patch 1321 BLAKE2B f2c4ca271d4b5eb4b318bc084eb7d9de1703b99466e7be3e892f96757d62a6a929d02e580277429f0896d5a33b9fea906b786fb65df257970745656f15549706 SHA512 d6251a38e7a658640db8c783bfee36193d484ccc7516c828672f6a3f6903e9c0dcdf9946045fe7a7b60b06275d1b06dce49f7eb85ce6f696f99deface1a6981e
 AUX grub-2.06-grub-mkconfig-restore-umask.patch 1377 BLAKE2B ea5369b79a1ec0dbb4e212749a406aa361a5f12baf38737e273b19fb94eba78d7734bd532d91f40889f0cc7f0573d1a247baa548b6ac1963961181a85ff928ce SHA512 e899e6f0575e35b747aae6d14140dcecb453485abf0f7d53649fe35301313d7de16a350301a53e476d4b18ad1909ed4d4ce26cbd986728154137c970c7ce3bca
+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.default-4 2644 BLAKE2B a954461f46df2ea1be2b6a6ae0ba3c023bd72f75d1998ee3f124eadd4bdc05de86fba77b3f693cb567e85daa1cdf39aa1f9f75ec3ad4b0e67cf93608c73e3721 SHA512 4d9004f9d93ca8cf0918c587df29a423d4122c86bc6ae6b08438e094e5276c5a21d30688c99f4b52ce40df78739a72dbddbb2bcefbcdd582374a62f565d057bf
@@ -10,6 +11,6 @@ DIST dejavu-sans-ttf-2.37.zip 417746 BLAKE2B c8904f3cd5a49370a7dc10e456684c88aea
 DIST grub-2.06-backports-r2.tar.xz 40416 BLAKE2B d9b4a8274a24aa35023eef7450bc4311045d0872250b1d11b1714b9daa32f7862fe1444b5b86db8b885a9f7b3af2459a5b2f87f0beaf4326a982fd96ec51d602 SHA512 99cf40b3d3d10cf6ba928ccc571c3a8baab217f650267fa7de4ba4ce807a895ff9414156647cc4dcb34bfbe48747a0c486bf60fee1c188a2dc89f26c2db3840f
 DIST grub-2.06.tar.xz 6581924 BLAKE2B 2a40b9b03d7bb3b9e7b1309ab274d686f01b3c42e7035ebc6e5a0e59a59c3b7362ba518341664b314cb0dbc8222bb10ea05ce09f08ce9d58a293207cb909e417 SHA512 4f11c648f3078567e53fc0c74d5026fdc6da4be27d188975e79d9a4df817ade0fe5ad2ddd694238a07edc45adfa02943d83c57767dd51548102b375e529e8efe
 DIST unifont-12.1.02.pcf.gz 1335424 BLAKE2B 97080312468e3f3c8aa6f49cef08f5622641e8c9c035f3ede1e09d8d98de4e78d3b23c8aba2e8070eb46cbebd2d55e8568e467d7f15f35aa8fc8db792b7e5f14 SHA512 b280b2db7cf5f480b0668c331130dede2c0cc87d5e02e44566b77787113d0f6604d0105522858288f2ac6b8e77df7a2d9878725013a6c778dc5bfb183156e2f0
-EBUILD grub-2.06-r6.ebuild 8587 BLAKE2B 6790ce3e8aafbc916413686111cde7793a5ea505523441d2c733350f9d9a16e83a7301cd9562edd47f824aa68ae077a8c6c4d81717d0f0572101246e68e0c8ac SHA512 55a95550388a6a35b8fee29a8aeea6437cf0db03f388dc95f2492daefe836081ef1d79b1edb551a1abe451af3a46f179939b3809b4f3b8dbe8911578fab2bf41
-EBUILD grub-9999.ebuild 8214 BLAKE2B c18f63fe95e240f0f47059454099caf9beb2fc66a90466f0f9a3c03e63624209e4d7829691ff8a23884e8c1d56c63894b99741d9479487ea4641681e718c173f SHA512 cca33e759c84bb775c2fd91d634c99ba49872ea85449e4d949d736747f697edbd1253a40badc0842dda10c0c4b5ef315ffaab05fcdce47a28f72db11f594732c
+EBUILD grub-2.06-r7.ebuild 8678 BLAKE2B 92cad67d1751e45d31315c9952c0e79d9287344d03fd35d3e35e954c08ddf5a3e007a97a10471d6ec755b1696d353b55952d53309dbf705b0571969d877c9362 SHA512 021d34fc8e8aca25f729dd11100f530a3a2c845633f9deba48ed0bcdacbdce8ff89e246eba82dd077b9f90f5beb203167f5afd02aa27bc52b64c12630b5ede9a
+EBUILD grub-9999.ebuild 8267 BLAKE2B 076e96240bc34ef50cfd249f5d46eb6256669d4d51972b154e6c4c379127e891860551392bc4658d43197bcddcba995f62690b2c0af652bbf9ffcae51d66d10b SHA512 d0e17a95f3cd3c41e72fc5d680e7d0bf01cf62e6a39b716f5284a6db2ff8c2edf0773cd80a3d4ce369bbc9da7d18513fcf34d4752d7e4ad73e11162169a86aab
 MISC metadata.xml 986 BLAKE2B 7c03fac1bf235c1d82e435926c5a9079a21eb16e9937c0ac4e6297bc2f129bc9022efa11c099df07fd9e3b6c47a13246e25ae1c4cc390878ead82394c9b9ed11 SHA512 eb62f4b746c87bf2756669d57e76e60f24cea493948b19429a45e52d02fc1a501b4465ba52940757409258f7ad0ceef0e0f473aeb80cbd9b693b866ae015f13c
diff --git a/sys-boot/grub/files/grub-2.06-locale.patch b/sys-boot/grub/files/grub-2.06-locale.patch
new file mode 100644
index 000000000000..14706cbca3a2
--- /dev/null
+++ b/sys-boot/grub/files/grub-2.06-locale.patch
@@ -0,0 +1,68 @@
+From 5983c2c6adf1c1bbb3ecd751253d1e898bdfd8a3 Mon Sep 17 00:00:00 2001
+From: Michael Chang <mchang@suse.com>
+Date: Tue, 26 Oct 2021 15:11:00 +0800
+Subject: templates: Filter out POSIX locale for translation
+
+The POSIX locale is default or native operating system's locale
+identical to the C locale, so no translation to human speaking languages
+are provided. For this reason we should filter out LANG=POSIX as well as
+LANG=C upon generating grub.cfg to avoid looking up for it's gettext's
+message catalogs that will consequently result in an unpleasant message:
+
+  error: file `/boot/grub/locale/POSIX.gmo' not found
+
+Signed-off-by: Michael Chang <mchang@suse.com>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ util/grub.d/00_header.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
+index 93a9023..f74c2a4 100644
+--- a/util/grub.d/00_header.in
++++ b/util/grub.d/00_header.in
+@@ -191,7 +191,7 @@ EOF
+ EOF
+ 
+ # Gettext variables and module
+-if [ "x${LANG}" != "xC" ] &&  [ "x${LANG}" != "x" ]; then
++if [ "x${LANG}" != "xC" ] && [ "x${LANG}" != "xPOSIX" ] && [ "x${LANG}" != "x" ]; then
+   cat << EOF
+   set locale_dir=\$prefix/locale
+   set lang=${grub_lang}
+-- 
+cgit v1.1
+
+From f42266a8a2a4215e4ffe419b8092bdf9ced33e8e Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail@eworm.de>
+Date: Mon, 19 Sep 2022 15:31:28 +0200
+Subject: templates: Filter C.UTF-8 locale for translation
+
+In addition to C locale there is also C.UTF-8 locale now. Filter that as
+well, by using ${grub_lang}, which contains a stripped value.
+This fixes the following message and resulting boot failure:
+
+    error: file `/boot/grub/locale/C.gmo' not found.
+
+Signed-off-by: Christian Hesse <mail@eworm.de>
+Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
+---
+ util/grub.d/00_header.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
+index f74c2a4..6a316a5 100644
+--- a/util/grub.d/00_header.in
++++ b/util/grub.d/00_header.in
+@@ -191,7 +191,7 @@ EOF
+ EOF
+ 
+ # Gettext variables and module
+-if [ "x${LANG}" != "xC" ] && [ "x${LANG}" != "xPOSIX" ] && [ "x${LANG}" != "x" ]; then
++if [ "x${grub_lang}" != "xC" ] && [ "x${LANG}" != "xPOSIX" ] && [ "x${LANG}" != "x" ]; then
+   cat << EOF
+   set locale_dir=\$prefix/locale
+   set lang=${grub_lang}
+-- 
+cgit v1.1
+
diff --git a/sys-boot/grub/grub-2.06-r6.ebuild b/sys-boot/grub/grub-2.06-r7.ebuild
index 707acec900be..3a2f6087bced 100644
--- a/sys-boot/grub/grub-2.06-r6.ebuild
+++ b/sys-boot/grub/grub-2.06-r7.ebuild
@@ -63,6 +63,7 @@ PATCHES=(
 	"${FILESDIR}"/grub-2.06-gentpl.py-Remove-.interp-section-from-.img-files.patch
 	"${FILESDIR}"/grub-2.06-fs-ext2-ignore-checksum-seed.patch
 	"${FILESDIR}"/grub-2.06-riscv.patch
+	"${FILESDIR}"/grub-2.06-locale.patch
 )
 
 DEJAVU=dejavu-sans-ttf-2.37
@@ -315,6 +316,7 @@ pkg_postinst() {
 			if ver_test -gt ${v}; then
 				ewarn
 				ewarn "Re-run grub-install to update installed boot code!"
+				ewarn "Re-run grub-mkconfig to update grub.cfg!"
 				ewarn
 				break
 			fi
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index 359da219ea62..e10ab779e8e6 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -306,6 +306,7 @@ pkg_postinst() {
 			if ver_test -gt ${v}; then
 				ewarn
 				ewarn "Re-run grub-install to update installed boot code!"
+				ewarn "Re-run grub-mkconfig to update grub.cfg!"
 				ewarn
 				break
 			fi