summaryrefslogtreecommitdiff
path: root/sci-libs
diff options
context:
space:
mode:
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/cfitsio/cfitsio-4.6.3.ebuild4
-rw-r--r--sci-libs/cfitsio/files/cfitsio-4.6.3-system-fortran.patch145
-rw-r--r--sci-libs/kissfft/Manifest1
-rw-r--r--sci-libs/kissfft/files/kissfft-131.1.0-cmake.patch3
-rw-r--r--sci-libs/kissfft/files/kissfft-131.1.0-cmake4.patch17
-rw-r--r--sci-libs/kissfft/files/kissfft-131.2.0-fix_python.patch15
-rw-r--r--sci-libs/kissfft/kissfft-131.2.0.ebuild92
-rw-r--r--sci-libs/kissfft/kissfft-9999.ebuild7
-rw-r--r--sci-libs/libcerf/libcerf-2.5.ebuild2
-rw-r--r--sci-libs/netcdf/netcdf-4.9.3-r2.ebuild2
-rw-r--r--sci-libs/scotch/scotch-7.0.8.ebuild2
11 files changed, 267 insertions, 23 deletions
diff --git a/sci-libs/cfitsio/cfitsio-4.6.3.ebuild b/sci-libs/cfitsio/cfitsio-4.6.3.ebuild
index 3b1eff8596d3..029e21beae86 100644
--- a/sci-libs/cfitsio/cfitsio-4.6.3.ebuild
+++ b/sci-libs/cfitsio/cfitsio-4.6.3.ebuild
@@ -28,9 +28,11 @@ RDEPEND="
# Bug #803350
DEPEND="
${RDEPEND}
- <dev-lang/cfortran-20110621
+ dev-lang/cfortran
"
+PATCHES=( "${FILESDIR}/${P}-system-fortran.patch" ) # bug #803350
+
pkg_setup() {
fortran-2_pkg_setup
}
diff --git a/sci-libs/cfitsio/files/cfitsio-4.6.3-system-fortran.patch b/sci-libs/cfitsio/files/cfitsio-4.6.3-system-fortran.patch
new file mode 100644
index 000000000000..3a93d7b09d25
--- /dev/null
+++ b/sci-libs/cfitsio/files/cfitsio-4.6.3-system-fortran.patch
@@ -0,0 +1,145 @@
+Source:
+https://salsa.debian.org/debian-astro-team/cfitsio/-/blob/master/debian/patches/02-system-cfortran.patch
+
+Use system cfortran header.
+
+--- a/f77_wrap.h
++++ b/f77_wrap.h
+@@ -1,6 +1,6 @@
+ #define UNSIGNED_BYTE
+
+-#include "cfortran.h"
++#include <cfortran/cfortran.h>
+
+ /************************************************************************
+ Some platforms creates longs as 8-byte integers. On other machines, ints
+@@ -29,16 +29,16 @@
+ #undef LONGV_cfT
+ #undef PLONG_cfT
+
+-#define LONGV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,LONGV,A,B,C,D,E)
+-#define PLONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,PLONG,A,B,C,D,E)
++#define LONGV_cfSTR(N,T,A,B,C,D,E) CFORTRAN_XCAT_(CFARGS,N)(T,LONGV,A,B,C,D,E)
++#define PLONG_cfSTR(N,T,A,B,C,D,E) CFORTRAN_XCAT_(CFARGS,N)(T,PLONG,A,B,C,D,E)
+ #define LONGVVVVVVV_cfTYPE int
+ #define PLONG_cfTYPE int
+-#define LONGV_cfQ(B) long *B, _(B,N);
++#define LONGV_cfQ(B) long *B, CFORTRAN_XCAT_(B,N);
+ #define PLONG_cfQ(B) long B;
+-#define LONGV_cfT(M,I,A,B,D) ( (_(B,N) = * _3(M,_LONGV_A,I)), \
+- B = F2Clongv(_(B,N),A) )
++#define LONGV_cfT(M,I,A,B,D) ( (CFORTRAN_XCAT_(B,N) = * CFORTRAN_XCAT_3(M,_LONGV_A,I)), \
++ B = F2Clongv(CFORTRAN_XCAT_(B,N),A) )
+ #define PLONG_cfT(M,I,A,B,D) ((B=*A),&B)
+-#define LONGV_cfR(A,B,D) C2Flongv(_(B,N),A,B);
++#define LONGV_cfR(A,B,D) C2Flongv(CFORTRAN_XCAT_(B,N),A,B);
+ #define PLONG_cfR(A,B,D) *A=B;
+ #define LONGV_cfH(S,U,B)
+ #define PLONG_cfH(S,U,B)
+@@ -93,7 +93,7 @@ extern unsigned long gMinStrLen;
+ A->dsc$w_length, \
+ num_elem(A->dsc$a_pointer, \
+ A->dsc$w_length, \
+- _3(M,_STRV_A,I) ) )
++ CFORTRAN_XCAT_3(M,_STRV_A,I) ) )
+ #else
+ #ifdef CRAYFortran
+ #define PPSTRING_cfT(M,I,A,B,D) (unsigned char*)_fcdtocp(A)
+@@ -103,20 +103,20 @@ extern unsigned long gMinStrLen;
+ #endif
+
+ #define _cfMAX(A,B) ( (A>B) ? A : B )
+-#define STRINGV_cfQ(B) char **B; unsigned int _(B,N), _(B,M);
++#define STRINGV_cfQ(B) char **B; unsigned int CFORTRAN_XCAT_(B,N), CFORTRAN_XCAT_(B,M);
+ #define STRINGV_cfR(A,B,D) free(B[0]); free(B);
+ #define TTSTR( A,B,D) \
+ ((B=(char*)malloc(_cfMAX(D,gMinStrLen)+1))[D]='\0',memcpy(B,A,D), \
+ kill_trailing(B,' '))
+ #define TTTTSTRV( A,B,D,E) ( \
+- _(B,N)=_cfMAX(E,1), \
+- _(B,M)=_cfMAX(D,gMinStrLen)+1, \
+- B=(char**)malloc(_(B,N)*sizeof(char*)), \
+- B[0]=(char*)malloc(_(B,N)*_(B,M)), \
+- vindex(B,_(B,M),_(B,N),f2cstrv2(A,B[0],D,_(B,M),_(B,N))) \
++ CFORTRAN_XCAT_(B,N)=_cfMAX(E,1), \
++ CFORTRAN_XCAT_(B,M)=_cfMAX(D,gMinStrLen)+1, \
++ B=(char**)malloc(CFORTRAN_XCAT_(B,N)*sizeof(char*)), \
++ B[0]=(char*)malloc(CFORTRAN_XCAT_(B,N)*CFORTRAN_XCAT_(B,M)), \
++ vindex(B,CFORTRAN_XCAT_(B,M),CFORTRAN_XCAT_(B,N),f2cstrv2(A,B[0],D,CFORTRAN_XCAT_(B,M),CFORTRAN_XCAT_(B,N))) \
+ )
+ #define RRRRPSTRV(A,B,D) \
+- c2fstrv2(B[0],A,_(B,M),D,_(B,N)), \
++ c2fstrv2(B[0],A,CFORTRAN_XCAT_(B,M),D,CFORTRAN_XCAT_(B,N)), \
+ free(B[0]), \
+ free(B);
+
+@@ -169,10 +169,10 @@ static char *f2cstrv2(char *fstr, char*
+ #undef BYTE_cfSTR
+ #undef BYTEV_cfSTR
+
+-#define BYTE_cfINT(N,A,B,X,Y,Z) _(CFARGS,N)(A,BYTE,B,X,Y,Z,0)
+-#define BYTEV_cfINT(N,A,B,X,Y,Z) _(CFARGS,N)(A,BYTEV,B,X,Y,Z,0)
+-#define BYTE_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,BYTE,A,B,C,D,E)
+-#define BYTEV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,BYTEV,A,B,C,D,E)
++#define BYTE_cfINT(N,A,B,X,Y,Z) CFORTRAN_XCAT_(CFARGS,N)(A,BYTE,B,X,Y,Z,0)
++#define BYTEV_cfINT(N,A,B,X,Y,Z) CFORTRAN_XCAT_(CFARGS,N)(A,BYTEV,B,X,Y,Z,0)
++#define BYTE_cfSTR(N,T,A,B,C,D,E) CFORTRAN_XCAT_(CFARGS,N)(T,BYTE,A,B,C,D,E)
++#define BYTEV_cfSTR(N,T,A,B,C,D,E) CFORTRAN_XCAT_(CFARGS,N)(T,BYTEV,A,B,C,D,E)
+ #define BYTE_cfSEP(T,B) INT_cfSEP(T,B)
+ #define BYTEV_cfSEP(T,B) INT_cfSEP(T,B)
+ #define BYTE_cfH(S,U,B) STRING_cfH(S,U,B)
+@@ -211,11 +211,11 @@ static char *f2cstrv2(char *fstr, char*
+
+ #undef LOGICALV_cfSTR
+ #undef LOGICALV_cfT
+-#define LOGICALV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,LOGICALV,A,B,C,D,E)
+-#define LOGICALV_cfQ(B) char *B; unsigned int _(B,N);
+-#define LOGICALV_cfT(M,I,A,B,D) (_(B,N)= * _3(M,_LOGV_A,I), \
+- B=F2CcopyLogVect(_(B,N),A))
+-#define LOGICALV_cfR(A,B,D) C2FcopyLogVect(_(B,N),A,B);
++#define LOGICALV_cfSTR(N,T,A,B,C,D,E) CFORTRAN_XCAT_(CFARGS,N)(T,LOGICALV,A,B,C,D,E)
++#define LOGICALV_cfQ(B) char *B; unsigned int CFORTRAN_XCAT_(B,N);
++#define LOGICALV_cfT(M,I,A,B,D) (CFORTRAN_XCAT_(B,N)= * CFORTRAN_XCAT_3(M,_LOGV_A,I), \
++ B=F2CcopyLogVect(CFORTRAN_XCAT_(B,N),A))
++#define LOGICALV_cfR(A,B,D) C2FcopyLogVect(CFORTRAN_XCAT_(B,N),A,B);
+ #define LOGICALV_cfH(S,U,B)
+
+ static char *F2CcopyLogVect(long size, int *A)
+@@ -268,20 +268,20 @@ extern fitsfile *gFitsFiles[]; /*
+ memchr(A,'\0',D) ? A : TTSTR(A,B,D)
+
+ #define FCALLSCFUN0(T0,CN,UN,LN) \
+- CFextern _(T0,_cfFZ)(UN,LN) void ABSOFT_cf2(T0)); \
+- CFextern _(T0,_cfFZ)(UN,LN) void ABSOFT_cf2(T0)) \
+- {_Icf(2,UU,T0,A0,0); _Icf(0,L,T0,0,0) CN(); _Icf(0,K,T0,0,0) _(T0,_cfI)}
++ CFextern CFORTRAN_XCAT_(T0,_cfFZ)(UN,LN) void ABSOFT_cf2(T0)); \
++ CFextern CFORTRAN_XCAT_(T0,_cfFZ)(UN,LN) void ABSOFT_cf2(T0)) \
++ {_Icf(2,UU,T0,A0,0); _Icf(0,L,T0,0,0) CN(); _Icf(0,K,T0,0,0) CFORTRAN_XCAT_(T0,_cfI)}
+
+ #define FCALLSCFUN14(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,TB,TC,TD,TE) \
+- CFextern _(T0,_cfF)(UN,LN) \
++ CFextern CFORTRAN_XCAT_(T0,_cfF)(UN,LN) \
+ CFARGT14(NCF,DCF,ABSOFT_cf2(T0),T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,TB,TC,TD,TE)); \
+- CFextern _(T0,_cfF)(UN,LN) \
++ CFextern CFORTRAN_XCAT_(T0,_cfF)(UN,LN) \
+ CFARGT14(NCF,DCF,ABSOFT_cf2(T0),T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,TB,TC,TD,TE)) \
+ { CFARGT14S(QCF,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,TB,TC,TD,TE) \
+ _Icf(2,UU,T0,A0,0); _Icf(0,L,T0,0,0) CN( TCF(LN,T1,1,0) TCF(LN,T2,2,1) \
+ TCF(LN,T3,3,1) TCF(LN,T4,4,1) TCF(LN,T5,5,1) TCF(LN,T6,6,1) TCF(LN,T7,7,1) \
+ TCF(LN,T8,8,1) TCF(LN,T9,9,1) TCF(LN,TA,10,1) TCF(LN,TB,11,1) TCF(LN,TC,12,1) \
+ TCF(LN,TD,13,1) TCF(LN,TE,14,1) ); _Icf(0,K,T0,0,0) \
+- CFARGT14S(RCF,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,TB,TC,TD,TE) _(T0,_cfI) \
++ CFARGT14S(RCF,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,TB,TC,TD,TE) CFORTRAN_XCAT_(T0,_cfI) \
+ }
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -12,7 +12,7 @@ soname_version = @version_info@
+ soname_version_lnx = ${soname_version}.0.0
+
+ include_HEADERS = fitsio.h fitsio2.h longnam.h drvrsmem.h \
+- cfortran.h f77_wrap.h region.h
++ f77_wrap.h region.h
+
+ F77_WRAPPERS = f77_wrap1.c f77_wrap2.c f77_wrap3.c f77_wrap4.c
+
diff --git a/sci-libs/kissfft/Manifest b/sci-libs/kissfft/Manifest
index 12e96cdb00eb..26d7997008ec 100644
--- a/sci-libs/kissfft/Manifest
+++ b/sci-libs/kissfft/Manifest
@@ -1 +1,2 @@
DIST kissfft-131.1.0.tar.gz 52383 BLAKE2B 74e6d2e7d132a311b31c28a468e13d9772a53f0ea0abed0e0f49d8db9c183fb0646f58fd38df3e797b8577285899daf6b80446b149ce2582bb828410656d96df SHA512 bd715868ce0e93a291a0592fb1f8b960e832fc64efe863755e52b67d5addff9bcb444a1bf2570d1914c52b41dad1023d0d86400f5ea30c9fb84cd6b4f7210708
+DIST kissfft-131.2.0.tar.gz 52477 BLAKE2B 79c4f98ce09dfad13ac0b440422a6a0905a4fa9c7d7234bdab79cacf6ab3f28c034f136587fae72eccb27c7369c486dcc7a95b279d76584d6a7ea0ddc24de0d8 SHA512 5d02802a9e191e7cb77c26e9a34659a5d47c4e85bcfdf86a7cffdda66d8b79261f7fe5795ffabd78644b6094c01b32a84841669fbc0009ac9268ae1ba521af9e
diff --git a/sci-libs/kissfft/files/kissfft-131.1.0-cmake.patch b/sci-libs/kissfft/files/kissfft-131.1.0-cmake.patch
index a3cb3e468e17..24eae3a4313e 100644
--- a/sci-libs/kissfft/files/kissfft-131.1.0-cmake.patch
+++ b/sci-libs/kissfft/files/kissfft-131.1.0-cmake.patch
@@ -1,5 +1,4 @@
-diff --git a/kissfft-config.cmake.in b/kissfft-config.cmake.in
-index cd7139a..7d6c7a2 100644
+PR pending https://github.com/mborgerding/kissfft/pull/92.patch
--- a/kissfft-config.cmake.in
+++ b/kissfft-config.cmake.in
@@ -66,14 +66,19 @@ foreach(_kissfft_datatype simd int16 int32 float double)
diff --git a/sci-libs/kissfft/files/kissfft-131.1.0-cmake4.patch b/sci-libs/kissfft/files/kissfft-131.1.0-cmake4.patch
index 263b8f88fd36..235c4c409f54 100644
--- a/sci-libs/kissfft/files/kissfft-131.1.0-cmake4.patch
+++ b/sci-libs/kissfft/files/kissfft-131.1.0-cmake4.patch
@@ -1,18 +1,5 @@
-Taken from: https://github.com/mborgerding/kissfft/pull/101
-
-From d42d353de36e843b7145b7be4aee0758040f92d1 Mon Sep 17 00:00:00 2001
-From: Christophe Marin <christophe@krop.fr>
-Date: Wed, 2 Apr 2025 11:39:34 +0200
-Subject: [PATCH] Bump minimum CMake version in kissfft-config.cmake
-
+Taken from: https://github.com/mborgerding/kissfft/pull/101.patch (merged)
CMake 4 dropped support for CMake versions <= 3.5.
-We'll use 3.6, which is the minimum version required to build kissfft.
----
- kissfft-config.cmake.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kissfft-config.cmake.in b/kissfft-config.cmake.in
-index cd7139a..fd9553c 100644
--- a/kissfft-config.cmake.in
+++ b/kissfft-config.cmake.in
@@ -24,7 +24,7 @@
@@ -20,7 +7,7 @@ index cd7139a..fd9553c 100644
@PACKAGE_INIT@
-cmake_minimum_required(VERSION 3.3)
-+cmake_minimum_required(VERSION 3.6)
++cmake_minimum_required(VERSION 3.10)
# Set include glob of config files using SHARED/static component, BUILD_SHARED_LIBS by default
set(_kissfft_shared_detected OFF)
diff --git a/sci-libs/kissfft/files/kissfft-131.2.0-fix_python.patch b/sci-libs/kissfft/files/kissfft-131.2.0-fix_python.patch
new file mode 100644
index 000000000000..44f5bf8ad0fa
--- /dev/null
+++ b/sci-libs/kissfft/files/kissfft-131.2.0-fix_python.patch
@@ -0,0 +1,15 @@
+backport PR merged to fix python detection
+https://github.com/mborgerding/kissfft/pull/119.patch
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -53,8 +53,8 @@ if(KISSFFT_DATATYPE MATCHES "^simd$")
+ endif()
+ endif()
+
+-find_package(Python REQUIRED)
+-add_test(NAME testkiss.py COMMAND "${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/testkiss.py")
++find_package(Python3 COMPONENTS Interpreter REQUIRED)
++add_test(NAME testkiss.py COMMAND "${Python3_INTERPRETER}" "${CMAKE_CURRENT_SOURCE_DIR}/testkiss.py")
+ list(APPEND TESTKISS_PY_ENV "KISSFFT_DATATYPE=${KISSFFT_DATATYPE}")
+ list(APPEND TESTKISS_PY_ENV "KISSFFT_OPENMP=${KISSFFT_OPENMP}")
+ set_tests_properties(testkiss.py PROPERTIES
diff --git a/sci-libs/kissfft/kissfft-131.2.0.ebuild b/sci-libs/kissfft/kissfft-131.2.0.ebuild
new file mode 100644
index 000000000000..3e3fe3b61b3d
--- /dev/null
+++ b/sci-libs/kissfft/kissfft-131.2.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..14} )
+
+inherit cmake multibuild python-any-r1 toolchain-funcs
+
+DESCRIPTION="Fast Fourier Transform (FFT) library that tries to Keep it Simple, Stupid"
+HOMEPAGE="https://github.com/mborgerding/kissfft"
+
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/mborgerding/kissfft"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/mborgerding/kissfft/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="alloca cpu_flags_x86_sse double int16 int32 openmp test tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="tools? ( media-libs/libpng:= )"
+DEPEND="
+ ${RDEPEND}
+ test? (
+ sci-libs/fftw:3.0
+ $(python_gen_any_dep '
+ dev-python/numpy[${PYTHON_USEDEP}]
+ ')
+ )
+"
+
+PATCHES=(
+ # both merged after 131.2.0
+ "${FILESDIR}"/${PN}-131.1.0-cross.patch
+ "${FILESDIR}"/${PN}-131.2.0-fix_python.patch
+ # PR pending https://github.com/mborgerding/kissfft/pull/92
+ "${FILESDIR}"/${PN}-131.1.0-cmake.patch
+)
+
+python_check_deps() {
+ python_has_version -d "dev-python/numpy[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ MULTIBUILD_VARIANTS=(
+ float
+ $(usev double)
+ $(usev int16 int16_t)
+ $(usev int32 int32_t)
+ $(usev cpu_flags_x86_sse simd)
+ )
+
+ use test && python-any-r1_pkg_setup
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+kissfft_configure() {
+ local mycmakeargs=(
+ -DKISSFFT_OPENMP=$(usex openmp 1 0)
+ -DKISSFFT_TEST=$(usex test)
+ -DKISSFFT_TOOLS=$(usex tools)
+ -DKISSFFT_USE_ALLOCA=$(usex alloca)
+ -DKISSFFT_DATATYPE=${MULTIBUILD_VARIANT}
+ )
+
+ cmake_src_configure
+}
+
+src_configure() {
+ multibuild_foreach_variant kissfft_configure
+}
+
+src_compile() {
+ multibuild_foreach_variant cmake_src_compile
+}
+
+src_test() {
+ multibuild_foreach_variant cmake_src_test
+}
+
+src_install() {
+ multibuild_foreach_variant cmake_src_install
+}
diff --git a/sci-libs/kissfft/kissfft-9999.ebuild b/sci-libs/kissfft/kissfft-9999.ebuild
index b86bd9cfb69a..150ba41c4605 100644
--- a/sci-libs/kissfft/kissfft-9999.ebuild
+++ b/sci-libs/kissfft/kissfft-9999.ebuild
@@ -3,11 +3,11 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_COMPAT=( python3_{11..14} )
inherit cmake multibuild python-any-r1 toolchain-funcs
-DESCRIPTION="A Fast Fourier Transform (FFT) library that tries to Keep it Simple, Stupid"
+DESCRIPTION="Fast Fourier Transform (FFT) library that tries to Keep it Simple, Stupid"
HOMEPAGE="https://github.com/mborgerding/kissfft"
if [[ ${PV} == *9999 ]] ; then
@@ -23,7 +23,9 @@ SLOT="0"
IUSE="alloca cpu_flags_x86_sse double int16 int32 openmp test tools"
RESTRICT="!test? ( test )"
+RDEPEND="tools? ( media-libs/libpng:= )"
DEPEND="
+ ${RDEPEND}
test? (
sci-libs/fftw:3.0
$(python_gen_any_dep '
@@ -33,6 +35,7 @@ DEPEND="
"
PATCHES=(
+ # PR pending https://github.com/mborgerding/kissfft/pull/92
"${FILESDIR}"/${PN}-131.1.0-cmake.patch
)
diff --git a/sci-libs/libcerf/libcerf-2.5.ebuild b/sci-libs/libcerf/libcerf-2.5.ebuild
index b353afa586a2..8f6e4103084f 100644
--- a/sci-libs/libcerf/libcerf-2.5.ebuild
+++ b/sci-libs/libcerf/libcerf-2.5.ebuild
@@ -13,4 +13,4 @@ S="${WORKDIR}/${MY_P}"
LICENSE="MIT"
SLOT="0/2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
diff --git a/sci-libs/netcdf/netcdf-4.9.3-r2.ebuild b/sci-libs/netcdf/netcdf-4.9.3-r2.ebuild
index 1613620f795e..6132b20eb41b 100644
--- a/sci-libs/netcdf/netcdf-4.9.3-r2.ebuild
+++ b/sci-libs/netcdf/netcdf-4.9.3-r2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}-c-${PV}
LICENSE="UCAR-Unidata"
# SONAME of libnetcdf.so
SLOT="0/22"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE="blosc bzip2 +dap doc examples hdf +hdf5 mpi szip test zstd"
RESTRICT="!test? ( test )"
diff --git a/sci-libs/scotch/scotch-7.0.8.ebuild b/sci-libs/scotch/scotch-7.0.8.ebuild
index 5d0ecf514f30..2a3c68052468 100644
--- a/sci-libs/scotch/scotch-7.0.8.ebuild
+++ b/sci-libs/scotch/scotch-7.0.8.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-v${PV}"
LICENSE="CeCILL-2"
SLOT="0/${SOVER}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="doc int64 mpi static-libs test tools +threads"
# bug #532620
REQUIRED_USE="test? ( threads )"