From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B0F1715827B for ; Tue, 26 Aug 2025 22:11:00 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 938DF34076D for ; Tue, 26 Aug 2025 22:11:00 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 88AB1110560; Tue, 26 Aug 2025 22:10:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 820B8110560 for ; Tue, 26 Aug 2025 22:10:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1D784340D31 for ; Tue, 26 Aug 2025 22:10:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 88B1B3352 for ; Tue, 26 Aug 2025 22:10:57 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1756245791.2572fa3e3c83f81355d0365c7d4d62a0c0577221.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/chromium-2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 2572fa3e3c83f81355d0365c7d4d62a0c0577221 X-VCS-Branch: master Date: Tue, 26 Aug 2025 22:10:57 +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: c6841004-d211-4dd5-b001-b542e95f1dca X-Archives-Hash: 0054a5d0b9623a69002ac5379ea40ca7 commit: 2572fa3e3c83f81355d0365c7d4d62a0c0577221 Author: James Le Cuirot gentoo org> AuthorDate: Sat Aug 23 20:05:45 2025 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Tue Aug 26 22:03:11 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2572fa3e chromium-2.eclass: Handle non-standard _ suffixes in locale .pak files These were recently added by Chromium for gender-based translations. _ is not a valid language tag character, so we strip this suffix when checking the USE flag, thereby grouping such files with their non-suffixed counterparts. Signed-off-by: James Le Cuirot gentoo.org> eclass/chromium-2.eclass | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/eclass/chromium-2.eclass b/eclass/chromium-2.eclass index e8f471e2178f..f1f5b3a7b35a 100644 --- a/eclass/chromium-2.eclass +++ b/eclass/chromium-2.eclass @@ -78,7 +78,7 @@ fi # not selected via the L10N variable. # Also performs QA checks to ensure CHROMIUM_LANGS has been set correctly. chromium_remove_language_paks() { - local lang pak + local lang pak suffixed # Look for missing pak files. for lang in ${CHROMIUM_LANGS}; do @@ -93,8 +93,12 @@ chromium_remove_language_paks() { # Look for extra pak files. # Remove pak files that the user does not want. + # Chromium includes pak files with non-standard _ suffixes. _ is not a valid + # language tag character, so we strip this suffix when checking the USE + # flag, thereby grouping such files with their non-suffixed counterparts. for pak in *.pak; do - lang=${pak%.pak} + suffixed=${pak%.pak} + lang=${suffixed%%_*} if [[ ${lang} == en-US ]]; then continue