Merge updates from master

33 files changed, 34 insertions, 124 deletions

diff --git a/app-admin/ansible-core/Manifest b/app-admin/ansible-core/Manifest
index 13f0a03cffb5..9db266817976 100644
--- a/app-admin/ansible-core/Manifest
+++ b/app-admin/ansible-core/Manifest
@@ -1,5 +1,4 @@
 DIST ansible-core-2.13.9.tar.gz 14025835 BLAKE2B 831f04f1d4872d2e7a9801e69e450ed48c65f95121dc56f124c932169e44c12da672dd4ba9320a4e40270afd044d38c0774e79980977322260f110986d06a65e SHA512 74514d98fb3f7f24fb0b4e95ee20c76f26234d1f5067ca2801e9ac92baabed0f2f2c89bf577510be7403041405951271e7749279c9fa04fab57018cbdf2c52c7
-DIST ansible-core-2.14.4.tar.gz 11589961 BLAKE2B ae096debaf676dbd46cb047f0f87af5d09b4265368500964bbd0cf3ac8e58969bee489d66486fb570a697df5b22065fae206f1df361eb911a7fe025628655371 SHA512 86164dfded15232174e4f11140a71b91ef5b0d93b40a2df9588930b4b955f20feb419258c2bbf9d6735d298ec626c88c5e9b1c933a51e3273a28b85fac7a3762
 DIST ansible-core-2.14.5.tar.gz 11620295 BLAKE2B d006f773e1c2b28582143a4f08f699e5744fba492130388fa5463053cdf8f0cc7056296daa213c72884ea0c0ba454a3e04ef118c184faba8c8d3c281ae65345a SHA512 130a0de925c7229dee350ddbf4382d87802d86aab4817ed595105db8ed5071153847dac0478f20a994670e59e53a07b77d0bf35855d309ebc222fbb61233b7db
 DIST ansible-core-2.14.6.tar.gz 11452549 BLAKE2B 123b2a87d92f8074b389a71c0ab91bf01a126b38e99f8af05b766c15ff1bf18e9a28d3d06b61f836df1a24f86c8586df6b8cfb48bfc1e4fde033ed499825a7d4 SHA512 a50f39f043e7a72fd7ec5239d30848cf663d80b37115a9d32086462f5c8689b08dc8007087b188686160c46a3aa63a661e702c79e69f35f086e214e2d315cbd4
 DIST ansible-core-2.15.0.tar.gz 10801327 BLAKE2B 58d92d3d8cbc87d9c2c606317bae3b6841c66b9600153b38be912b02dbc19069ff8e755daa574e394ac5d12c04859640f0e2af17ed0adeb8a12da76979c163d3 SHA512 aebb43840380854e7759656a0b08579a8fbdddbf2d204c47fb16cdb73ffd540df5ad56e5bf4a78a338804a3d40f9b042ea50b2b1853aaef6b7c2f0aab7a95432
diff --git a/app-admin/ansible-core/ansible-core-2.14.4-r1.ebuild b/app-admin/ansible-core/ansible-core-2.14.4-r1.ebuild
deleted file mode 100644
index c9e4dbcd003a..000000000000
--- a/app-admin/ansible-core/ansible-core-2.14.4-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-PYPI_NO_NORMALIZE=1
-
-inherit distutils-r1
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://www.ansible.com/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
-	EGIT_BRANCH="devel"
-else
-	inherit pypi
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/resolvelib.patch"
-)
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/httplib2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/netaddr[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
-	<dev-python/resolvelib-1.1.0[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-BDEPEND="
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	test? (
-		dev-python/botocore[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_compile() {
-	export ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_compile
-}
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 785272a08fa0..13d9c13ea2ae 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,4 +1,3 @@
 DIST ansible-6.7.0.tar.gz 36371372 BLAKE2B 75cb14f158c36ded8313a1c5b798838afdf3a38ffc8e29a87c8e1e3e74c9aeca827432397ad83ed23a1d3aeaaef91822cc3c23aa226a307d93f84f54b25d71bb SHA512 676baf03626d5bf36aea7117d39ef71ba7878ab6bccdec1ee199bd699d559a5f3f6a0d9032ef120204093677b7fbbe1b575529d3aa692acd1a4447f9c2715f3a
-DIST ansible-7.4.0.tar.gz 37352820 BLAKE2B 33d3affa052e509348c981920597ab13f3181dee1ab46eda764e0a68df2edeefbcb62cec57e62da559bfe2b5e7efdb95eba1b602efe198bfad8dd0301e66c7df SHA512 c77aebb54676b669305905c969fa5afac9e1262bfefa358de7fee0fb3ef89d0306c599acb2225cdb4209c53df16c307d438cc628299aec494c70cba166eb3cbb
 DIST ansible-7.5.0.tar.gz 37716844 BLAKE2B 47f6fcb744a65b3dd4d8619acd0ca23561bb6f1e3eb12d038e212a0bd92e98e0c93ab5f08c463cca357c568cccb19eb1bfd764d91cf83d79564039525ee90bc7 SHA512 0246d5beabbe26733978d83359b5647727c833ca0dd3f84f86f61f906e62e96178bffb82e39a2a48ffc442e01f3ab8335f5bb7c4649c872373831ad2deaf9572
 DIST ansible-7.6.0.tar.gz 38452799 BLAKE2B 88b652b1b0bcbedb982606c7d7734fd11567cd492f4e0d617d7412e1bac8978fcef1f4201bb0338098204640e2b004d8921427c1d642bfbb15a7f95b134cb85e SHA512 4f8960356e0ff855d54b435ed691d1d4f7d38c1231269e35b3dbbee536a9d8d1aef2806d7ce38e863fe216e9fddb2f86ce55ba997a3bd1d8bb7f43c5c519ff72
diff --git a/app-admin/ansible/ansible-7.4.0.ebuild b/app-admin/ansible/ansible-7.4.0.ebuild
deleted file mode 100644
index 0cefb7045e40..000000000000
--- a/app-admin/ansible/ansible-7.4.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://www.ansible.com/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
-RESTRICT="test"
-
-RDEPEND=">=app-admin/ansible-core-2.14.0
-	<app-admin/ansible-core-2.15"
-
-python_compile() {
-	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_compile
-}
-python_install() {
-	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_install
-}
diff --git a/app-admin/sysstat/sysstat-12.6.2-r1.ebuild b/app-admin/sysstat/sysstat-12.6.2-r1.ebuild
index 381064259d0f..c432f5b79c2f 100644
--- a/app-admin/sysstat/sysstat-12.6.2-r1.ebuild
+++ b/app-admin/sysstat/sysstat-12.6.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
 IUSE="dcron debug nls lm-sensors lto selinux systemd"
 
 BDEPEND="
diff --git a/app-crypt/libb2/libb2-0.98.1-r3.ebuild b/app-crypt/libb2/libb2-0.98.1-r3.ebuild
index 846205375827..f810cc600ecf 100644
--- a/app-crypt/libb2/libb2-0.98.1-r3.ebuild
+++ b/app-crypt/libb2/libb2-0.98.1-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.g
 
 LICENSE="CC0-1.0"
 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="static-libs native-cflags openmp"
 
 DEPEND="
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.8.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.8.ebuild
index 18a227280590..d7b777f8a797 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.8.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-7.0.8.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"
 
 LICENSE="PUEL-11"
 SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 RESTRICT="bindist mirror strip"
 
 RDEPEND="=app-emulation/virtualbox-${MY_PV}*"
diff --git a/app-eselect/eselect-ruby/eselect-ruby-20221225.ebuild b/app-eselect/eselect-ruby/eselect-ruby-20221225.ebuild
index 851108ec94f9..45fe9a677c06 100644
--- a/app-eselect/eselect-ruby/eselect-ruby-20221225.ebuild
+++ b/app-eselect/eselect-ruby/eselect-ruby-20221225.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~graaff/ruby-team/ruby.eselect-${PVR}.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.0.2"
diff --git a/app-vim/editorconfig-vim/editorconfig-vim-1.1.1.ebuild b/app-vim/editorconfig-vim/editorconfig-vim-1.1.1.ebuild
index b7867cfbd7dd..a6d27567296c 100644
--- a/app-vim/editorconfig-vim/editorconfig-vim-1.1.1.ebuild
+++ b/app-vim/editorconfig-vim/editorconfig-vim-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN%-vim}/${PN}/archive/v${MY_PV}.tar.gz -> ${MY_P}
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD-2 PSF-2"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 VIM_PLUGIN_HELPFILES="${PN%-vim}.txt"
 
diff --git a/dev-cpp/asio/asio-1.26.0.ebuild b/dev-cpp/asio/asio-1.26.0.ebuild
index 2f03a29f8c98..607a901e7911 100644
--- a/dev-cpp/asio/asio-1.26.0.ebuild
+++ b/dev-cpp/asio/asio-1.26.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${P}.tar.bz2"
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/ruby/ruby-3.1.4-r2.ebuild b/dev-lang/ruby/ruby-3.1.4-r2.ebuild
index 126c3f290a34..83f48a8b358b 100644
--- a/dev-lang/ruby/ruby-3.1.4-r2.ebuild
+++ b/dev-lang/ruby/ruby-3.1.4-r2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.ruby-lang.org/"
 SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit +rdoc socks5 +ssl static-libs systemtap tk valgrind xemacs"
 
 RDEPEND="
diff --git a/dev-python/argcomplete/argcomplete-3.0.8.ebuild b/dev-python/argcomplete/argcomplete-3.0.8.ebuild
index 4cf39bceee2a..7ce96f65918b 100644
--- a/dev-python/argcomplete/argcomplete-3.0.8.ebuild
+++ b/dev-python/argcomplete/argcomplete-3.0.8.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/setuptools-rust/setuptools-rust-1.6.0.ebuild b/dev-python/setuptools-rust/setuptools-rust-1.6.0.ebuild
index 97aab7a63b54..25805e47d8c3 100644
--- a/dev-python/setuptools-rust/setuptools-rust-1.6.0.ebuild
+++ b/dev-python/setuptools-rust/setuptools-rust-1.6.0.ebuild
@@ -101,7 +101,7 @@ SRC_URI="
 # crates are used at test time only, update via pycargoebuild -L -i ...
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/urllib3/urllib3-1.26.16.ebuild b/dev-python/urllib3/urllib3-1.26.16.ebuild
index 9314ad008c16..fd7fd21b5100 100644
--- a/dev-python/urllib3/urllib3-1.26.16.ebuild
+++ b/dev-python/urllib3/urllib3-1.26.16.ebuild
@@ -5,7 +5,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_TESTED=( python3_{9..11} pypy3 )
+PYTHON_TESTED=( python3_{10..12} pypy3 )
 PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
 PYTHON_REQ_USE="ssl(+)"
 
diff --git a/dev-python/werkzeug/werkzeug-2.3.4-r1.ebuild b/dev-python/werkzeug/werkzeug-2.3.4-r1.ebuild
index 45e61e3a2b87..6eb8beefee10 100644
--- a/dev-python/werkzeug/werkzeug-2.3.4-r1.ebuild
+++ b/dev-python/werkzeug/werkzeug-2.3.4-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test-rust"
 
 RDEPEND="
diff --git a/dev-python/x-wr-timezone/x-wr-timezone-0.0.5.ebuild b/dev-python/x-wr-timezone/x-wr-timezone-0.0.5.ebuild
index 6402886fb29f..17287ecf78a2 100644
--- a/dev-python/x-wr-timezone/x-wr-timezone-0.0.5.ebuild
+++ b/dev-python/x-wr-timezone/x-wr-timezone-0.0.5.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/icalendar[${PYTHON_USEDEP}]
diff --git a/dev-ruby/bundler/bundler-2.3.26.ebuild b/dev-ruby/bundler/bundler-2.3.26.ebuild
index b486796bbb67..08769db3cabb 100644
--- a/dev-ruby/bundler/bundler-2.3.26.ebuild
+++ b/dev-ruby/bundler/bundler-2.3.26.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://github.com/carlhuda/bundler"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend virtual/rubygems
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.6.3.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.6.3.ebuild
index c5a0ce030dee..81d0ffb36b91 100644
--- a/dev-ruby/did_you_mean/did_you_mean-1.6.3.ebuild
+++ b/dev-ruby/did_you_mean/did_you_mean-1.6.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/yuki24/did_you_mean"
 
 LICENSE="MIT"
 SLOT="2.6"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/minitest:5 dev-ruby/test-unit )"
diff --git a/dev-ruby/rdoc/rdoc-6.3.3-r1.ebuild b/dev-ruby/rdoc/rdoc-6.3.3-r1.ebuild
index dc271043baf8..c8913e0a5586 100644
--- a/dev-ruby/rdoc/rdoc-6.3.3-r1.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.3.3-r1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/ruby/rdoc/"
 SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 Ruby-BSD )"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 SLOT="0"
 IUSE="doc"
 
diff --git a/dev-ruby/rdoc/rdoc-6.4.0.ebuild b/dev-ruby/rdoc/rdoc-6.4.0.ebuild
index fa0474e848a1..b5219a2cbb81 100644
--- a/dev-ruby/rdoc/rdoc-6.4.0.ebuild
+++ b/dev-ruby/rdoc/rdoc-6.4.0.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/ruby/rdoc/"
 SRC_URI="https://github.com/ruby/rdoc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 Ruby-BSD )"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 SLOT="0"
 IUSE="doc"
 
diff --git a/dev-ruby/rubygems/rubygems-3.3.26.ebuild b/dev-ruby/rubygems/rubygems-3.3.26.ebuild
index 4c34860674a6..936998369e32 100644
--- a/dev-ruby/rubygems/rubygems-3.3.26.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.3.26.ebuild
@@ -13,7 +13,7 @@ LICENSE="|| ( Ruby MIT )"
 
 SRC_URI="https://github.com/rubygems/rubygems/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 SLOT="0"
 IUSE="server test"
 RESTRICT="!test? ( test )"
diff --git a/media-libs/libmtp/libmtp-1.1.21.ebuild b/media-libs/libmtp/libmtp-1.1.21.ebuild
index c701249af61e..d8be7090fcf6 100644
--- a/media-libs/libmtp/libmtp-1.1.21.ebuild
+++ b/media-libs/libmtp/libmtp-1.1.21.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	inherit libtool
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)"
diff --git a/media-libs/libwmf/libwmf-0.2.13-r1.ebuild b/media-libs/libwmf/libwmf-0.2.13-r1.ebuild
index 68fb30c88d1e..7f92399b1930 100644
--- a/media-libs/libwmf/libwmf-0.2.13-r1.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.13-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/caolanm/libwmf/archive/refs/tags/v${PV}.tar.gz -> ${
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~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 ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="debug doc expat X"
 
 RDEPEND="
diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.76.ebuild b/net-libs/libmicrohttpd/libmicrohttpd-0.9.76.ebuild
index d8a23e3f6bf1..03bfe985f82f 100644
--- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.76.ebuild
+++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.76.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="|| ( LGPL-2.1+ !ssl? ( GPL-2+-with-eCos-exception-2 ) )"
 SLOT="0/12"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="+epoll ssl static-libs test +thread-names"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.3-r1.ebuild b/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.3-r1.ebuild
index ca1df0d6f608..2fe08277a30e 100644
--- a/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.3-r1.ebuild
+++ b/net-libs/libsignal-protocol-c/libsignal-protocol-c-2.3.3-r1.ebuild
@@ -8,7 +8,7 @@ inherit cmake
 DESCRIPTION="Signal Protocol C Library"
 HOMEPAGE="https://signal.org/ https://github.com/signalapp/libsignal-protocol-c"
 SRC_URI="https://github.com/signalapp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/net-print/cups-filters/cups-filters-1.28.17-r2.ebuild b/net-print/cups-filters/cups-filters-1.28.17-r2.ebuild
index 5322c9f0768a..cc5a18a6de3d 100644
--- a/net-print/cups-filters/cups-filters-1.28.17-r2.ebuild
+++ b/net-print/cups-filters/cups-filters-1.28.17-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 LICENSE="MIT GPL-2"
 SLOT="0"
 IUSE="dbus exif +foomatic jpeg ldap pclm pdf perl png +postscript test tiff zeroconf"
-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"
 
 RESTRICT="!test? ( test )"
 
diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults
index 672f3ebcf4c4..2ff3ba0dff24 100644
--- a/profiles/arch/x86/make.defaults
+++ b/profiles/arch/x86/make.defaults
@@ -43,7 +43,3 @@ ABI_X86="32"
 # Enable USE=libtirpc by default, to ease dependency resolution during
 # the stabilization of glibc-2.26. Bug 657148
 USE="libtirpc"
-
-# Sam James <sam@gentoo.org> (2023-05-29)
-# Temporarily use old default until bug #907377 is done for this arch
-RUBY_TARGETS="ruby30"
diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask
index b2d5d5ab61ad..5b5cab87da95 100644
--- a/profiles/arch/x86/use.stable.mask
+++ b/profiles/arch/x86/use.stable.mask
@@ -4,10 +4,6 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
-# Sam James <sam@gentoo.org> (2023-05-29)
-# Temporary mask for bug #907377
-ruby_targets_ruby31
-
 # Alfredo Tupone <tupone@gentoo.org> (2023-2-2)
 # sys-devel/gcc:12 is not stable yet on x86
 ada_target_gcc_12
diff --git a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.2-r1.ebuild b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.2-r1.ebuild
index e7f5fcabbd96..713ceb444748 100644
--- a/sci-libs/keras-preprocessing/keras-preprocessing-1.1.2-r1.ebuild
+++ b/sci-libs/keras-preprocessing/keras-preprocessing-1.1.2-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://keras.io/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/sys-apps/nvme-cli/nvme-cli-2.4-r2.ebuild b/sys-apps/nvme-cli/nvme-cli-2.4-r2.ebuild
index 662685fa7858..f873d899c06d 100644
--- a/sys-apps/nvme-cli/nvme-cli-2.4-r2.ebuild
+++ b/sys-apps/nvme-cli/nvme-cli-2.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/linux-nvme/nvme-cli/archive/v${PV}.tar.gz -> ${P}.gh
 
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~loong ppc64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86"
 IUSE="hugepages +json"
 
 RDEPEND="
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.16.0.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.16.0.ebuild
index a61a32de3804..58e819258d21 100644
--- a/sys-fs/f2fs-tools/f2fs-tools-1.16.0.ebuild
+++ b/sys-fs/f2fs-tools/f2fs-tools-1.16.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="dev"
 else
 	SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/${PN}.git/snapshot/${P}.tar.gz"
-	KEYWORDS="amd64 arm ~arm64 ~loong ~mips ppc ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-libs/libnvme/libnvme-1.4.ebuild b/sys-libs/libnvme/libnvme-1.4.ebuild
index 54be0eb604fa..e815ea07f037 100644
--- a/sys-libs/libnvme/libnvme-1.4.ebuild
+++ b/sys-libs/libnvme/libnvme-1.4.ebuild
@@ -13,7 +13,7 @@ SLOT="0/1"
 IUSE="dbus +json keyutils python ssl +uuid"
 
 SRC_URI="https://github.com/linux-nvme/libnvme/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 ~arm64 ~loong ppc64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86"
 
 DEPEND="
 	json? ( dev-libs/json-c:= )
diff --git a/www-servers/nginx-unit/nginx-unit-1.30.0.ebuild b/www-servers/nginx-unit/nginx-unit-1.30.0.ebuild
index 8d3e40e6aa94..576f5179c69f 100644
--- a/www-servers/nginx-unit/nginx-unit-1.30.0.ebuild
+++ b/www-servers/nginx-unit/nginx-unit-1.30.0.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 MY_USE="perl python ruby"
 MY_USE_PHP="php7-4 php8-0 php8-1 php8-2"
-IUSE="${MY_USE} ${MY_USE_PHP} ssl"
+IUSE="${MY_USE} ${MY_USE_PHP} perl ssl"
 REQUIRED_USE="|| ( ${IUSE} )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -88,6 +88,12 @@ src_configure() {
 src_install() {
 	default
 
+	if use perl ; then
+		echo "1"
+		echo "D is ${D}"
+		emake DESTDIR="${D}/" perl-install
+	fi
+
 	rm -rf "${ED}"/usr/var
 
 	diropts -m 0770