commit:     9a176ecec80792e19e106a099539652417300642
Author:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  8 05:32:05 2024 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> 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 <ceamac <AT> 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

Reply via email to