16 files changed, 18 insertions, 129 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 38ca429674eb..9261dd1e8711 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 186fae59cb69..777f3fbd2c64 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -9,6 +9,6 @@ DIST dhcpcd-10.2.2.tar.xz 275700 BLAKE2B 95777f7aedc3a68e9873dd69d2c36b0235da31d
 EBUILD dhcpcd-10.1.0-r1.ebuild 4972 BLAKE2B fff05e778865b69889a86e5522e8103e3ec88495ef2efcfd8184681cf22925309673f868e77d502b26ad4cb1709c3ccd180dc498187ca16fd37fde0a7ec9b7d9 SHA512 bfe60a7f0aa12b2703bd3a8320a79850c906f9b450ebb58b9610d3ef5e6b31f185a3626e1d0f0959fd3d3321b3b9fc9a63d80631e3bce48f30576f255163d0ab
 EBUILD dhcpcd-10.1.0.ebuild 4927 BLAKE2B 3dbfb502559abb44bd51cc3f732ae5610c493fae91f1b16e60428ea3ef31922c3d2ec4e75a040b5826607e411c07604d675fc8762c8008ef79982a0adc1a91a9 SHA512 1e4404ce6a14ec4e0bddf7d3eb169fcc50dc91e85951955896380b4798d28a97b02c7b35ebc86453a70f2798d4e72ce6b363ecf212a679f39865fff46987003c
 EBUILD dhcpcd-10.2.0.ebuild 4975 BLAKE2B 80cd65893ab4a5c5b3cd6e9913278d2ecfcb013c40898e3a2f26fcf7ad2f8ac11825ccd26ba633ac420df20d46f6869c3e52c77c7afe286bb7e027262b0f5960 SHA512 5e3d62016332ee3c7c40c1ae2f2e1f23fc416d22a309f6f2f7122fc990a79dbb67f1bce03328abc1a6645a2e8f5cf2468eeac1225ee99539d1612d0f80de8d71
-EBUILD dhcpcd-10.2.2.ebuild 4935 BLAKE2B 2a5789402ae1b1f4b6a049ca45f98ebddb10a45c4d8753d60346e6ee69287b2d99bc566fa1573d6d97c281b9e1912f85d84e395a7f5d011198e20af417313951 SHA512 902a31842e545c59ff3955706306066cd34b0d8b46a8e588370c4943df64415845a080672458c4233c9188474342c6965a8b1c3da64c9954c2f608687a743cef
+EBUILD dhcpcd-10.2.2.ebuild 4929 BLAKE2B 289c25dd9b2d324e87038bd5e85e96bd39060100da8edb165ae7e67740e0b70fb484281d1d0de55df4c1117b293be580c85bd11a2a61ba144ae8b7f0d180ba9f SHA512 3f48e484e1c8a61f99c3d845ef8c636ee8487881ec29abf16ec5d780ba8bccd07e626f96d84cd39828cd3043897977f6df2d262d063491915abcb62bb1e831b5
 EBUILD dhcpcd-9999.ebuild 4935 BLAKE2B c5c7a630572305a52a7edb2f9c329c3314393a94896f7b538c6e613d05eeb35eff0059186ad402c05a29130af09f231f3d8d712df413c6d6088ceb9376b52780 SHA512 d0edccb3d0047d4adf3f694f0c7625914de2e552e7aa8ef189ced54399469622cdb3a340549eb4017b391eb765d93095fd21312d78e7b7ab537c290ec07fa251
 MISC metadata.xml 714 BLAKE2B 2ee7c968d6c9285404d5cd22afdf2d62db42af2d3d35f7784dffe80d448ea96dec7dcaa2d4784aa35ab7002de5784b191a71cb854eeede645fb3bf018c19f37b SHA512 44cb0105baac58bc24a7ff3d868ab2eb01d7f1447ca5f6ab830c60d8dc46212bb064bdb67d48bb86908aa9803b5dc887fd51733fccda8338828317f10895ea45
diff --git a/net-misc/dhcpcd/dhcpcd-10.2.2.ebuild b/net-misc/dhcpcd/dhcpcd-10.2.2.ebuild
index fcfca62700dc..ff37dac240ee 100644
--- a/net-misc/dhcpcd/dhcpcd-10.2.2.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-10.2.2.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest
index e18a18c4fdc1..f07c6282163a 100644
--- a/net-misc/gallery-dl/Manifest
+++ b/net-misc/gallery-dl/Manifest
@@ -3,7 +3,7 @@ DIST gallery-dl-1.29.0.gh.tar.gz 807857 BLAKE2B 9ac82c216099a12b89e9c64437ecd773
 DIST gallery-dl-1.29.2.gh.tar.gz 820020 BLAKE2B 9164c697ed888d211726229d5b904c013665abf56d332945e8870e51487644bfc30290a992d0531a362837435052201894239c4ac67862a3b1421a30adf5cf56 SHA512 5d1cf2b9d6f51ffa363c4c33f82b99b673640d73962130f142759a5be88c62f09c58653e3a3f435f7ebf82f640e44cdafad785d93948c932a7a5a9243fe29dac
 DIST gallery-dl-1.29.3.gh.tar.gz 828081 BLAKE2B cb58ba324940034de3bde678c183f2bbc72eb5bc04cb874792df576fc6327dacd3b73ccbe11f157606dc2ecfe0e0e9d30469f574efdeab2a8d31191c50947816 SHA512 0a59e344c00f5db9a147a1c62aea55d18d5fb17e73dc4234d682b6aa0c6c457990dcba7f28e79dc03400aa491a7c04228ce3e6ee815a716211f4757ccaf4f706
 EBUILD gallery-dl-1.28.5.ebuild 1153 BLAKE2B bcea9112ac53a1fc0d03fb1d88905c7f5724d62fe7ea33bf839e1c58303f73f26f9a344e0da25631c70e64a36e6be68e620b0a0312c95fcfc8b0e068214ab6dc SHA512 8f8a0765363a040a5319176f0daf4260602edf64571bcf6dc80ac3ba31bf849aa469683b35d91d128443936d2050c54ad50bf037d329c015917e93db04bf8b2a
-EBUILD gallery-dl-1.29.0.ebuild 1160 BLAKE2B 876d8b23fd2073d5b84982dd03335de20320cdc14206237f19fd8df4945527bd6f1e64789f24cfd223afae6318bec60ebe35fa94ac540590cb59ac867599aa64 SHA512 cdf1d59f5acdcfcf97e8d886f15e234da2064d34fb5090bd976d803ca4c2c36096c83c419dd6ec371608fe6c65c054c6d94e2a724f7785f337674c8ca869ab8a
+EBUILD gallery-dl-1.29.0.ebuild 1153 BLAKE2B bcea9112ac53a1fc0d03fb1d88905c7f5724d62fe7ea33bf839e1c58303f73f26f9a344e0da25631c70e64a36e6be68e620b0a0312c95fcfc8b0e068214ab6dc SHA512 8f8a0765363a040a5319176f0daf4260602edf64571bcf6dc80ac3ba31bf849aa469683b35d91d128443936d2050c54ad50bf037d329c015917e93db04bf8b2a
 EBUILD gallery-dl-1.29.2.ebuild 1160 BLAKE2B 876d8b23fd2073d5b84982dd03335de20320cdc14206237f19fd8df4945527bd6f1e64789f24cfd223afae6318bec60ebe35fa94ac540590cb59ac867599aa64 SHA512 cdf1d59f5acdcfcf97e8d886f15e234da2064d34fb5090bd976d803ca4c2c36096c83c419dd6ec371608fe6c65c054c6d94e2a724f7785f337674c8ca869ab8a
 EBUILD gallery-dl-1.29.3.ebuild 1160 BLAKE2B 876d8b23fd2073d5b84982dd03335de20320cdc14206237f19fd8df4945527bd6f1e64789f24cfd223afae6318bec60ebe35fa94ac540590cb59ac867599aa64 SHA512 cdf1d59f5acdcfcf97e8d886f15e234da2064d34fb5090bd976d803ca4c2c36096c83c419dd6ec371608fe6c65c054c6d94e2a724f7785f337674c8ca869ab8a
 EBUILD gallery-dl-9999.ebuild 1165 BLAKE2B 51e7568c9f9e34ffdb20055f96ca9b91ce2f6831ea304028c88c43dfd4fbda0ff8bbaa310553e73a1b73408c12c2633af18e09e53e0127034f257ab6d90c7cee SHA512 0948a7989105ff3df14ccb9b71aa3cce1e67e053e9e52ea6823afca40863ea8fd16a50d53fea4b2aff9020bf7db110bbf534a85fca184d730999835b305bcfac
diff --git a/net-misc/gallery-dl/gallery-dl-1.29.0.ebuild b/net-misc/gallery-dl/gallery-dl-1.29.0.ebuild
index 8bb9fcbbb941..4689de7ec568 100644
--- a/net-misc/gallery-dl/gallery-dl-1.29.0.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.29.0.ebuild
@@ -20,7 +20,7 @@ else
 	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-misc/miniupnpd/Manifest b/net-misc/miniupnpd/Manifest
index 6f71ca21ef80..7e1d59d0807d 100644
--- a/net-misc/miniupnpd/Manifest
+++ b/net-misc/miniupnpd/Manifest
@@ -1,12 +1,9 @@
 AUX miniupnpd-conf.d-r2 430 BLAKE2B 4f38d9dcbe3843770cab82b5f26b6bc23067dc58c20cebfbd355364ff6fadb6a9f5787c1f8d22a950774e3b2ebf70670bec0391247c3205a7ab2d926e9598102 SHA512 d011770e3a5aa5c4f45c77009e168c4dd1c25b2abe4b1a93ac3a22c0a6d9903f3b83a87569ec456d79e9d6b3be3af9b3f9c2327f40cc59bead25a3abe29421d9
 AUX miniupnpd-init.d-r2 1002 BLAKE2B f697e4cbf3ab08f4b589705ae1cc3ae28f94647103f7a30c8277c02375db6128a2c804c0514ad4cc32fd3d46becc38c0dcd9a7c0ef8befd1ef07ac051509bbfe SHA512 7b773987bdbad18d5c6ff8e2e15484b8f0c28ff3b3be0e832e7b568dc2a93d96eb27acfecb33251b48d92cea557f71b3c5e6c4a6a5e4ae428571d1810e5ce856
-DIST miniupnpd-2.3.5.tar.gz 261952 BLAKE2B 022ddbc495a2dbb500ab54a3c0569a16acf3726927eac42dc316b7251dd21e705be62e3d0bb2e159ff7a5a72078bae2c04bd279d0a97fe2bf378dc8c039089d8 SHA512 bbb82f1b94a68c1bbf65a2e188b39305ec265cb89d9c0f3ab2d3c72eee43ee33c7d6280161344a8d51828cba2e62e2e5f9a54b0c0089503dbed5cd3a154ff0ff
-DIST miniupnpd-2.3.5.tar.gz.sig 543 BLAKE2B 17394e1da7d95c89771dd7578e4f1e2ce407c04b142f44fe4f110beff908797991553a7275c3ba28df03b09877963d16092cb718d4c75d96211db07226bcb176 SHA512 ef21f493da56b9f3fe99003ee299c08b13ddcf433d7136222817ff2e1c775bf7c28cbb47ef3ab60c662380e585c2be0ca4c38e261697de410f5a751c1f4fe2da
-DIST miniupnpd-2.3.6.tar.gz 263018 BLAKE2B 9e3d6bfdbe71a09a15bf11c1a718b1388db991de52a2ec742aaec70128e4ac5147f441ccfa50e7077f09682ac724040343c4e351b4cc8c3d9e8efe04773651ec SHA512 41ed8d0afcfdba70ab5ec44a33ad4643b226bea2da972fc432035fd3ff3a790227a71c32ca47574558e36eb491b0f6ab7710d3ef0af5ac6a359d899dcb36893c
-DIST miniupnpd-2.3.6.tar.gz.sig 543 BLAKE2B 5c5c3566a9dfd16d95ca70fa006f7ce7097aebfe76940c03c22047064d5dae92aed73062f2455f08b61a99a747f9615e72c06e178628d948532b987b40fb262f SHA512 312a9db9cbd74912294a7cc2d4ccc69634806fc58702083fda56e11ad1fd978e92ad71f217cadf5f4482e8e655df07e6d7cc52ae494b8167140ae4db74cd352d
 DIST miniupnpd-2.3.7.tar.gz 265329 BLAKE2B 9d7cbe04644c6811950328f402e4666fc8d51cf022a3ec40e4cc76c0f8a1c89b6703fe4ebe8d5eca7f6cef20acad7efbc47503dad4391d1519a6774ae6b26afd SHA512 7409bd6777c2a572ea501d47be604d9b09c09b1451c0f4150acd2313e3a5b4f7f3567559324a6c634c11a2b7c0ff56886a85217d1b056d5402916d0a8a3408e8
 DIST miniupnpd-2.3.7.tar.gz.sig 543 BLAKE2B 957b5dad44b020004a38b6f4748ca251deaadfc8ade28332eb12484e4bac408f5afdb38fe9974f18bc17a28dd33aae91a287838c7c15984bc5df7f69a82f9c6f SHA512 b8edd3f69b61e63560fb902f43e0a1730c80908637978782a1141fe8ac910b24f578ee3980127f4726c44e44222491a83670adea36a19984b3ffd726b12fe0dc
-EBUILD miniupnpd-2.3.5.ebuild 2361 BLAKE2B 72e1f38f9c24ce443aa6a4320c287b9f9f64a088d4e481de936aa0cd3062a3723b38bce50aecdb43c362ae81ba780c9ac31ec01b3c03527b2ac9b9861ef5e634 SHA512 9ad0036463ef1a7dba8d45cf197db26f50251bfa082a49447e6e581ac8d54363f288a6f4e339b29f02794afde249b8361ff1ea51f8d6a79b6e5b0381b371d4bc
-EBUILD miniupnpd-2.3.6.ebuild 2361 BLAKE2B 72e1f38f9c24ce443aa6a4320c287b9f9f64a088d4e481de936aa0cd3062a3723b38bce50aecdb43c362ae81ba780c9ac31ec01b3c03527b2ac9b9861ef5e634 SHA512 9ad0036463ef1a7dba8d45cf197db26f50251bfa082a49447e6e581ac8d54363f288a6f4e339b29f02794afde249b8361ff1ea51f8d6a79b6e5b0381b371d4bc
+DIST miniupnpd-2.3.8.tar.gz 301264 BLAKE2B 3194460cf91b7a9f290b52a461a133ce139d355c5470e4ed0fc6c4e8d4ac8f1e12fb54771be1cfae6c9507a1858e5097af2a8b3e987d97ec75241a20c1a738d6 SHA512 18cbaaf804dfcf42edbd9be0719e6137fbe6876a6a967a20b6f64ed8bf25a8977fe71c5ad9c8b8427badf9753e6f8d5f970b27e3d23dddfe9ba34cc183ec1917
+DIST miniupnpd-2.3.8.tar.gz.sig 543 BLAKE2B dffe65f44b2aa4085414c6ccbc7bf96ba2c7bfa32e9aae7c03b59db377ad667cff2b6c176d2836a1141cfdabd198a2529fc891434518c2635cb7206eb7397d08 SHA512 7cbc9ad00bfa119be0cdeca6276745e8db8197e1f29b896d6e8423181ccf49bd1a9d5f16cd8e938cc46c68b706627eb69be30ec4bb179ba3595727a001e331ef
 EBUILD miniupnpd-2.3.7.ebuild 2361 BLAKE2B 72e1f38f9c24ce443aa6a4320c287b9f9f64a088d4e481de936aa0cd3062a3723b38bce50aecdb43c362ae81ba780c9ac31ec01b3c03527b2ac9b9861ef5e634 SHA512 9ad0036463ef1a7dba8d45cf197db26f50251bfa082a49447e6e581ac8d54363f288a6f4e339b29f02794afde249b8361ff1ea51f8d6a79b6e5b0381b371d4bc
+EBUILD miniupnpd-2.3.8.ebuild 2361 BLAKE2B 92319ead7e0d83bcbbf2e4e0df0288c4ce3675015ca5e64fae6e104bb3f8a08b82748ccf2a124d54b52acff9668fbaa8a59687f04aaa8a108e16ede2448b03a5 SHA512 2a76b3feacccc95b5b269e84336ccd093cba84aa1723dec74c002fad41a11b4a942339d580f8dceb73b6fe1afe76905d029f2f2efdfa081d783b5e81764c151c
 MISC metadata.xml 985 BLAKE2B 4df9a4cf573d7aa45b80bc5062682325c3e063fd4b6147164dcc2a4e1b859def25df4541e1859c8843153c9de3a74557a3b66c94b69a65a94162752e177a907e SHA512 2068b103e2804c899ab17f63ae0aaf46442252067d6a8c12e7cc94c0b8760f5d764cf4124be78079236611cd05d7c5016b1b08499d1c265c561193344dfdeba6
diff --git a/net-misc/miniupnpd/miniupnpd-2.3.6.ebuild b/net-misc/miniupnpd/miniupnpd-2.3.6.ebuild
deleted file mode 100644
index ef90208e7b6d..000000000000
--- a/net-misc/miniupnpd/miniupnpd-2.3.6.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs verify-sig
-
-DESCRIPTION="MiniUPnP IGD Daemon"
-HOMEPAGE="
-	http://miniupnp.free.fr/
-	https://miniupnp.tuxfamily.org/
-	https://github.com/miniupnp/miniupnp/
-"
-SRC_URI="
-	https://miniupnp.tuxfamily.org/files/${P}.tar.gz
-	verify-sig? (
-		https://miniupnp.tuxfamily.org/files/${P}.tar.gz.sig
-	)
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+leasefile igd2 ipv6 nftables pcp-peer portinuse strict"
-
-RDEPEND="
-	dev-libs/gmp:0=
-	sys-apps/util-linux:=
-	dev-libs/openssl:0=
-	!nftables? (
-		>=net-firewall/iptables-1.4.6:0=[ipv6(+)?]
-		net-libs/libnfnetlink:=
-		net-libs/libmnl:=
-	)
-	nftables? (
-		net-firewall/nftables
-		net-libs/libnftnl:=
-		net-libs/libmnl:=
-	)
-"
-DEPEND="
-	${RDEPEND}
-	elibc_musl? ( sys-libs/queue-standalone )
-"
-BDEPEND="
-	sys-apps/lsb-release
-	verify-sig? ( sec-keys/openpgp-keys-miniupnp )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/miniupnp.asc
-
-src_prepare() {
-	default
-
-	# fails without a default route
-	sed -i -e 's:EXTIF=.*:EXTIF=lo:' testgetifaddr.sh || die
-}
-
-src_configure() {
-	local opts=(
-		--vendorcfg
-		$(usex igd2 '--igd2' '')
-		$(usex ipv6 '--ipv6' '')
-		$(usex leasefile '--leasefile' '')
-		$(usex portinuse '--portinuse' '')
-		$(usex pcp-peer '--pcp-peer' '')
-		$(usex strict '--strict' '')
-		--firewall=$(usex nftables nftables iptables)
-	)
-
-	# custom script
-	./configure "${opts[@]}" || die
-	# prevent gzipping manpage
-	sed -i -e '/gzip/d' Makefile || die
-}
-
-src_compile() {
-	# By default, it builds a bunch of unittests that are missing wrapper
-	# scripts in the tarball
-	emake CC="$(tc-getCC)" STRIP=true miniupnpd
-}
-
-src_test() {
-	emake CC="$(tc-getCC)" check
-}
-
-src_install() {
-	emake PREFIX="${ED}" STRIP=true install
-
-	local confd_seds=()
-	if use nftables; then
-		confd_seds+=( -e 's/^iptables_scripts=/#&/' )
-	else
-		confd_seds+=( -e 's/^nftables_scripts=/#&/' )
-	fi
-	if ! use ipv6 || use nftables; then
-		confd_seds+=( -e 's/^ip6tables_scripts=/#&/' )
-	fi
-
-	newinitd "${FILESDIR}"/${PN}-init.d-r2 ${PN}
-	newconfd - ${PN} < <(sed "${confd_seds[@]}" \
-		"${FILESDIR}"/${PN}-conf.d-r2 || die)
-}
-
-pkg_postinst() {
-	elog "Please correct the external interface in the top of the two"
-	elog "scripts in /etc/miniupnpd and edit the config file in there too"
-}
diff --git a/net-misc/miniupnpd/miniupnpd-2.3.5.ebuild b/net-misc/miniupnpd/miniupnpd-2.3.8.ebuild
index ef90208e7b6d..b6194e2f4f1c 100644
--- a/net-misc/miniupnpd/miniupnpd-2.3.5.ebuild
+++ b/net-misc/miniupnpd/miniupnpd-2.3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 1356ac5e180a..f62f83ad2bbc 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -24,6 +24,6 @@ DIST openssh-9.8p1.tar.gz.asc 833 BLAKE2B 5291e8c03ab9a75acb44285cd7fc010f4a3355
 DIST openssh-9.9p2.tar.gz 1944499 BLAKE2B 1b5bc09482b3a807ccfee52c86c6be3c363acf0c8e774862e0ae64f76bfeb4ce7cf29b3ed2f99c04c89bb4977da0cf50a7a175b15bf1d9925de1e03c66f8306d SHA512 4c6d839aa3189cd5254c745f2bd51cd3f468b02f8e427b8d7a16b9ad017888a41178d2746dc51fb2d3fec5be00e54b9ab7c32c472ca7dec57a1dea4fc9840278
 DIST openssh-9.9p2.tar.gz.asc 833 BLAKE2B 21d9ef3da2b54be47420327f1c724e38eef951ea11d646de81ac3ee2abf3d81f218424432cf5ac7d60cdae72e2190001f923dbdf5bed57f4a105ee1895261c9d SHA512 e7f9bc74d27e5cf8cbf4f5831fddd1d8ad00b03e51e7deb7f95ef17c5017ab7ce0116f4770374aaf6bd3a5f6013dab651a7651b21fa303d05ad6d14b537ab955
 EBUILD openssh-9.8_p1-r3.ebuild 15365 BLAKE2B 51da05b6b53b1326871328aa14387f10794de1e643f18a14b9ecc51830d3ebbfa772d1402bd86d3a118d5be1fb0760e7f608ddd7cd93b960617ad86f5a66beb7 SHA512 f3e294a30591621c96acf1ab054b2f84801b8ad9eb0932597a6eeda7b3b0cc01560c21944954dc6d9da6f4eaafa34592def5a2a80c27c113e48fe194a986f83d
-EBUILD openssh-9.9_p2-r3.ebuild 15495 BLAKE2B c277036e9d462351c661e57e471497c3beef6204a91f1e73f10b4473929aa76329098a02dd1fc4fda35db81d32fb00d509d3317bdc138f37007bcc01ab0176e9 SHA512 c03866a6a83d20ab5a2683fb5f8a8a6039870adbc3d79bf2c1873fa3510c005f4a578e78121cd44584c1d49776ebca5df9f9c0da01a54587b656d8f3bf7a0759
+EBUILD openssh-9.9_p2-r3.ebuild 15488 BLAKE2B c0dd779432bbdd069279fb8d156fcef45ec3bcbb7cc07ad3ab9309f6bf1ca3e1b886be134d3575a991411e7879846dc66d5b1acb36e1dac5d6a3b944942e8599 SHA512 044082922b276508f2a08fa1d75d5aa7b7bc12d2a8636ce18d746c417ab9935184fd4fb71f087225edc528a1c669ecf089251fa15c9fb97d9ef66bd8a7e2cc92
 EBUILD openssh-9.9_p2.ebuild 15413 BLAKE2B 4cea0069b0038e1d0e4c25b3405801c77b4662438de7ffb42b87cc10591c4a73f414890f3f2c1051ecc00ab38744faad944865d3b3b467dc234659166f227644 SHA512 97166d8243f244fe939b68ed86541a5fdd44c6576552226fe3b720ee1cf60d268e8818184d7ea64986d2cedd3ecf9b9063a06fe074e91f48b0d35bc1e6936b8e
 MISC metadata.xml 1967 BLAKE2B 9e586a4c515035bc31be950c3872c379e01dae2cc460239cde37b83d6ca8494d36d1e1f858195b34af76074a966278c323ab24ba5e78adfa70be297c1f21336f SHA512 83563c27789a4c12149f037d9318b66d6caf383a82f0f6f7025378bd2a3017d41ff96b5aea3d08e4407d85f3d1a089a51ae6c7fa3970c20b2d8d721962ddbf69
diff --git a/net-misc/openssh/openssh-9.9_p2-r3.ebuild b/net-misc/openssh/openssh-9.9_p2-r3.ebuild
index 1b34d10467ef..15d81449d593 100644
--- a/net-misc/openssh/openssh-9.9_p2-r3.ebuild
+++ b/net-misc/openssh/openssh-9.9_p2-r3.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${PARCH}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 # Probably want to drop ssl defaulting to on in a future version.
 IUSE="abi_mips_n32 audit debug kerberos ldns legacy-ciphers libedit livecd pam +pie security-key selinux +ssl static test xmss"
 
diff --git a/net-misc/rclone/Manifest b/net-misc/rclone/Manifest
index ba9cca7dbc44..d770bd79b225 100644
--- a/net-misc/rclone/Manifest
+++ b/net-misc/rclone/Manifest
@@ -3,5 +3,5 @@ DIST rclone-1.69.0.gh.tar.gz 16939883 BLAKE2B ec65092e661297397419443ee678c7bb7c
 DIST rclone-v1.69.1-vendor.tar.gz 13831747 BLAKE2B 327c38cf386232b40963c89158c289705906760d97440e79e943a8c33d84366806e83604de0c69855c14b4ef2144f1a812ac3906e8dda896fd191dde36faa9ee SHA512 bd7c9b634bd8d165339ded0c38c5dea995f8eb13a9d9a6315ce375b8a5c09d2024bd504f6a8721294922c241db73c5159fb7c4f84de69f2a67b57fb43b9cf84a
 DIST rclone-v1.69.1.tar.gz 16906745 BLAKE2B 2b701cacd169c1519a5e67199fa7c7b5938137b7baab1db276b70e4ac7c0e303e8ef1870a691a0534b399b89eff3a6f4d8d7930f1a3bebd175be1e47e4e9a8b8 SHA512 355a2295b0478de84475889663d7e7fb818f840c983e812e67de205eed725f1b2f00d667e66c0cec82a18af363dd7986a0f2cdd0ace4a2c81ffe167457238d3a
 EBUILD rclone-1.69.0-r1.ebuild 1491 BLAKE2B f2def41985506ed64e1b6379a2d6544378a74d8d6137e32ac09adbdf2045e458572b4811a695264cb6ddb0e8563ecb312a231b07e30c1c4012a41fb3f58e82de SHA512 5ff94ae63de5058b31e4cec6894baeacb5ba7fd1b9a18ed2199527002a2bcab1f3d8119094d496e9b7758334871831d0cbac4ff9130eb1c7af8ee35ab1756e7c
-EBUILD rclone-1.69.1-r1.ebuild 1675 BLAKE2B 36cc00c19f3da40afca40f3a421d488d4c486b32fb226a2cba76f020732b6418469c9fb7d27da9ae62e55c80dfa86021a5a332b01ebe3b2bfe9930b54c29ec0d SHA512 a071140bedcdf51d0640198f9cba2922db423810ae17040743a8de8cf33ddb16644e288afcbec46191581de950e9985f0876c5498125d2ef6206a8d01505bc99
+EBUILD rclone-1.69.1-r1.ebuild 1673 BLAKE2B 3fc9ba62b50b0d1e5d7c4c1023904697f5f6570e718ed33ab74a2b350501c542d37344f553aa1430e619c22ed374429e27d5e3e4064b206b655cb465bb7522a3 SHA512 96f2642269052671d9f9e9f6c09587d34bae20a35a33a59c08ce31d5e5f4b66e3258de927cf2fa5ff9d3c588a6453595ecc77ab04cd5579dc79fa92b845ca6b6
 MISC metadata.xml 546 BLAKE2B 810399fdf5969d7862199e98fe8382c65e87b1d7a7af5e0aa7f1c8c1351d4794781c8076879983c429f62ff74c870943583d00878596683349e01fbea8285b26 SHA512 9f8c26b6fc993c91c0f3033d1e33ccedd2a173697e6660fa6d27955b522b7764ff2d2bfa0706d4222001606b60e432486e1e11e72534f5d5d60f01be0dc4309f
diff --git a/net-misc/rclone/rclone-1.69.1-r1.ebuild b/net-misc/rclone/rclone-1.69.1-r1.ebuild
index 2fff2fb8786c..c7629f1704d6 100644
--- a/net-misc/rclone/rclone-1.69.1-r1.ebuild
+++ b/net-misc/rclone/rclone-1.69.1-r1.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/rclone-v${PV}
 
 LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 
 RDEPEND="
 	sys-fs/fuse:3=
diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
index 3159fa6d09c9..ee77f4251da4 100644
--- a/net-misc/streamlink/Manifest
+++ b/net-misc/streamlink/Manifest
@@ -1,6 +1,6 @@
-DIST streamlink-7.1.2.tar.gz 772724 BLAKE2B 0a5165e0ec33c127272e4f232fc0ee421bafc54147a1e99424bbbd45ebb41ee2d8bae4fa68e278c1ddf26e8bc9cfe401616e108a2a1fa93fa34d4561046028f4 SHA512 da552336700a0b7e391435aa3e369d0f8b2868a13e15dd5110869a67d164b6775f924fe09839c00bf9f5d9ce0935380ec8c0996fdc58b82c6bbe5e6c6f89ec04
 DIST streamlink-7.1.3.tar.gz 772024 BLAKE2B 8635302f316b3988010aab4aad2a7becd2b0b92e34357510da783681b54c34eb859ba065c65d4904c294275df0ceaf11e5440c196e62d09400592f4a2a63d8b7 SHA512 77ec1f4fb00c3ba708593060c980d6a1bda0dcf7ca8b5583dd97025b5a48cba540ced776f3d146818daa7f1fa16d8d72854c14b2ca039680d9a16a039fdba268
-EBUILD streamlink-7.1.2.ebuild 2228 BLAKE2B 0291adcdd2820ba73fc2342a1691776f3a55d25a4910011219b6f489acbd02edc6afdcd613728bdfc526c28dbb0d038e088fcd6607483088efde0edd7ebbe177 SHA512 c0c45b76ab0b6665719970fb04314b54679791e7a43873772167e911238d51d12b7cdb1ea7835194ba39609bbe9d9401c02db04acac473710a4ed9bb09b4e8e2
+DIST streamlink-7.2.0.tar.gz 781653 BLAKE2B eeb9230b3c2cd6595407f45224148e470d8424542c5e11b5f1aa278086bcbe115f3d1ff5d55d0ac058a322fb3191ebea3926d06f88eee095188c0397bb0f6147 SHA512 b7465e017d72235e1eb5cd03ec4c262a90578517d62b5ba64f741263147a7c2d3f30472b8474f62d6c11ef83c2c18268ee36d5127d6e8de24b65adac10cf0880
 EBUILD streamlink-7.1.3.ebuild 2228 BLAKE2B 1c1899598e01120e80da49d78f616f8a01ea9476075174c7bfc44344e171b90150dccfeda92026a3eb9f4557fd30afe9d17c500792f97755ee3f347a3ad32f61 SHA512 4af6ff4956078a6b941f0d053f2f34a1bdd916007cadc8452d4f1747bdf8236c0403fffe613e4a9abc446a400cd5fb018c41572afe3e2effc1d8a9b78cafc00a
+EBUILD streamlink-7.2.0.ebuild 2229 BLAKE2B 666205f714c06a2a43913d627e919f0f29c65c686d3834cc898535397d3f75c2c1e7302269fc97e9b9277313697ae1dbfac5e01d2532595a827081ae6f917163 SHA512 9ade72e3de44ccbbc2794e46dd49cdc7c2d01ba54e01780f3ebdd62233936f0353b02cf82b1f32b4b72ce000c731d8920eb80dd367f76c1e6ca88b2ed2767940
 EBUILD streamlink-9999.ebuild 2229 BLAKE2B 666205f714c06a2a43913d627e919f0f29c65c686d3834cc898535397d3f75c2c1e7302269fc97e9b9277313697ae1dbfac5e01d2532595a827081ae6f917163 SHA512 9ade72e3de44ccbbc2794e46dd49cdc7c2d01ba54e01780f3ebdd62233936f0353b02cf82b1f32b4b72ce000c731d8920eb80dd367f76c1e6ca88b2ed2767940
 MISC metadata.xml 398 BLAKE2B 43aa67d43256cecb95b788e4bab999f73b7b624fa1af0432aa87ffa94071f09e29eab6733468d6607eeb7aa9f81030610dfbcd849f9cb9196d80181ea5712f74 SHA512 2db05f8a1196e44e632b4ee1d85f804d295eb53141cf176e85cbe90cc30e0fee382a5e798e4cc7fd63557d60687d05a671533c2188a2fcf497f6e95292190149
diff --git a/net-misc/streamlink/streamlink-7.1.2.ebuild b/net-misc/streamlink/streamlink-7.2.0.ebuild
index fce4d6a6efa7..bea32382bb39 100644
--- a/net-misc/streamlink/streamlink-7.1.2.ebuild
+++ b/net-misc/streamlink/streamlink-7.2.0.ebuild
@@ -26,7 +26,7 @@ fi
 LICENSE="BSD-2 Apache-2.0"
 SLOT="0"
 if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 # See https://github.com/streamlink/streamlink/commit/9d8156dd794ee0919297cd90d85bcc11b8a28358 for chardet/charset-normalizer dep
@@ -58,7 +58,7 @@ BDEPEND="
 		>=dev-python/setuptools-64[${PYTHON_USEDEP}]
 		>=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}]
 		test? (
-			>=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}]
+			>=dev-python/freezegun-1.5.0[${PYTHON_USEDEP}]
 			dev-python/pytest-trio[${PYTHON_USEDEP}]
 			dev-python/requests-mock[${PYTHON_USEDEP}]
 		)
diff --git a/net-misc/tuba/Manifest b/net-misc/tuba/Manifest
index 9c0731754d89..dd3a4213d308 100644
--- a/net-misc/tuba/Manifest
+++ b/net-misc/tuba/Manifest
@@ -1,5 +1,5 @@
 DIST Tuba-0.8.4.gh.tar.gz 1803987 BLAKE2B 9ec1647bc255a3cef37293fc86f81eed534f4a313e3ec0ab81318766972ed01100b30afcc05448f5344637da08962bb72dc2eb5d44fc0561ce1a61c48b9b8b5d SHA512 8484cdb898174958c1e79ddfd6fab9e74693bca19d1eddde504679d1074cac986580dcf2e2c98fa13ab54fec2a4ffc25b1977bc6e62f1b3a524a6810b2ac268f
 DIST Tuba-0.9.2.gh.tar.gz 2190160 BLAKE2B f4d0f6c1bca6da011fb19a42a34fc3773e5f2693075a9ac7d5d30d78701371e42c326482baa548688431022cf09661e78bac71da42c7e4b99652c57fa1eb5ee8 SHA512 2243a796fd5fb6fb8ce16640d0d5d49e64ad01736413408ca9825ef0ded3ccc2caa5daf7ce45685f0cfbb85100d34703ede4a59b235d371232f2c03a7a126ae1
 EBUILD tuba-0.8.4.ebuild 1485 BLAKE2B 086983f0f203ccd28029a0e7f9f7181bbcc9400f1f32f08c877f3a138da74bfa14d969e6006e9540bf8a3ea73f1091e4d5c11bd7620d29539cf2c023d2af0049 SHA512 7e2e5f094c2922ad9cab185df380d492ac833e55fc0d058685eef197e8a08a76dfa589b97df5dcc9bf4729add269b9816add99fba68a26b6bcb462a41f54d14b
-EBUILD tuba-0.9.2.ebuild 1524 BLAKE2B a7b6b62116cb358f046f484fe6f102fcfaef2589fd4352bd44df2eb4e351a06b6a5ed0170c928b03be0e4613131285c60797ab4a478b6421099e16537d820ad4 SHA512 06e337c7fda37dd5088c4358ac313f5db99cd6a9416264e874d6c5e4fab5e9e8b65d00dcd8a0cf7a4ef346bb1864d754f0aa8fef1d2da087342631a689a480ea
+EBUILD tuba-0.9.2.ebuild 1523 BLAKE2B 2ce96ace75813c37d56bf86578379523e416382ff2809fa865525946a77b72b14fa366b955c0ce2e07a4a0c315696351c33969ba672a3353f45a3fcf1fb56f30 SHA512 320ba7b07390fc78ac84719432ddd68db6b663fb5d088653f1c07148c3b6696e4cc7141526e2b041a20c53496023cd1e848ae9966683cf4e811ead7a5e07139c
 MISC metadata.xml 324 BLAKE2B b9364b6c365bfaeda33ec6e0600582271501e80f0af0c075545a9d577e823bc4ce35ec37903f2f7f1f22c016b6bb0e7c40ef7d9ba8882fb924a865491bbb8dc7 SHA512 867574ad6665a12cb09aa75c525de101955dabdea5b744e688ab0b7214482ca5d151ed2007c5b050fbc69c48205fdbe5784aea0cb7ebce455d785200048b0a41
diff --git a/net-misc/tuba/tuba-0.9.2.ebuild b/net-misc/tuba/tuba-0.9.2.ebuild
index 09c732985f1f..32015c478655 100644
--- a/net-misc/tuba/tuba-0.9.2.ebuild
+++ b/net-misc/tuba/tuba-0.9.2.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3 CC-BY-SA-4.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 
 # TODO: optional dep on libspelling-1
 DEPEND="