Merge updates from master

19 files changed, 171 insertions, 97 deletions

diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index 3c28c5f929e6..7957e86901f0 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -1,4 +1,3 @@
 DIST a2ps-4.14-ja_nls.patch.gz 27576 BLAKE2B 7300971fb76f6c8d2b0e5ffa519cf6064519a33f24430b9894e43778dff5b78f7cf7e2b9fe1e98fb475f452b39ccc29f88f579bbe1922ac3ef70775a05591b32 SHA512 f02f553dd9d9dbd9dfe41ebfe103493000aa4e9de5634c94e7453f73b66d88fea6b0010095913a4a99c7285990a1df1ebcc39da451b2b34f96b0c191112b125f
 DIST a2ps-4.14.tar.gz 2552507 BLAKE2B cd15a2b85f54f8bfb92adf9f4cf2c3c29091e528ae8072d0e905c58cc94caf55b76ac3e37891f8a0bc0909a177c5ee434fe5aaab3625a2c14127dabad8b506ed SHA512 fd6ac8ab47d789114c283e8ca508f7f56feabd1a189f4ac772cad9e6be7e3791e210892cfffd04ad1d39efe4b15386b2e61bf4cd56b70ed581c0554f36bfe06f
-DIST a2ps-4.15.1.tar.gz 3598826 BLAKE2B a205f1c5936329eda0768e1494aba62710ce6eccbdfc695f69d65e4c1cf0b84d6f52dd1c1b32b3aa55a037a37f783cb74cf9d2f3b63cffb07beb0bc15fe7303f SHA512 ed58bd03b9390f44b03ae2458bb94655ef0597f11aa89a2d778b14f03fba4d0e0272795d2f968ae304be46d7b862a2f0ce1dc82328d71a02b0293b23ec8b6fa5
 DIST a2ps-4.15.2.tar.gz 3600923 BLAKE2B 37d6dd76578301a629a4171e194cc34836b393ef293193191b2a4e3c5635c154b0d380f921e3862cad64e468108105a669c89e76ec8baa915587f8fff8af8aa9 SHA512 637bda87c7e8d59d923428398d0d67066c700e7e37d91cf3408bfe38f3367afdc651a8248984512fbe71e0d1cb07cb4a348816650748e1fbde52625e8e055a70
diff --git a/app-text/a2ps/a2ps-4.15.1.ebuild b/app-text/a2ps/a2ps-4.15.1.ebuild
deleted file mode 100644
index db63721729f2..000000000000
--- a/app-text/a2ps/a2ps-4.15.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools elisp-common
-
-DESCRIPTION="Any to PostScript filter"
-HOMEPAGE="https://www.gnu.org/software/a2ps/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="cjk emacs latex nls static-libs vanilla"
-
-# a2ps-lpr-wrapper needs bash
-RDEPEND="
-	app-text/ghostscript-gpl
-	app-text/libpaper:=
-	>=app-text/psutils-1.17
-	app-text/wdiff
-	app-shells/bash:*
-	dev-libs/boehm-gc
-	>=sys-apps/coreutils-6.10-r1
-	emacs? ( >=app-editors/emacs-23.1:* )
-	latex? ( virtual/latex-base )
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-alternatives/yacc
-	>=dev-util/gperf-2.7.2
-	nls? ( sys-devel/gettext )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	default
-
-	use vanilla || eapply "${FILESDIR}"/${PN}-4.15-stdout.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	export LANG=C LC_ALL=C
-
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static) \
-		--sysconfdir="${EPREFIX}"/etc/a2ps \
-		$(use_enable nls) \
-		COM_netscape=no \
-		COM_acroread=no \
-		$(usev !latex COM_latex=no) \
-		$(usev !emacs EMACS=no)
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		lispdir="${EPREFIX}${SITELISP}"/${PN} \
-		install
-
-	newdoc "${ED}"/usr/share/a2ps/README README.a2ps
-	newdoc "${ED}"/usr/share/a2ps/ppd/README README.a2ps.ppd
-	newdoc "${ED}"/usr/share/ogonkify/README README.ogonkify
-
-	rm -f "${ED}"/usr/share/{a2ps,a2ps/ppd,ogonkify}/README || die
-
-	find "${ED}" -name '*.la' -delete || die
-
-	use emacs && elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-
-	dodoc ANNOUNCE AUTHORS ChangeLog FAQ NEWS README* THANKS TODO
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/app-text/recode/recode-3.7.14.ebuild b/app-text/recode/recode-3.7.14.ebuild
index 7b821c30a1cb..3e95700bff0a 100644
--- a/app-text/recode/recode-3.7.14.ebuild
+++ b/app-text/recode/recode-3.7.14.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rrthomas/recode/releases/download/v${PV}/${P}.tar.gz
 LICENSE="GPL-3+"
 # librecode soname version
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-perl/XML-LibXSLT/XML-LibXSLT-2.2.1.ebuild b/dev-perl/XML-LibXSLT/XML-LibXSLT-2.2.1.ebuild
index 00ea72856eaa..b7a5671736c2 100644
--- a/dev-perl/XML-LibXSLT/XML-LibXSLT-2.2.1.ebuild
+++ b/dev-perl/XML-LibXSLT/XML-LibXSLT-2.2.1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A Perl module to parse XSL Transformational sheets using GNOME's li
 # https://github.com/shlomif/perl-XML-LibXSLT/issues/5
 LICENSE="|| ( Artistic GPL-1+ ) MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm ~arm64 ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm ~arm64 ~mips ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	virtual/perl-Encode
diff --git a/dev-python/Faker/Faker-18.3.0.ebuild b/dev-python/Faker/Faker-18.3.0.ebuild
new file mode 100644
index 000000000000..f1e5f5fe409a
--- /dev/null
+++ b/dev-python/Faker/Faker-18.3.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="
+	https://github.com/joke2k/faker/
+	https://pypi.org/project/Faker/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	!dev-ruby/faker
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index f6c88f162f61..f108c6e975e8 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -1,2 +1,3 @@
 DIST Faker-17.6.0.tar.gz 1654373 BLAKE2B 69a1d3bcd12188f7d9c0af61d57c62489434fc2fb6a4fea3c45a98d7395c3df83926d260672790d3b88f4b6bcf780e5b842e10b7efb500d503159869505bf4b2 SHA512 a879fb7e0c82693d4d3062b32382eb6d1f3c556c7d2e4c28168cba43c560bf17ebb84b94692ba7db738871251990feca8ccbf271c6e08c61847b76b84deb9680
 DIST Faker-18.2.0.tar.gz 1661956 BLAKE2B e8d7f9cc7cb5d5fd8fe9400311a54613557e072d504bd34944cffa777720484ec950854a6f7ddac8193afec560beaee86661a83a80b10de329db038f5a302d13 SHA512 799251ed4cffa0af3159856846f376bd0c0bb0233188cdcf72e7e5fdbb60841a56ca6ccd696c6a79d13f3dfb7a17e95b904c467d49d02eac4d1eeec6c89ef9f1
+DIST Faker-18.3.0.tar.gz 1662268 BLAKE2B 072dcb435712e0aee52bf0c1fa381ddefe3cd06567f222736fde9520b0d502a91199058910bb2d4fa72b2d0863d2fc62506add4b4b1a4e2c718e6ab4c3ad2e8d SHA512 54c7e4ea1685c0ac52b26bbd1f1bf14d6dd9b2d0919133c449665be9594ea073214a8d3ecbb79fa59a0cdf30dcd911275fd8009e404e65e8bd3aaa07643a3f5a
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index d78bc7044b15..41bf582c1b95 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -4,3 +4,4 @@ DIST argcomplete-2.1.1.tar.gz 54042 BLAKE2B f4d1825306a17a873e3b3a9f23fea20ba29c
 DIST argcomplete-2.1.2.tar.gz 54114 BLAKE2B 19d29eb26c8d77998dcba51c263f49800ff98f22038964faf63d7b5963e8d62ca71ade9493937014f2e030add8a7d1032e2fdffce28765e12164906499cd2bcb SHA512 a91e3c0274c780da173659524f166b98f55342e54fbd38583757e65350b2288ea0e7f5acee7cb83b11478eda1b9b0f82ae6b0f559d7104c4ed67a6e1c9befa24
 DIST argcomplete-3.0.0.tar.gz 54666 BLAKE2B 98ea63847232e17a485f2a5484fc58d2154281046c190c98f542ee9c3e82ee13d4504056a8da29a093632693badb9a93067ad64b28ffa3d58d22de9c0a99f21a SHA512 ecb88f6487fe6b4e7ecd8b504496bd2e4ffb4ca9dc0e27557d6db49b5b07610f6a8560e15cb5a5ad49af71e5b6c1d825a2e8a72731b2c39ba3907c2a9fe0a14f
 DIST argcomplete-3.0.3.tar.gz 54772 BLAKE2B 59ad1fc393f37875c152e7bda958cf185bb4d5cf6b331d4c2847f09a040365449906bdce3eb6bd251d569e3fa50bafbdb2f328c0bcc7f2b7dc2608c562b694d0 SHA512 413407d6f54708d6321b6ab67bab5755084846588aa4fceabe35ea4de95d652887847c6df4739da51ae89aeadac90e0f6cb0e1d92237267fa92502e2c8c27070
+DIST argcomplete-3.0.4.tar.gz 55160 BLAKE2B bb4453d9cfc5a82d77d96068845c4aaa187fd9fef4751d1f115700e496eb97d74fc1c677d0fccfa14ce4ae3dbd205ea68a684d98e88be3731712efe73a5db858 SHA512 0c38f7b2a26045717e1ee52d812d8b9d0688e484201b100b4ad1b7a881e0ef61b793f979d620edcc0a79f512a8e87dbc81b84d17a7857d43192fdd3adc1c6733
diff --git a/dev-python/argcomplete/argcomplete-3.0.4.ebuild b/dev-python/argcomplete/argcomplete-3.0.4.ebuild
new file mode 100644
index 000000000000..4c9150727c75
--- /dev/null
+++ b/dev-python/argcomplete/argcomplete-3.0.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Bash tab completion for argparse"
+HOMEPAGE="
+	https://github.com/kislyuk/argcomplete/
+	https://pypi.org/project/argcomplete/
+"
+
+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"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# pip is called as an external tool
+BDEPEND="
+	test? (
+		app-shells/fish
+		app-shells/tcsh
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pip-19
+	)
+"
+
+src_prepare() {
+	sed -i -e 's:timeout=5:timeout=30:' test/test.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	"${EPYTHON}" test/test.py -v || die
+}
diff --git a/dev-python/fakeredis/Manifest b/dev-python/fakeredis/Manifest
index 83f2961e7935..082c6732d649 100644
--- a/dev-python/fakeredis/Manifest
+++ b/dev-python/fakeredis/Manifest
@@ -1,3 +1,4 @@
 DIST fakeredis-py-2.10.0.gh.tar.gz 160050 BLAKE2B 9c97abe80ca683cd068e3e8616b068c166f08f1b1eb360b76c57da4b9d68396a5dd6fb4152e92dcd73a1407c50e259db54ba5edd61bc2dca774672de84fcf2d3 SHA512 31df18ead5e2937a7a98297f4dc08790371968dd1fa6d9dfa54eb35ab27c2a4a88e2186c252c8a630e0e70fa04e67eccb68e687f9383b6770313cf8b79f6b3bc
 DIST fakeredis-py-2.10.1.gh.tar.gz 159626 BLAKE2B 41d28b57c369273d96a985d6b47c8b162d1fc94c508daae12048e139c9d7bb9c44b39c95eb77cfb06d24cd1b44ccaa65f3d32f4976bfdda72e319d5da1cd69c4 SHA512 5659f5e3a6344448916bfe9ad88fff45b266488aa6d4e0b503f8594308ecfb8e97b1f588b658cb01a5dbe5fc06e64a1bbb6eafaa28aed0b8761b5e15638615ea
+DIST fakeredis-py-2.10.2.gh.tar.gz 159702 BLAKE2B ec385c01af9e32705435148c1c61d74c14d7b22a60b6a3466f1831f557bfe997af6ee96429cfdba00a1328db3cabe1579d65411e7c2b9972e5421963cd66815b SHA512 2a3a87dcbe136465ff0465585562a5b8b0bc73504f491d3ec9c6e959b6cffaa3edbaa1c2e5199138f7a49dfdec3c3da6a2ae338228a8fe21c670a82c062c544a
 DIST fakeredis-py-2.9.2.gh.tar.gz 165549 BLAKE2B 351e07976ed6a4d11429c83aefe3a0e2d4397a97fdb2904ab65ac4d2717d129f5ac018f071b8670012aabe127d87350f3285f6f86369bb4b7eadbd61da5774f7 SHA512 6e9ab0851f74ade2325aad88b86212b4052ca53a7510034cd888ef4080eec4129b226ab8c166ab09fa6e3d3b2c3c70fce8adafdb4081a4d3501fd4d9d5e04b84
diff --git a/dev-python/fakeredis/fakeredis-2.10.2.ebuild b/dev-python/fakeredis/fakeredis-2.10.2.ebuild
new file mode 100644
index 000000000000..c382b83985f0
--- /dev/null
+++ b/dev-python/fakeredis/fakeredis-2.10.2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+
+inherit distutils-r1
+
+MY_P=fakeredis-py-${PV}
+DESCRIPTION="Fake implementation of redis API for testing purposes"
+HOMEPAGE="
+	https://github.com/cunla/fakeredis-py/
+	https://pypi.org/project/fakeredis/
+"
+SRC_URI="
+	https://github.com/cunla/fakeredis-py/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	<dev-python/redis-5[${PYTHON_USEDEP}]
+	>=dev-python/redis-4.2[${PYTHON_USEDEP}]
+	<dev-python/sortedcontainers-3[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.4.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# also lupa
+		test/test_aioredis2.py::test_failed_script_error
+		# TODO
+		"test/test_fakeredis.py::test_set_get_nx[StrictRedis]"
+		"test/test_fakeredis.py::test_lpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_rpop_count[StrictRedis]"
+		"test/test_fakeredis.py::test_zadd_minus_zero[StrictRedis]"
+		"test/test_mixins/test_pubsub_commands.py::test_pubsub_channels[StrictRedis]"
+		test/test_mixins/test_set_commands.py::test_smismember_wrong_type
+	)
+	local EPYTEST_IGNORE=(
+		# these tests fail a lot...
+		test/test_hypothesis.py
+	)
+	local args=(
+		# tests requiring lupa (lua support)
+		-k 'not test_eval and not test_lua and not test_script'
+	)
+	epytest "${args[@]}"
+}
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+
+	einfo "Spawning Redis"
+	einfo "NOTE: Port ${redis_port} must be free"
+	"${EPREFIX}"/usr/sbin/redis-server - <<- EOF || die "Unable to start redis server"
+		daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	EOF
+
+	# Run the tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-tex/glossaries/glossaries-4.52.ebuild b/dev-tex/glossaries/glossaries-4.52.ebuild
index 80c09c47dee5..e942596c22d0 100644
--- a/dev-tex/glossaries/glossaries-4.52.ebuild
+++ b/dev-tex/glossaries/glossaries-4.52.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mirrors.ctan.org/macros/latex/contrib/glossaries.zip -> ${P}.zi
 
 LICENSE="LPPL-1.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="doc examples"
 
 RDEPEND="dev-lang/perl
diff --git a/dev-util/dialog/dialog-1.3.20230209.ebuild b/dev-util/dialog/dialog-1.3.20230209.ebuild
index 2702688c0328..80ca803865ca 100644
--- a/dev-util/dialog/dialog-1.3.20230209.ebuild
+++ b/dev-util/dialog/dialog-1.3.20230209.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="LGPL-2.1"
 SLOT="0/15"
-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="examples minimal nls unicode"
 
 RDEPEND=">=sys-libs/ncurses-5.2-r5:=[unicode(+)?]"
diff --git a/eclass/pypi.eclass b/eclass/pypi.eclass
index ca3b6f67803d..53505de8e67e 100644
--- a/eclass/pypi.eclass
+++ b/eclass/pypi.eclass
@@ -16,7 +16,7 @@
 # the eclass), and the version is translated using
 # pypi_translate_version.
 #
-# If necessary, SRC_URI and S can be overriden by the ebuild.  Two
+# If necessary, SRC_URI and S can be overridden by the ebuild.  Two
 # helper functions, pypi_sdist_url and pypi_wheel_url are provided
 # to generate URLs to artifacts of specified type, with customizable
 # URL components.  Additionally, pypi_wheel_name can be used to generate
diff --git a/media-sound/gpodder/gpodder-3.11.1.ebuild b/media-sound/gpodder/gpodder-3.11.1.ebuild
index d6e67e460c88..08280b1bfa58 100644
--- a/media-sound/gpodder/gpodder-3.11.1.ebuild
+++ b/media-sound/gpodder/gpodder-3.11.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+dbus bluetooth mtp"
 
 RDEPEND="
diff --git a/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild b/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild
index 0e8916b20943..3cba9f8d78c4 100644
--- a/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-3.6.12-r1.ebuild
@@ -18,7 +18,7 @@ else
 	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
 	S="${WORKDIR}/${P/_/}"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild b/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild
index f22f7cd62c6b..df032a655d7c 100644
--- a/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-4.0.4-r1.ebuild
@@ -19,7 +19,7 @@ else
 	S="${WORKDIR}/${P/_/}"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
+		KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv x86"
 	fi
 fi
 
diff --git a/net-misc/iperf/iperf-3.13.ebuild b/net-misc/iperf/iperf-3.13.ebuild
index de4b3812782f..c4b42a8a64fa 100644
--- a/net-misc/iperf/iperf-3.13.ebuild
+++ b/net-misc/iperf/iperf-3.13.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P/_/}
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="sctp"
 
 DEPEND="
diff --git a/sys-apps/uutils-findutils/Manifest b/sys-apps/uutils-findutils/Manifest
index 9b2366ecfcc8..0db2de0eeced 100644
--- a/sys-apps/uutils-findutils/Manifest
+++ b/sys-apps/uutils-findutils/Manifest
@@ -101,7 +101,7 @@ DIST treeline-0.1.0.crate 3855 BLAKE2B 3347bee24c686a6b6890f85b60429d36b14f2738e
 DIST unicode-width-0.1.9.crate 16745 BLAKE2B 38d4b92e47a284d6881a8073089be59a73d82b91efe5522f55be977f95f479890b6c02cd519544729f1b1e62eb21bcfff8c5f5382917f953603b760e39cf1ea7 SHA512 0f5ec46c57e3b5e50cb8430c89db8d9c129e80ca11a9c398b5312bfe95001e19ca3efbfeb01c3ac09c4ce7e26c6ee1f352f7e114ecef78cefd68c54d2d50f5f4
 DIST unicode-xid-0.2.1.crate 14392 BLAKE2B 7f8f91b9c4df55f2137b754208d4f2997a290acfc9393ee2dcda8195eda25cb342e56ad123f56bb298d93db5248a749c18a982423c9a0e85ce93f7a1eb55d289 SHA512 91e862137e837baea82829431cfed36634fdb05339f00c756eb5a4b429ef0bb871f5133d11adf9a023fa22168c8a0cf194ff3669779f04f219d48fc4fac339d2
 DIST uucore-0.0.12.crate 53735 BLAKE2B a534d8a5a1a1ad47d75d00ee120eefa765ba79e5e15650360aa3791d4bc8519cb43244c2435e43037d4df365eb48412e8b393901ff1cde96dba100ff45250cb9 SHA512 f3babbf88a3eda5b59986f57de5647b7181392ab567526b266c79ff96cdbd787d45e2d7035bbec1b3746b1a342c6061548c0e8806ceb2b53cafef572b7a00f5e
-DIST uutils-findutils-0.0.3_p20230215.tar.gz 63963 BLAKE2B d8176b8bd154bce8d25fe665929cfd93760c2c11109f5ed79de334fee6e3b104bc6a8ffa6ebc0fb3ae7adfb5604cae4c0a6398a6ffc56b5e8e2c3d97ae0b7627 SHA512 05aa507ac6913e739fec51a792a2468a46e2cc1b84308b82e8c1dcc460fdcc133f69c49f72deb7f21d0742e74fd2247156fe970bfedc18a79fb9782f276351a8
+DIST uutils-findutils-0.3.0_p20230215.tar.gz 63963 BLAKE2B d8176b8bd154bce8d25fe665929cfd93760c2c11109f5ed79de334fee6e3b104bc6a8ffa6ebc0fb3ae7adfb5604cae4c0a6398a6ffc56b5e8e2c3d97ae0b7627 SHA512 05aa507ac6913e739fec51a792a2468a46e2cc1b84308b82e8c1dcc460fdcc133f69c49f72deb7f21d0742e74fd2247156fe970bfedc18a79fb9782f276351a8
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
 DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
 DIST walkdir-2.3.2.crate 23516 BLAKE2B 473f2b51aafd6ac17e5c3da8d545d179b31486b3a65ab39fbd8bd7fbb2ebcc24bebf01781200a26a68f0b1cb464f5763a919aead3b03eba5a7e1be6efec5500b SHA512 6c44071354faf37720ec4117ded34c8d530489542ee107ac26a7a56ef4a882b9003e22e84f1d61f6078643521343e35aa1f7b57c838779e78e5937a667bf82da
diff --git a/sys-apps/uutils-findutils/uutils-findutils-0.0.3_p20230215.ebuild b/sys-apps/uutils-findutils/uutils-findutils-0.3.0_p20230215.ebuild
index fea72e51df34..fea72e51df34 100644
--- a/sys-apps/uutils-findutils/uutils-findutils-0.0.3_p20230215.ebuild
+++ b/sys-apps/uutils-findutils/uutils-findutils-0.3.0_p20230215.ebuild