Merge updates from master

9 files changed, 11 insertions, 9 deletions

diff --git a/app-text/epspdf/epspdf-0.6.5.1.ebuild b/app-text/epspdf/epspdf-0.6.5.1.ebuild
index 5d998b25b68b..95cce8070594 100644
--- a/app-text/epspdf/epspdf-0.6.5.1.ebuild
+++ b/app-text/epspdf/epspdf-0.6.5.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc tk"
 
 RDEPEND="
diff --git a/app-text/pdfjam/pdfjam-3.10-r1.ebuild b/app-text/pdfjam/pdfjam-3.10-r1.ebuild
index dc9c4bd8fb7d..17b322c27d8c 100644
--- a/app-text/pdfjam/pdfjam-3.10-r1.ebuild
+++ b/app-text/pdfjam/pdfjam-3.10-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 IUSE="extra test"
 RESTRICT="!test? ( test )"
diff --git a/app-text/texlive-core/texlive-core-2023-r10.ebuild b/app-text/texlive-core/texlive-core-2023-r10.ebuild
index 75401a0278ff..bc05744ea47f 100644
--- a/app-text/texlive-core/texlive-core-2023-r10.ebuild
+++ b/app-text/texlive-core/texlive-core-2023-r10.ebuild
@@ -127,7 +127,7 @@ SRC_URI+=" )"
 S="${WORKDIR}/${MY_P}"
 LICENSE="BSD GPL-1+ GPL-2 GPL-2+ GPL-3+ MIT TeX-other-free"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="cjk X doc source tk +luajittex xetex xindy"
 
 TEXMF_PATH=/usr/share/texmf-dist
diff --git a/dev-texlive/texlive-binextra/texlive-binextra-2023_p69527-r5.ebuild b/dev-texlive/texlive-binextra/texlive-binextra-2023_p69527-r5.ebuild
index f91ec99fb3b2..31a983d332d5 100644
--- a/dev-texlive/texlive-binextra/texlive-binextra-2023_p69527-r5.ebuild
+++ b/dev-texlive/texlive-binextra/texlive-binextra-2023_p69527-r5.ebuild
@@ -202,7 +202,7 @@ DESCRIPTION="TeXLive TeX auxiliary programs"
 
 LICENSE="Apache-2.0 Artistic BSD BSD-2 FDL-1.1+ GPL-1+ GPL-2 GPL-2+ GPL-3 GPL-3+ LGPL-3 LPPL-1.0 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT TeX TeX-other-free public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-basic-2023
 "
diff --git a/dev-texlive/texlive-context/texlive-context-2023_p69108-r4.ebuild b/dev-texlive/texlive-context/texlive-context-2023_p69108-r4.ebuild
index 56a9e1cbd27b..0365bc84036b 100644
--- a/dev-texlive/texlive-context/texlive-context-2023_p69108-r4.ebuild
+++ b/dev-texlive/texlive-context/texlive-context-2023_p69108-r4.ebuild
@@ -57,7 +57,7 @@ DESCRIPTION="TeXLive ConTeXt and packages"
 
 LICENSE="BSD BSD-2 GPL-1+ GPL-2 GPL-3 LGPL-2+ LPPL-1.3 LPPL-1.3c MIT TeX TeX-other-free public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-basic-2023
 "
diff --git a/dev-texlive/texlive-pictures/texlive-pictures-2023_p69409-r3.ebuild b/dev-texlive/texlive-pictures/texlive-pictures-2023_p69409-r3.ebuild
index e7da81116412..ec183c493a64 100644
--- a/dev-texlive/texlive-pictures/texlive-pictures-2023_p69409-r3.ebuild
+++ b/dev-texlive/texlive-pictures/texlive-pictures-2023_p69409-r3.ebuild
@@ -598,7 +598,7 @@ DESCRIPTION="TeXLive Graphics, pictures, diagrams"
 
 LICENSE="Apache-2.0 BSD-2 CC-BY-3.0 CC-BY-4.0 CC-BY-SA-1.0 CC-BY-SA-3.0 CC-BY-SA-4.0 CC0-1.0 FDL-1.1+ GPL-1+ GPL-2 GPL-3 GPL-3+ ISC LPPL-1.0 LPPL-1.2 LPPL-1.3 LPPL-1.3c MIT TeX-other-free public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 COMMON_DEPEND="
 	>=dev-texlive/texlive-basic-2023
 "
diff --git a/dev-util/re2c/re2c-3.1.ebuild b/dev-util/re2c/re2c-3.1.ebuild
index 2dae1bb3a4a3..bc097f2778eb 100644
--- a/dev-util/re2c/re2c-3.1.ebuild
+++ b/dev-util/re2c/re2c-3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="debug test"
 
 RESTRICT="!test? ( test )"
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index d2f42804301e..9304800f09f7 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1898,7 +1898,6 @@ gcc_do_make() {
 #---->> src_test <<----
 
 # TODO: add JIT testing
-# TODO: add multilib testing
 toolchain_src_test() {
 	# GCC's testsuite is a special case.
 	#
@@ -1948,6 +1947,9 @@ toolchain_src_test() {
 		# Go doesn't support this and causes noisy warnings
 		filter-flags -Wbuiltin-declaration-mismatch
 
+		# TODO: Does this handle s390 (-m31) correctly?
+		is_multilib && GCC_TESTS_RUNTESTFLAGS+=" --target_board=unix\{,-m32\}"
+
 		# nonfatal here as we die if the comparison below fails. Also, note that
 		# the exit code of targets other than 'check' may be unreliable.
 		nonfatal emake -C "${WORKDIR}"/build -k "${GCC_TESTS_CHECK_TARGET}" \
diff --git a/sci-astronomy/siril/siril-1.2.3.ebuild b/sci-astronomy/siril/siril-1.2.3.ebuild
index 8b3fc3865d24..24b92345dc89 100644
--- a/sci-astronomy/siril/siril-1.2.3.ebuild
+++ b/sci-astronomy/siril/siril-1.2.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://gitlab.com/free-astro/${PN}.git"
 else
 	SRC_URI="https://gitlab.com/free-astro/siril/-/archive/${PV/_/-}/${PN}-${PV/_/-}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 	S="${WORKDIR}/${PN}-${PV/_/-}"
 fi