Merge updates from master

2026-09-24 04:59:14 -07:00 · 2025-11-29 15:45:45 +00:00
parent 166f6565b4 20fd8bbdc5
commit 20108d9fe2
18 changed files with 68 additions and 16 deletions
--- a/app-emulation/virtualbox-additions/virtualbox-additions-7.1.14.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-7.1.14.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"

 LICENSE="GPL-3 || ( GPL-3 CDDL )"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"

 src_unpack() {
 	return 0
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.1.14.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.1.14.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"

 LICENSE="PUEL-12"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 RESTRICT="bindist mirror strip"

 RDEPEND="
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.1.14.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-7.1.14.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_PN}-${MY_PV}"

 LICENSE="GPL-3 LGPL-2.1+ MIT || ( GPL-3 CDDL )"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="+dbus gui"

 RDEPEND="
--- a/app-emulation/virtualbox-guest-modules/virtualbox-guest-modules-7.1.14.ebuild
+++ b/app-emulation/virtualbox-guest-modules/virtualbox-guest-modules-7.1.14.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"

 LICENSE="GPL-3"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"

 PATCHES=(
 	"${FILESDIR}"/${PN}-6.1.36-log-use-c99.patch
--- a/app-emulation/virtualbox-modules/virtualbox-modules-7.1.14.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-7.1.14.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"

 LICENSE="GPL-3"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"

 CONFIG_CHECK="~!SPINLOCK JUMP_LABEL ~PREEMPT_NOTIFIERS"

--- a/app-emulation/virtualbox/virtualbox-7.1.14.ebuild
+++ b/app-emulation/virtualbox/virtualbox-7.1.14.ebuild
@@ -36,7 +36,7 @@ S="${WORKDIR}/${MY_PN}-${PV%*a}"

 LICENSE="GPL-2+ GPL-3 LGPL-2.1 MIT dtrace? ( CDDL )"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="alsa dbus debug doc dtrace +gui java lvm nls pam pch pulseaudio +opengl python +sdk +sdl test +udev vboxwebsrv vde +vmmraw vnc"
 RESTRICT="!test? ( test )"

--- a/dev-lua/lua-resty-core/lua-resty-core-0.1.30.ebuild
+++ b/dev-lua/lua-resty-core/lua-resty-core-0.1.30.ebuild
@@ -15,7 +15,7 @@ SRC_URI="

 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 arm64"
+KEYWORDS="amd64 arm64"
 # Tests require replicating much of nginx-module_src_test() in each
 # dev-lua/lua-resty-* ebuild.
 RESTRICT="test"
--- a/dev-lua/lua-resty-lrucache/lua-resty-lrucache-0.15.ebuild
+++ b/dev-lua/lua-resty-lrucache/lua-resty-lrucache-0.15.ebuild
@@ -15,7 +15,7 @@ SRC_URI="

 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 arm64"
+KEYWORDS="amd64 arm64"
 # Tests require replicating much of nginx-module_src_test() in each
 # dev-lua/lua-resty-* ebuild.
 RESTRICT="test"
--- a/dev-python/backports-zstd/Manifest
+++ b/dev-python/backports-zstd/Manifest
@@ -1,2 +1,4 @@
 DIST backports_zstd-1.0.0.tar.gz 995991 BLAKE2B 6aa424ac191db255ed93e31a0c23c3645af1c67120f6e3c5757d4f4d8479d4a448e43c4d96d8c8c075307d7e8840f9aa380dd6940574240c86e55a3e96a1f62b SHA512 efeab141279ed2b0ab4eda3a32685c3da0fbc970c34bea63694b0d23c378a2c9661ad29cc6059edf9d89929f70e9b25e0f527b4b58ede0bbb64a24ca369c5fa0
 DIST backports_zstd-1.0.0.tar.gz.provenance 9489 BLAKE2B 6e9d39b29faae7a72934f14070db60b5e8464555cc77005e02088a8c0d53fd870e1c2e1d63eee8658d48ae569dcf6de1fd5ffaa81527fd1317189c06d29397db SHA512 87047ee17a00df0f6173d49131ec033f7811b825c0d95611bfde9a52d4a3248b94a2960f5bb55b4df75ad9b15502294d68d7f3ae0730b33d19e8dd6fa1fee328
+DIST backports_zstd-1.1.0.tar.gz 996020 BLAKE2B 63747df8cbbbc69f53cabae56708849915ba822ed20487fdec01887100ab07c2d342dc275e9c80e4d62078282aef9f7eb100846539ceed832448c20b4198722d SHA512 9a23debaa624f85996a5ddc91cb085531c43ebe92518e8c82bbb0bdca71bcbb96229af9bd245a109c6c554e9af00a822288b452ce68f62f7d3a332167d53669c
+DIST backports_zstd-1.1.0.tar.gz.provenance 9395 BLAKE2B 8fa4bdf2e4c57926f897e0b1678b38b47f9097e2b788503b23ea366f6d6595ecdbb03739934d8bf8c494e4db9f4e9654760256b1a6cc6dcacb050852fea29c59 SHA512 165b5c10d2169f5a2f3d0315c77f965a720727d4616fcd539aa2bb1a026d35f11b9d6215e75d663604bcd129d95fbe78b690f4b363282175b2be4189b987bde4
--- a/dev-python/backports-zstd/backports-zstd-1.1.0.ebuild
+++ b/dev-python/backports-zstd/backports-zstd-1.1.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYPI_PN=${PN/-/.}
+PYPI_VERIFY_REPO=https://github.com/Rogdham/backports.zstd
+# this is a backport from py3.14, so don't add it
+PYTHON_COMPAT=( pypy3_11 python3_{11..13} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Backport of PEP-784: adding Zstandard to the standard library"
+HOMEPAGE="
+	https://github.com/Rogdham/backports.zstd/
+	https://pypi.org/project/backports.zstd/
+"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+
+DEPEND="
+	app-arch/zstd:=
+"
+RDEPEND="
+	${DEPEND}
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# remove -flto and other forced cflags
+	sed -i -e 's:kwargs\["extra.*:pass:' setup.py || die
+
+	DISTUTILS_ARGS=(
+		--system-zstd
+	)
+
+	# remove namespace file
+	rm src/python/backports/__init__.py || die
+}
+
+python_test() {
+	eunittest tests
+}
--- a/media-libs/svt-av1/svt-av1-3.1.2.ebuild
+++ b/media-libs/svt-av1/svt-av1-3.1.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
 else
 	SRC_URI="https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v${PV}/SVT-AV1-v${PV}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
 	S="${WORKDIR}/SVT-AV1-v${PV}"
 fi

--- a/www-nginx/ngx-auth-ldap/ngx-auth-ldap-0.1_p20240424.ebuild
+++ b/www-nginx/ngx-auth-ldap/ngx-auth-ldap-0.1_p20240424.ebuild
@@ -17,7 +17,7 @@ SRC_URI="

 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 arm64"
+KEYWORDS="amd64 arm64"

 DEPEND="net-nds/openldap"
 RDEPEND="${DEPEND}"
--- a/www-nginx/ngx-authpam/ngx-authpam-1.5.5.ebuild
+++ b/www-nginx/ngx-authpam/ngx-authpam-1.5.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 LICENSE="BSD-2"
 SLOT="0"

-KEYWORDS="~amd64 arm64"
+KEYWORDS="amd64 arm64"

 DEPEND="sys-libs/pam:="
 RDEPEND="${DEPEND}"
--- a/www-nginx/ngx-cache-purge/ngx-cache-purge-2.3.ebuild
+++ b/www-nginx/ngx-cache-purge/ngx-cache-purge-2.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 LICENSE="BSD-2"
 SLOT="0"

-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 arm64"

 PATCHES=(
 	"${FILESDIR}/${PN}-2.3-add-dynamic-module-support.patch"
--- a/www-nginx/ngx-lua-module/ngx-lua-module-0.10.27.ebuild
+++ b/www-nginx/ngx-lua-module/ngx-lua-module-0.10.27.ebuild
@@ -21,7 +21,7 @@ SRC_URI="

 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 arm64"
+KEYWORDS="amd64 arm64"

 REQUIRED_USE="${LUA_REQUIRED_USE}"

--- a/www-nginx/ngx-modsecurity/ngx-modsecurity-1.0.4.ebuild
+++ b/www-nginx/ngx-modsecurity/ngx-modsecurity-1.0.4.ebuild
@@ -20,7 +20,7 @@ SRC_URI="

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 arm64"
+KEYWORDS="amd64 arm64"

 DEPEND="dev-libs/modsecurity"
 RDEPEND="${DEPEND}"
--- a/www-nginx/ngx-rtmp/ngx-rtmp-1.2.2.ebuild
+++ b/www-nginx/ngx-rtmp/ngx-rtmp-1.2.2.ebuild
@@ -17,4 +17,4 @@ SRC_URI="
 LICENSE="BSD-2"
 SLOT="0"

-KEYWORDS="~amd64 arm64"
+KEYWORDS="amd64 arm64"
--- a/www-nginx/ngx-upload-progress/ngx-upload-progress-0.9.3.ebuild
+++ b/www-nginx/ngx-upload-progress/ngx-upload-progress-0.9.3.ebuild
@@ -15,7 +15,7 @@ NGINX_MOD_S="${WORKDIR}/${MY_PN}-${PV}"

 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 arm64"
+KEYWORDS="amd64 arm64"

 # Uses custom shell-based tests.
 RESTRICT="test"