From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8DDB615838C for ; Sun, 21 Jan 2024 00:45:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C5F67E29B1; Sun, 21 Jan 2024 00:44:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 77BB0E29B1 for ; Sun, 21 Jan 2024 00:44: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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A09C434325B for ; Sun, 21 Jan 2024 00:44:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0B4EB97B for ; Sun, 21 Jan 2024 00:44:57 +0000 (UTC) From: "Maciej Barć" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Maciej Barć" Message-ID: <1705797893.0c8b5b9879551e757487e140fd6d4bd7fb13daec.xgqt@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/pwsh/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-shells/pwsh/pwsh-7.3.9.ebuild app-shells/pwsh/pwsh-7.4.0.ebuild X-VCS-Directories: app-shells/pwsh/ X-VCS-Committer: xgqt X-VCS-Committer-Name: Maciej Barć X-VCS-Revision: 0c8b5b9879551e757487e140fd6d4bd7fb13daec X-VCS-Branch: master Date: Sun, 21 Jan 2024 00:44: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: f27d639f-89a4-46e4-8c92-723a9754438a X-Archives-Hash: bf4fa060615c6e66ee2368b65d434297 commit: 0c8b5b9879551e757487e140fd6d4bd7fb13daec Author: Maciej Barć gentoo org> AuthorDate: Sun Jan 21 00:42:33 2024 +0000 Commit: Maciej Barć gentoo org> CommitDate: Sun Jan 21 00:44:53 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c8b5b98 app-shells/pwsh: just export desired locale on musl Closes: https://bugs.gentoo.org/922534 Signed-off-by: Maciej Barć gentoo.org> app-shells/pwsh/pwsh-7.3.9.ebuild | 24 +++++++++++++++++++++++- app-shells/pwsh/pwsh-7.4.0.ebuild | 22 +++++++++++++--------- 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/app-shells/pwsh/pwsh-7.3.9.ebuild b/app-shells/pwsh/pwsh-7.3.9.ebuild index ca71f9702880..b4c0acc62c02 100644 --- a/app-shells/pwsh/pwsh-7.3.9.ebuild +++ b/app-shells/pwsh/pwsh-7.3.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # NOTICE: Before packaging we have to run "ResGen" and "GetDependencies". @@ -332,6 +332,28 @@ DOCS=( CHANGELOG CHANGELOG.md CODE_OF_CONDUCT.md README.md docs ) pkg_setup() { check-reqs_pkg_setup dotnet-pkg_pkg_setup + + if [[ "${MERGE_TYPE}" != binary ]] ; then + if use elibc_glibc ; then + local locales="$(locale -a)" + + if has en_US.utf8 ${locales} ; then + LC_ALL=en_US.utf8 + elif has en_US.UTF-8 ${locales} ; then + LC_ALL=en_US.UTF-8 + else + eerror "The locale en_US.utf8 or en_US.UTF-8 is not available." + eerror "Please generate en_US.UTF-8 before building ${CATEGORY}/${P}." + + die "Could not switch to the en_US.UTF-8 locale." + fi + else + LC_ALL=en_US.UTF-8 + fi + + export LC_ALL + einfo "Successfully switched to the ${LC_ALL} locale." + fi } src_unpack() { diff --git a/app-shells/pwsh/pwsh-7.4.0.ebuild b/app-shells/pwsh/pwsh-7.4.0.ebuild index 5c170e355644..ff259b5a16d2 100644 --- a/app-shells/pwsh/pwsh-7.4.0.ebuild +++ b/app-shells/pwsh/pwsh-7.4.0.ebuild @@ -294,17 +294,21 @@ pkg_setup() { dotnet-pkg_pkg_setup if [[ "${MERGE_TYPE}" != binary ]] ; then - local locales="$(locale -a)" + if use elibc_glibc ; then + local locales="$(locale -a)" - if has en_US.utf8 ${locales} ; then - LC_ALL=en_US.utf8 - elif has en_US.UTF-8 ${locales} ; then - LC_ALL=en_US.UTF-8 - else - eerror "The locale en_US.utf8 or en_US.UTF-8 is not available." - eerror "Please generate en_US.UTF-8 before building ${CATEGORY}/${P}." + if has en_US.utf8 ${locales} ; then + LC_ALL=en_US.utf8 + elif has en_US.UTF-8 ${locales} ; then + LC_ALL=en_US.UTF-8 + else + eerror "The locale en_US.utf8 or en_US.UTF-8 is not available." + eerror "Please generate en_US.UTF-8 before building ${CATEGORY}/${P}." - die "Could not switch to the en_US.UTF-8 locale." + die "Could not switch to the en_US.UTF-8 locale." + fi + else + LC_ALL=en_US.UTF-8 fi export LC_ALL