Merge updates from master

2026-09-24 04:59:14 -07:00 · 2026-06-06 20:01:16 +00:00
parent b81bdfd7a7 4f274e5bb1
commit 5ed124fabb
16 changed files with 15 additions and 41 deletions
--- a/app-pda/libimobiledevice-glue/libimobiledevice-glue-1.3.1.ebuild
+++ b/app-pda/libimobiledevice-glue/libimobiledevice-glue-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2024-2025 Gentoo Authors
+# Copyright 2024-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libimobiledevice/libimobiledevice-glue/releases/down

 LICENSE="LGPL-2.1+"
 SLOT="0/0.1.0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~s390 x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~s390 x86"

 RDEPEND=">=app-pda/libplist-2.3:="
 DEPEND="${RDEPEND}"
--- a/app-pda/libimobiledevice/libimobiledevice-1.3.0_p20240201-r1.ebuild
+++ b/app-pda/libimobiledevice/libimobiledevice-1.3.0_p20240201-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${PN}-${MY_COMMIT}
 # While COPYING* doesn't mention 'or any later version', all the headers do, hence use +
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/1.0-6" # based on SONAME of libimobiledevice-1.0.so
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~s390 x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~s390 x86"
 IUSE="doc gnutls readline static-libs"

 RDEPEND="
--- a/app-pda/libusbmuxd/libusbmuxd-2.1.1.ebuild
+++ b/app-pda/libusbmuxd/libusbmuxd-2.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/libimobiledevice/${PN}/releases/download/${PV}/${P}.

 LICENSE="GPL-2+ LGPL-2.1+" # tools/*.c is GPL-2+, rest is LGPL-2.1+
 SLOT="0/2.0-7" # based on SONAME of libusbmuxd-2.0.so
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~s390 x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~s390 x86"

 RDEPEND="
 	>=app-pda/libimobiledevice-glue-1.2.0:=
--- a/dev-java/openjdk/openjdk-17.0.19_p10-r1.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.19_p10-r1.ebuild
@@ -53,7 +53,7 @@ S="${WORKDIR}/jdk${SLOT}u-jdk-${MY_PV//+/-}"

 LICENSE="GPL-2-with-classpath-exception"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"

 IUSE="alsa big-endian cups debug doc examples headless-awt +jbootstrap selinux source static-libs system-bootstrap systemtap"

--- a/dev-lang/pypy/pypy-3.11.7.3.22-r1.ebuild
+++ b/dev-lang/pypy/pypy-3.11.7.3.22-r1.ebuild
@@ -28,7 +28,7 @@ LICENSE="MIT"
 # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
 # also check pypy/interpreter/pycode.py -> pypy_incremental_magic
 SLOT="${PYVER}/pypy311-pp73-416"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
 IUSE="+ensurepip gdbm +jit ncurses sqlite symlink +test-install tk"
 # many tests are failing upstream
 # see https://buildbot.pypy.org/summary?branch=py${PYVER}
--- a/dev-lang/pypy3-exe-bin/pypy3-exe-bin-3.11.7.3.22.ebuild
+++ b/dev-lang/pypy3-exe-bin/pypy3-exe-bin-3.11.7.3.22.ebuild
@@ -49,7 +49,7 @@ S=${WORKDIR}/${MY_P}

 LICENSE="MIT"
 SLOT="${PV%_p*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 x86"

 # sys-devel/gcc for libgcc_s.so
 RDEPEND="
--- a/dev-lang/pypy3-exe/pypy3-exe-3.11.7.3.22.ebuild
+++ b/dev-lang/pypy3-exe/pypy3-exe-3.11.7.3.22.ebuild
@@ -26,7 +26,7 @@ S="${WORKDIR}/${MY_P}-src"

 LICENSE="MIT"
 SLOT="${PV%_p*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
 IUSE="+jit low-memory ncurses cpu_flags_x86_sse2"

 RDEPEND="
--- a/dev-python/apsw/apsw-3.53.1.0.ebuild
+++ b/dev-python/apsw/apsw-3.53.1.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="

 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc64 x86"
 IUSE="doc"

 DEPEND="
--- a/dev-python/cryptography/cryptography-48.0.0.ebuild
+++ b/dev-python/cryptography/cryptography-48.0.0.ebuild
@@ -69,7 +69,7 @@ LICENSE+="
 	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-3.0
 "
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"

 RDEPEND="
 	>=dev-libs/openssl-1.0.2o-r6:0=
--- a/dev-python/propcache/propcache-0.5.2.ebuild
+++ b/dev-python/propcache/propcache-0.5.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="

 LICENSE="Apache-2.0"
 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="+native-extensions"

 BDEPEND="
--- a/dev-python/pygithub/pygithub-2.9.1.ebuild
+++ b/dev-python/pygithub/pygithub-2.9.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="

 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"

 # cryptography via pyjwt[crypto]
 RDEPEND="
--- a/net-analyzer/nagios-plugins/nagios-plugins-2.4.12-r4.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.4.12-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}/${P}.tar

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="ipv6 ldap mysql nagios-dns nagios-ping nagios-game nls postgres samba selinux snmp ssh +ssl rpc"

 # Most of the plugins use automagic dependencies, i.e. the plugin will
--- a/profiles/arch/riscv/use.mask
+++ b/profiles/arch/riscv/use.mask
@@ -4,10 +4,6 @@
 # Unmask the flag which corresponds to ARCH.
 -riscv

-# Haelwenn (lanodan) Monnier <contact@hacktivis.me> (2026-06-02)
-# mingw isn't keyworded for riscv
-elibc_mingw
-
 # Michael Orlitzky <mjo@gentoo.org> (2024-09-01)
 # These lisp implementations have ~riscv keywords.
 # This counteracts the mask in arch/base/use.mask.
--- a/sci-libs/cfitsio/cfitsio-4.6.4.ebuild
+++ b/sci-libs/cfitsio/cfitsio-4.6.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${P}.tar.gz"

 LICENSE="ISC"
 SLOT="0/10-r1"
-KEYWORDS="~alpha ~amd64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86 ~x64-macos"
 IUSE="bzip2 curl test tools"
 RESTRICT="!test? ( test )"

--- a/sys-devel/qbe/qbe-1.3.ebuild
+++ b/sys-devel/qbe/qbe-1.3.ebuild
@@ -23,9 +23,6 @@ SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"

-# For qbe in targets like x86_64-w64-mingw32
-BDEPEND="test? ( elibc_mingw? ( virtual/wine ) )"
-
 DOCS=( README doc )

 src_prepare() {
@@ -78,14 +75,6 @@ src_compile() {
 	emake CFLAGS="-std=c99 ${CPPFLAGS} ${CFLAGS}"
 }

-src_test() {
-	if use elibc_mingw; then
-		TARGET=amd64_win default
-	else
-		default
-	fi
-}
-
 src_install() {
 	einstalldocs
 	emake install DESTDIR="${ED}" PREFIX=/usr
--- a/sys-devel/qbe/qbe-9999.ebuild
+++ b/sys-devel/qbe/qbe-9999.ebuild
@@ -23,9 +23,6 @@ SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"

-# For qbe in targets like x86_64-w64-mingw32
-BDEPEND="test? ( elibc_mingw? ( virtual/wine ) )"
-
 DOCS=( README doc )

 src_prepare() {
@@ -78,14 +75,6 @@ src_compile() {
 	emake CFLAGS="-std=c99 ${CPPFLAGS} ${CFLAGS}"
 }

-src_test() {
-	if use elibc_mingw; then
-		TARGET=amd64_win default
-	else
-		default
-	fi
-}
-
 src_install() {
 	einstalldocs
 	emake install DESTDIR="${ED}" PREFIX=/usr