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 AEC7F158041 for ; Mon, 8 Apr 2024 05:34:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E6D8CE2A34; Mon, 8 Apr 2024 05:34:46 +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 pigeon.gentoo.org (Postfix) with ESMTPS id C008AE2A34 for ; Mon, 8 Apr 2024 05:34:46 +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 B3995343346 for ; Mon, 8 Apr 2024 05:34:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 23A1116A3 for ; Mon, 8 Apr 2024 05:34:44 +0000 (UTC) From: "Viorel Munteanu" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Viorel Munteanu" Message-ID: <1712554379.9a176ecec80792e19e106a099539652417300642.ceamac@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/netpbm/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/netpbm/netpbm-11.2.8.ebuild media-libs/netpbm/netpbm-11.5.3.ebuild media-libs/netpbm/netpbm-11.6.0.ebuild X-VCS-Directories: media-libs/netpbm/ X-VCS-Committer: ceamac X-VCS-Committer-Name: Viorel Munteanu X-VCS-Revision: 9a176ecec80792e19e106a099539652417300642 X-VCS-Branch: master Date: Mon, 8 Apr 2024 05:34:44 +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: 2f8e7856-245c-4e65-89b2-e7b1aea5039b X-Archives-Hash: 196c08891d15047a830b12c386e90814 commit: 9a176ecec80792e19e106a099539652417300642 Author: Viorel Munteanu gentoo org> AuthorDate: Mon Apr 8 05:32:05 2024 +0000 Commit: Viorel Munteanu gentoo org> CommitDate: Mon Apr 8 05:32:59 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a176ece media-libs/netpbm: disable locale test on musl Closes: https://bugs.gentoo.org/927795 Signed-off-by: Viorel Munteanu gentoo.org> media-libs/netpbm/netpbm-11.2.8.ebuild | 6 ++++-- media-libs/netpbm/netpbm-11.5.3.ebuild | 4 +++- media-libs/netpbm/netpbm-11.6.0.ebuild | 4 +++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/media-libs/netpbm/netpbm-11.2.8.ebuild b/media-libs/netpbm/netpbm-11.2.8.ebuild index f44fa7eb02c1..72ada702ad14 100644 --- a/media-libs/netpbm/netpbm-11.2.8.ebuild +++ b/media-libs/netpbm/netpbm-11.2.8.ebuild @@ -160,12 +160,14 @@ src_prepare() { test/Test-Order || die fi - # this test requires LC_ALL=en_US.iso88591, not available on musl + # pbmtext-iso88591 requires LC_ALL=en_US.iso88591, not available on musl + # pbmtext-utf8 requires locale, not available on musl # ppmpat-random is broken on musl # bug #907295 if use elibc_musl; then - sed -i \ + sed \ -e 's:pbmtext-iso88591.*::' \ + -e 's:pbmtext-utf8.*::' \ -e 's:ppmpat-random.*::' \ -i test/Test-Order || die fi diff --git a/media-libs/netpbm/netpbm-11.5.3.ebuild b/media-libs/netpbm/netpbm-11.5.3.ebuild index 0a74a2fd9cea..1870cbbec2ed 100644 --- a/media-libs/netpbm/netpbm-11.5.3.ebuild +++ b/media-libs/netpbm/netpbm-11.5.3.ebuild @@ -155,12 +155,14 @@ src_prepare() { -i test/Test-Order || die fi - # this test requires LC_ALL=en_US.iso88591, not available on musl + # pbmtext-iso88591 requires LC_ALL=en_US.iso88591, not available on musl + # pbmtext-utf8 requires locale, not available on musl # ppmpat-random and pnmindex are broken on musl # bug #907295 if use elibc_musl; then sed \ -e 's:pbmtext-iso88591.*::' \ + -e 's:pbmtext-utf8.*::' \ -e 's:ppmpat-random.*::' \ -e 's:pnmindex.*::' \ -i test/Test-Order || die diff --git a/media-libs/netpbm/netpbm-11.6.0.ebuild b/media-libs/netpbm/netpbm-11.6.0.ebuild index ee6f21f27d5a..80e083e89bc2 100644 --- a/media-libs/netpbm/netpbm-11.6.0.ebuild +++ b/media-libs/netpbm/netpbm-11.6.0.ebuild @@ -154,12 +154,14 @@ src_prepare() { -i test/Test-Order || die fi - # this test requires LC_ALL=en_US.iso88591, not available on musl + # pbmtext-iso88591 requires LC_ALL=en_US.iso88591, not available on musl + # pbmtext-utf8 requires locale, not available on musl # ppmpat-random and pnmindex are broken on musl # bug #907295 if use elibc_musl; then sed \ -e 's:pbmtext-iso88591.*::' \ + -e 's:pbmtext-utf8.*::' \ -e 's:ppmpat-random.*::' \ -e 's:pnmindex.*::' \ -i test/Test-Order || die