gentoo auto-resync : 22:02:2025 - 00:16:22

17 files changed, 15 insertions, 728 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 6f92245252c3..f07d9faf9d41 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index 1884f761674c..b8362d69e526 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -1,23 +1,11 @@
-AUX dropbear-0.46-dbscp.patch 432 BLAKE2B 93f27fb4f5806d7a5e637ccc3ed14b6929d25b395d4731807895761a3cec76de8fcc154db85bb4913214ecac4f65a85489e0091d36c213be38b7b1f7719d5694 SHA512 071a346dbd98490a1ad967b582bb54ef07c45bb25e3b130eb7f22405dd361d6a54061a800e687385f37b2efd4057efcac8e4d07506b9100e51a334c0be12e2d6
-AUX dropbear-2022.82-tests.patch 820 BLAKE2B 8b8d7bbc80962fd4be56078d54c12097bd6cedf8cf11ca1b07a3fb39ebd795e3be9f2183482e7e3b06d1be644a2b9afcde372362c6cd4a2baf8f3254cc63b00a SHA512 4ddc65f2e1e86f50fff732d3141b18a3a5260755715e46bcfb5c5e4a261f9c22dff48c19797de972f61b9bb526d0b93f067832c38229c2c1a7e630d30dfcba01
 AUX dropbear-2024.84-dbscp.patch 440 BLAKE2B e0fd05c59a289e605c6b50e740b1f714bb14fd3c5ec3fb1c9a3d003d52ea28494bb26898e5771aab9af23c686b26601641d1333c5636bcb752e119a0b4af1a17 SHA512 8850dc3fc9e7a36970a9388d06dae1789fccc3b564a33efc75d328d875fff67ecb7f8d4e2b200710137ffcd333f22aa457723b843b1bfe81c613012583a58cd1
-AUX dropbear-2024.84-fix-aslr-test-no-venv.patch 489 BLAKE2B 8fe5d284b11c5ebfb3474877278550adb0813e8e8a776b900ce83a8a61c9ce0f2633beb20766c916c5544dd5db44cf92db660b37307bea2a1423db48e221b1bd SHA512 dba51eba70c08b29ee01bf0303e432531bfd0c9d44c19866ee894042bf67471e9fd3c09142d972ddfcc2bac6c0d7aa68219b0019527250bd4eea17dd364772cb
-AUX dropbear-2024.84-fix-channels-tests.patch 1233 BLAKE2B e06ebd5b9b6ef3efa2d2c103bb5a54eb9748aeb7ec16a741abac67f232ad6e9a8a9e84ff6dd4cb1818903dbbafdbbc0c3969a24aa5e00b5ecd3c927d669525c3 SHA512 db07cb4dbf504192b53c4f89b7b52def06dc08536f6d00bff5c015e87676890938a44aabfeff518cb4db0517a2464af57f8339b3bfdfb2d9f037c389dc88007b
 AUX dropbear-2024.84-non-interactive-tests-no-syslog.patch 294 BLAKE2B 66658bb831c2a555bf3b40e5e6ab0e93534db67bfef57285bb2fa59282390170085c096dd8624201c4200c3e4da938c665ab4d7a5e6b26726bfff6d19d861d08 SHA512 79d702d79cac7c12e224e85653fb1bb2b7a08017cbad8ed13e25c7b14bcfe39bfa05a31a2532dab550947868972bcfaf79bf4ab09e87f6a60d8a1734bbbda962
 AUX dropbear-2024.84-non-interactive-tests.patch 300 BLAKE2B 5055d8abee9234cd9a5325bc6fcd4cea2794a8ebe7660afb30727ca893f8caedf3c73e8d0f9a90f0348d58f6569e0f68d18887c2f6b2ab5b3fcde9566c47f16d SHA512 68949b92339e2421e518595aada28ca4c7eec8f7734087e4753da4f7794a038f1fceae61b505ee8f7ac22890ef0ffebac8b773c7e53a5704d584a89670886127
 AUX dropbear-2024.84-test-bg-sleep.patch 530 BLAKE2B 96836fae965d463eab7fba7f5cf3a358e7fac0281739f9911441d5afdb986495caa0ebb7f6e05978fa1740ae6aa6a009f674e8c071718a64e4cb305b4532ddba SHA512 b5758b3f21b1ddf127d2d95363708c67bbe2b584850c7b693a825093222046ffb6682b700a2ef71245d28d147d1ee4fe6dbc96a0e8132aa85fcbc4229d54db4b
-AUX dropbear-2024.84-tests.patch 2296 BLAKE2B c00997667892049c14e877f503843628f9074bb7b99488eb4b6ce98b9b42d20cde375a8158c8a25104c04a6e6404cc0053491780d7c933ad69987ac380647c7b SHA512 1ff5b8dd16fc7f6918b7413bd1b1881d254a0c79340658eef2cd3ab32d95c6a8869cc12d156de54dc9834ebc021c845a90f7a5b19914d21de7c88598f6b72877
 AUX dropbear-2024.86-tests.patch 2438 BLAKE2B 70a1d1067255d38ec13920998310638a237dcc6cdb8af56f91439b327d687dee039cde626d6f3a17a676d8f700aed5e4c4a9294dbac4cb2d146e684574b05a29 SHA512 2d6e3b4aa78ce8fbcdbb74adc83d87f81ffb1d1bcce5fe12c9a4b3115f7ede3095823c59f6b5bac0fa7f393d8482a85c14012038bab02831bdbaa8191e077303
 AUX dropbear.conf.d 190 BLAKE2B b89e59ae84f23f00162d78cb900e4fef05fe01123a6ee7533ed3d39625f43580012591b2cf8dcc9ea5f093a64d3ed81fa590c44389bacb369b9123929ca2bb69 SHA512 83f2c1eaf7687917a4b2bae7d599d4378c4bd64f9126ba42fc5d235f2b3c9a474d1b3168d70ed64bb4101cc251d30bc9ae20604da9b5d819fcd635ee4d0ebb0f
 AUX dropbear.init.d 735 BLAKE2B e3d3c388033934da2e8ea684b9f380cb92147ae359434fd9a03523f683ab553a50dbb8cb879f4bdd12d59b40ddc8d8bede19be7fe9904298a1e273a14a4603ca SHA512 5b8dd52125360967c43d0a3a4ae8748eb33be2fe23b4d54d81cddfb0ef7e6a78b011e3028f41adab7706f83a292bbc8f07711a02c29e6a89488db72aa3ff259d
-DIST dropbear-2022.83.tar.bz2 2322904 BLAKE2B 4e26667458fb068a8c997b44dfd3c4f15146f051713a3ea90980db04c6345174d34214269665d74c863c1c1947d6837034aa4c264101b11971c8a3e97f491393 SHA512 c63afa615d64b0c8c5e739c758eb8ae277ecc36a4223b766bf562702de69910904cbc3ea98d22989df478ae419e1f81057fe1ee09616c80cb859f58f44175422
-DIST dropbear-2022.83.tar.bz2.asc 833 BLAKE2B 7dfcf13804738aed3136c264412f8c2f96cd3ff71482815af736346c9441c8f00adef26f4e8f89082cbbb4033249501adbc545c08f678e1cac4afc88a8fc9ed0 SHA512 e5cbd01dcbaeabb04dc473bd11933a422fda03ceb5bc02fb5c99abafd0841e3ac1f436cc1798500b33fbbc81923fa03c2a28c971fa26794ed5888d496fb7e2ad
-DIST dropbear-2024.85.tar.bz2 2304594 BLAKE2B 631b71733437a256267057a1c4846afa4d520fa9e29d9c14dfa7df09109c30cc2d649ada990a15c615567f7a1d6ff02340799216b7fa41327d72cb43dd9096e0 SHA512 09619e9874172658b7fc284823e0a619b6a4346a5db41487d1628768b46c1f8eac962bfd8ef73e2a59e466fc4022395f7a194b4309195c954b0d7e0d13254f67
-DIST dropbear-2024.85.tar.bz2.asc 833 BLAKE2B 1d0cc37fb1c528c6f7f6e064d3ec3d7c63617b568d8889592ca162171a325a46e84a23f24c16069b5396c806b2270434552833138ba95c7f34c8b5e6e425fcc7 SHA512 d2ad10b60f53d8d598a7a57337fe890c26c60bea115fb919f6135a01fe3f8f7e5863b0a7ed6c7eacbd5a3b810169b600c0004251a8d748d4b40584933c2c7383
 DIST dropbear-2024.86.tar.bz2 2306244 BLAKE2B 988e2cc03c123685c93ab8b1148b1844cecc78aa12ad00d48f737e74fdae24f8c0397b91dc343b7fb996ffcf986804f32ffd1b886edf13d158b6f914545c883a SHA512 6be3d2efd79e49e1f9fe13654c26b9c14d1504c9543720e59600f6d689aafae7365b4a0bbfa309f7bf692995672adbbd9e660b2c907ea3d68d9f71023d05f54e
 DIST dropbear-2024.86.tar.bz2.asc 833 BLAKE2B 5fc35fb4135f099c2204972d3fc365b01b2622eeadf4cf6093496176e5a4010c1fbe36056036fe370e1a1ffb05d86293e212d935a3b4c5d8b0005eae09423edc SHA512 b7dbae281b21d5d1dfbb311f6a94a2c1acd3ab44a3293baffa885194d24721ec8067e907b414ebc0b5d77bb32c511fcd5c31008b6622b946e8d253621012836f
-EBUILD dropbear-2022.83-r1.ebuild 4433 BLAKE2B 6cd0edb8789dcabbfaaed58db535ee6bca645ea687eb2e2d5f15d0fd16b370cdd1075d99960315492182065219b11823101db489233b8ea26392f0c4e9e41776 SHA512 61ab7e9ea1856586e8e15e4089be296a2d2730fe236ea3d07ddf2652ec3cf123d07ec782d0d7bb51e96ef537c09b4421f83a6ef04fa5253e4536740aa66f3854
-EBUILD dropbear-2024.85-r1.ebuild 5062 BLAKE2B d6c63a168ef0e040794cca2cdbc4b77ad386bf34f3c6d3073d5d7fd30ebec8af213f709958e0832fc626e2c18bd38f5fcf1bca4b7573ffe28fa2c79555720af5 SHA512 033e4d740310b0ab6efd00ab1df08239058b613f31843aa679015755c25c75c8dfa248efe46ced583eb52fbe6f9c9d817936a9f4cbfb2f4de4e1ad6cfbd49ab3
-EBUILD dropbear-2024.85-r2.ebuild 5403 BLAKE2B 65dbe02b17c3712815fc35c7d9a586585effd447d1dccc4251fa312ec467649289096c809a0255bf1af967b937e8eefe85a12e3d27f5065822cb92924357425f SHA512 6a096bc2b06b8dfe34e907fa9dcd8e06cd0309c8c6397ebc8cbfa38bc2aca6d928a65c673815903db537dadf79b520e89e87644304239487ba4822e9d44d1ab1
 EBUILD dropbear-2024.86-r1.ebuild 5859 BLAKE2B ae93f5140b0e01a7081413919c1dff211db448cd1410c5ee75641124f8eaa203833aa23181f9b43cd529098f6fd8c71b7e700ccfe3feb7d2c652cd3131385944 SHA512 da93b8436f00d14218b0a33b6076a9d502981752e1bb899c539520501c8e1b756a6d2cc34fd698d7be56ddd1981dbd08ee8cef46641cff4a893acc06864e0352
 MISC metadata.xml 2144 BLAKE2B 44954b29ea4dfb4008a9411303c502ef2fffee30f16df24a7f6fc7e1969c24209bf88f59a67e32ef422544ae51d46a846a819a8004efad825da702fff7f3af91 SHA512 ff59f6d316473fa41905ff92112f2b57b929668e04730fa88f7af405ee6a1e308a82119b896a5612120cd1cd2bdbea0e8dc8b0d419b7f472b22fa66a89638fe5
diff --git a/net-misc/dropbear/dropbear-2022.83-r1.ebuild b/net-misc/dropbear/dropbear-2022.83-r1.ebuild
deleted file mode 100644
index b8904fa6ad31..000000000000
--- a/net-misc/dropbear/dropbear-2022.83-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..11} )
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dropbear.asc
-inherit savedconfig pam python-any-r1 verify-sig
-
-DESCRIPTION="Small SSH 2 client/server designed for small memory environments"
-HOMEPAGE="https://matt.ucc.asn.au/dropbear/dropbear.html"
-SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
-	https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
-SRC_URI+=" verify-sig? (
-		https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2.asc
-		https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2.asc
-	)"
-
-LICENSE="MIT GPL-2" # (init script is GPL-2 #426056)
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="bsdpty minimal multicall pam +shadow static +syslog test zlib"
-RESTRICT="!test? ( test ) test"
-
-LIB_DEPEND="
-	virtual/libcrypt[static-libs(+)]
-	zlib? ( sys-libs/zlib[static-libs(+)] )
-"
-RDEPEND="
-	acct-group/sshd
-	acct-user/sshd
-	!static? (
-		>=dev-libs/libtomcrypt-1.18.2-r2[libtommath]
-		>=dev-libs/libtommath-1.2.0
-		${LIB_DEPEND//\[static-libs(+)]}
-	)
-	pam? ( sys-libs/pam )
-"
-DEPEND="
-	${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-"
-RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
-BDEPEND="
-	test? (
-		$(python_gen_any_dep '
-			dev-python/attrs[${PYTHON_USEDEP}]
-			dev-python/iniconfig[${PYTHON_USEDEP}]
-			dev-python/packaging[${PYTHON_USEDEP}]
-			dev-python/pluggy[${PYTHON_USEDEP}]
-			dev-python/py[${PYTHON_USEDEP}]
-			dev-python/pyparsing[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/psutil[${PYTHON_USEDEP}]
-		')
-	)
-	verify-sig? ( sec-keys/openpgp-keys-dropbear )
-"
-
-REQUIRED_USE="pam? ( !static )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.46-dbscp.patch
-	"${FILESDIR}"/${PN}-2022.82-tests.patch
-)
-
-set_options() {
-	progs=(
-		dropbear dbclient dropbearkey
-		$(usex minimal "" "dropbearconvert scp")
-	)
-	makeopts=(
-		MULTI=$(usex multicall 1 0)
-	)
-}
-
-python_check_deps() {
-	python_has_version "dev-python/attrs[${PYTHON_USEDEP}]" && \
-		python_has_version "dev-python/iniconfig[${PYTHON_USEDEP}]" && \
-		python_has_version "dev-python/packaging[${PYTHON_USEDEP}]" && \
-		python_has_version "dev-python/pluggy[${PYTHON_USEDEP}]" && \
-		python_has_version "dev-python/py[${PYTHON_USEDEP}]" && \
-		python_has_version "dev-python/pyparsing[${PYTHON_USEDEP}]" && \
-		python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" && \
-		python_has_version "dev-python/psutil[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-
-	if use static ; then
-		ewarn "Using bundled copies of libtommath and libtomcrypt"
-	fi
-}
-
-src_prepare() {
-	default
-	sed \
-		-e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
-		default_options.h > localoptions.h || die
-	sed \
-		-e '/pam_start/s:sshd:dropbear:' \
-		-i svr-authpam.c || die
-	restore_config localoptions.h
-}
-
-src_configure() {
-	# Notes:
-	# 1) We use bundled libtom* when static build is enabled because
-	#    libtomcrypt lacks it and we don't particularly want to add it.
-	# 2) We disable the hardening flags as our compiler already enables them
-	#    by default as is appropriate for the target.
-	local myeconfargs=(
-		--disable-harden
-
-		# bug #836900
-		$(use_enable !elibc_musl lastlog)
-		$(use_enable !elibc_musl wtmp)
-
-		$(use_enable static bundled-libtom)
-		$(use_enable zlib)
-		$(use_enable pam)
-		$(use_enable !bsdpty openpty)
-		$(use_enable shadow)
-		$(use_enable static)
-		$(use_enable syslog)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	set_options
-	emake "${makeopts[@]}" PROGRAMS="${progs[*]}"
-}
-
-src_install() {
-	set_options
-	emake "${makeopts[@]}" PROGRAMS="${progs[*]}" DESTDIR="${D}" install
-	doman *.8
-	newinitd "${FILESDIR}"/dropbear.init.d dropbear
-	newconfd "${FILESDIR}"/dropbear.conf.d dropbear
-	dodoc CHANGES README SMALL MULTI
-
-	# The multi install target does not install the links right.
-	if use multicall ; then
-		cd "${ED}"/usr/bin || die
-		local x
-		for x in "${progs[@]}" ; do
-			ln -sf dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed"
-		done
-		rm -f dropbear
-		dodir /usr/sbin
-		dosym ../bin/dropbearmulti /usr/sbin/dropbear
-		cd "${S}" || die
-	fi
-	save_config localoptions.h
-
-	if ! use minimal ; then
-		mv "${ED}"/usr/bin/{,db}scp || die
-	fi
-
-	if use pam; then
-		pamd_mimic system-remote-login dropbear auth account password session
-	fi
-}
diff --git a/net-misc/dropbear/dropbear-2024.85-r1.ebuild b/net-misc/dropbear/dropbear-2024.85-r1.ebuild
deleted file mode 100644
index abe2ffa42674..000000000000
--- a/net-misc/dropbear/dropbear-2024.85-r1.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dropbear.asc
-inherit pam python-any-r1 savedconfig verify-sig
-
-DESCRIPTION="Small SSH 2 client/server designed for small memory environments"
-HOMEPAGE="https://matt.ucc.asn.au/dropbear/dropbear.html"
-SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
-	https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
-SRC_URI+=" verify-sig? (
-		https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2.asc
-		https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2.asc
-	)"
-
-LICENSE="MIT GPL-2" # (init script is GPL-2 #426056)
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="bsdpty minimal multicall pam +shadow static +syslog test zlib"
-RESTRICT="!test? ( test )"
-
-LIB_DEPEND="
-	virtual/libcrypt[static-libs(+)]
-	zlib? ( sys-libs/zlib[static-libs(+)] )
-"
-RDEPEND="
-	acct-group/sshd
-	acct-user/sshd
-	!static? (
-		>=dev-libs/libtomcrypt-1.18.2-r2[libtommath]
-		>=dev-libs/libtommath-1.2.0
-		${LIB_DEPEND//\[static-libs(+)]}
-	)
-	pam? ( sys-libs/pam )
-"
-DEPEND="
-	${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-"
-RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
-BDEPEND="
-	test? (
-		sys-libs/nss_wrapper
-		$(python_gen_any_dep '
-			dev-python/attrs[${PYTHON_USEDEP}]
-			dev-python/iniconfig[${PYTHON_USEDEP}]
-			dev-python/packaging[${PYTHON_USEDEP}]
-			dev-python/pluggy[${PYTHON_USEDEP}]
-			dev-python/py[${PYTHON_USEDEP}]
-			dev-python/pyparsing[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/psutil[${PYTHON_USEDEP}]
-		')
-	)
-	verify-sig? ( sec-keys/openpgp-keys-dropbear )
-"
-
-REQUIRED_USE="pam? ( !static )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2024.84-dbscp.patch
-	"${FILESDIR}"/${PN}-2022.82-tests.patch
-	"${FILESDIR}"/${PN}-2024.84-non-interactive-tests.patch
-	"${FILESDIR}"/${PN}-2024.84-fix-channels-tests.patch
-	"${FILESDIR}"/${PN}-2024.84-test-bg-sleep.patch
-)
-
-set_options() {
-	progs=(
-		dropbear dbclient dropbearkey
-		$(usev !minimal "dropbearconvert scp")
-	)
-	makeopts=(
-		MULTI=$(usex multicall 1 0)
-	)
-}
-
-python_check_deps() {
-	python_has_version "dev-python/attrs[${PYTHON_USEDEP}]" && \
-		python_has_version "dev-python/iniconfig[${PYTHON_USEDEP}]" && \
-		python_has_version "dev-python/packaging[${PYTHON_USEDEP}]" && \
-		python_has_version "dev-python/pluggy[${PYTHON_USEDEP}]" && \
-		python_has_version "dev-python/py[${PYTHON_USEDEP}]" && \
-		python_has_version "dev-python/pyparsing[${PYTHON_USEDEP}]" && \
-		python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" && \
-		python_has_version "dev-python/psutil[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-
-	if use static ; then
-		ewarn "Using bundled copies of libtommath and libtomcrypt"
-	fi
-}
-
-src_prepare() {
-	default
-	sed \
-		-e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
-		-e '/DROPBEAR_X11FWD/s:0:1:' \
-		src/default_options.h > localoptions.h || die
-	sed \
-		-e '/pam_start/s:sshd:dropbear:' \
-		-i src/svr-authpam.c || die
-	restore_config localoptions.h
-
-	# remove tests that fail
-	rm test/test_aslr.py || die
-
-	# dropbearconver is not build with USE minimal
-	if use minimal; then
-		rm test/test_dropbearconvert.py || die
-	fi
-}
-
-src_configure() {
-	# Notes:
-	# 1) We use bundled libtom* when static build is enabled because
-	#    libtomcrypt lacks it and we don't particularly want to add it.
-	# 2) We disable the hardening flags as our compiler already enables them
-	#    by default as is appropriate for the target.
-	local myeconfargs=(
-		--disable-harden
-
-		# bug #836900
-		$(use_enable !elibc_musl lastlog)
-		$(use_enable !elibc_musl wtmp)
-
-		$(use_enable static bundled-libtom)
-		$(use_enable zlib)
-		$(use_enable pam)
-		$(use_enable !bsdpty openpty)
-		$(use_enable shadow)
-		$(use_enable static)
-		$(use_enable syslog)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	set_options
-	emake "${makeopts[@]}" PROGRAMS="${progs[*]}"
-
-	# need symlinks for tests
-	if use multicall && use test; then
-		local x
-		for x in "${progs[@]}" ; do
-			ln -sf dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed"
-		done
-	fi
-}
-
-src_install() {
-	set_options
-	emake "${makeopts[@]}" PROGRAMS="${progs[*]}" DESTDIR="${D}" install
-	doman manpages/*.8
-	newinitd "${FILESDIR}"/dropbear.init.d dropbear
-	newconfd "${FILESDIR}"/dropbear.conf.d dropbear
-	dodoc CHANGES README.md SMALL.md MULTI.md
-
-	# The multi install target does not install the links right.
-	if use multicall ; then
-		pushd "${ED}"/usr/bin &> /dev/null || die
-		local x
-		for x in "${progs[@]}" ; do
-			ln -sf dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed"
-		done
-		rm -f dropbear
-		dodir /usr/sbin
-		dosym -r /usr/bin/dropbearmulti /usr/sbin/dropbear
-		popd &> /dev/null || die
-	fi
-	save_config localoptions.h
-
-	if ! use minimal ; then
-		mv "${ED}"/usr/bin/{,db}scp || die
-	fi
-
-	if use pam; then
-		pamd_mimic system-remote-login dropbear auth account password session
-	fi
-}
diff --git a/net-misc/dropbear/dropbear-2024.85-r2.ebuild b/net-misc/dropbear/dropbear-2024.85-r2.ebuild
deleted file mode 100644
index 0d668a45761a..000000000000
--- a/net-misc/dropbear/dropbear-2024.85-r2.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/dropbear.asc
-inherit pam python-any-r1 savedconfig verify-sig
-
-DESCRIPTION="Small SSH 2 client/server designed for small memory environments"
-HOMEPAGE="https://matt.ucc.asn.au/dropbear/dropbear.html"
-SRC_URI="https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
-	https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2"
-SRC_URI+=" verify-sig? (
-		https://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2.asc
-		https://matt.ucc.asn.au/dropbear/testing/${P}.tar.bz2.asc
-	)"
-
-LICENSE="MIT GPL-2" # (init script is GPL-2 #426056)
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="bsdpty minimal multicall pam +shadow static +syslog test zlib"
-RESTRICT="!test? ( test )"
-
-LIB_DEPEND="
-	virtual/libcrypt[static-libs(+)]
-	zlib? ( sys-libs/zlib[static-libs(+)] )
-"
-RDEPEND="
-	acct-group/sshd
-	acct-user/sshd
-	!static? (
-		>=dev-libs/libtomcrypt-1.18.2-r2[libtommath]
-		>=dev-libs/libtommath-1.2.0
-		${LIB_DEPEND//\[static-libs(+)]}
-	)
-	pam? ( sys-libs/pam )
-"
-DEPEND="
-	${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-"
-RDEPEND+=" pam? ( >=sys-auth/pambase-20080219.1 )"
-BDEPEND="
-	test? (
-		sys-libs/nss_wrapper
-		$(python_gen_any_dep '
-			dev-python/attrs[${PYTHON_USEDEP}]
-			dev-python/iniconfig[${PYTHON_USEDEP}]
-			dev-python/packaging[${PYTHON_USEDEP}]
-			dev-python/pluggy[${PYTHON_USEDEP}]
-			dev-python/py[${PYTHON_USEDEP}]
-			dev-python/pyparsing[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/psutil[${PYTHON_USEDEP}]
-		')
-	)
-	verify-sig? ( sec-keys/openpgp-keys-dropbear )
-"
-
-REQUIRED_USE="pam? ( !static )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2024.84-dbscp.patch
-	"${FILESDIR}"/${PN}-2024.84-tests.patch
-	"${FILESDIR}"/${PN}-2024.84-test-bg-sleep.patch
-	"${FILESDIR}"/${PN}-2024.84-fix-aslr-test-no-venv.patch
-)
-
-set_options() {
-	progs=(
-		dropbear dbclient dropbearkey
-		$(usev !minimal "dropbearconvert scp")
-	)
-	makeopts=(
-		MULTI=$(usex multicall 1 0)
-	)
-}
-
-python_check_deps() {
-	python_has_version "dev-python/attrs[${PYTHON_USEDEP}]" && \
-		python_has_version "dev-python/iniconfig[${PYTHON_USEDEP}]" && \
-		python_has_version "dev-python/packaging[${PYTHON_USEDEP}]" && \
-		python_has_version "dev-python/pluggy[${PYTHON_USEDEP}]" && \
-		python_has_version "dev-python/py[${PYTHON_USEDEP}]" && \
-		python_has_version "dev-python/pyparsing[${PYTHON_USEDEP}]" && \
-		python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" && \
-		python_has_version "dev-python/psutil[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-
-	if use static ; then
-		ewarn "Using bundled copies of libtommath and libtomcrypt"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# dropbear does not accept -E if built w/o syslog support and fails the tests
-	if use syslog; then
-		eapply "${FILESDIR}"/${PN}-2024.84-non-interactive-tests.patch
-	else
-		eapply "${FILESDIR}"/${PN}-2024.84-non-interactive-tests-no-syslog.patch
-	fi
-
-	sed \
-		-e '/SFTPSERVER_PATH/s:".*":"/usr/lib/misc/sftp-server":' \
-		-e '/DROPBEAR_X11FWD/s:0:1:' \
-		src/default_options.h > localoptions.h || die
-	sed \
-		-e '/pam_start/s:sshd:dropbear:' \
-		-i src/svr-authpam.c || die
-	restore_config localoptions.h
-
-	use test && python_fix_shebang test/parent_dropbear_map.py
-
-	# dropbearconver is not built with USE minimal
-	if use minimal; then
-		rm test/test_dropbearconvert.py || die
-	fi
-
-	# bsdpty requires CONFIG_LEGACY_PTYS in kernel; disable tests.
-	# bug #939601
-	if use bsdpty; then
-		rm test/test_channels.py || die
-	fi
-}
-
-src_configure() {
-	# Notes:
-	# 1) We use bundled libtom* when static build is enabled because
-	#    libtomcrypt lacks it and we don't particularly want to add it.
-	# 2) We disable the hardening flags as our compiler already enables them
-	#    by default as is appropriate for the target.
-	local myeconfargs=(
-		--disable-harden
-
-		# bug #836900
-		$(use_enable !elibc_musl lastlog)
-		$(use_enable !elibc_musl wtmp)
-
-		$(use_enable static bundled-libtom)
-		$(use_enable zlib)
-		$(use_enable pam)
-		$(use_enable !bsdpty openpty)
-		$(use_enable shadow)
-		$(use_enable static)
-		$(use_enable syslog)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	set_options
-	emake "${makeopts[@]}" PROGRAMS="${progs[*]}"
-
-	# need symlinks for tests
-	if use multicall && use test; then
-		local x
-		for x in "${progs[@]}" ; do
-			ln -sf dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed"
-		done
-	fi
-}
-
-src_install() {
-	set_options
-	emake "${makeopts[@]}" PROGRAMS="${progs[*]}" DESTDIR="${D}" install
-	doman manpages/*.8
-	newinitd "${FILESDIR}"/dropbear.init.d dropbear
-	newconfd "${FILESDIR}"/dropbear.conf.d dropbear
-	dodoc CHANGES README.md SMALL.md MULTI.md
-
-	# The multi install target does not install the links right.
-	if use multicall ; then
-		pushd "${ED}"/usr/bin &> /dev/null || die
-		local x
-		for x in "${progs[@]}" ; do
-			ln -sf dropbearmulti ${x} || die "ln -s dropbearmulti to ${x} failed"
-		done
-		rm -f dropbear
-		dodir /usr/sbin
-		dosym -r /usr/bin/dropbearmulti /usr/sbin/dropbear
-		popd &> /dev/null || die
-	fi
-	save_config localoptions.h
-
-	if ! use minimal ; then
-		mv "${ED}"/usr/bin/{,db}scp || die
-	fi
-
-	if use pam; then
-		pamd_mimic system-remote-login dropbear auth account password session
-	fi
-}
diff --git a/net-misc/dropbear/files/dropbear-0.46-dbscp.patch b/net-misc/dropbear/files/dropbear-0.46-dbscp.patch
deleted file mode 100644
index ea0d17066d68..000000000000
--- a/net-misc/dropbear/files/dropbear-0.46-dbscp.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/dbmulti.c
-+++ b/dbmulti.c
-@@ -60,7 +60,7 @@
- 		}
- #endif
- #ifdef DBMULTI_scp
--		if (strcmp(progname, "scp") == 0) {
-+		if ((strcmp(progname, "scp") == 0) || (strcmp(progname, "dbscp") == 0)) {
- 			return scp_main(argc, argv);
- 		}
- #endif
-@@ -81,7 +81,7 @@
- 			"'dropbearconvert' - the key converter\n"
- #endif
- #ifdef DBMULTI_scp
--			"'scp' - secure copy\n"
-+			"'dbscp' - secure copy\n"
- #endif
- 			,
- 			DROPBEAR_VERSION);
diff --git a/net-misc/dropbear/files/dropbear-2022.82-tests.patch b/net-misc/dropbear/files/dropbear-2022.82-tests.patch
deleted file mode 100644
index 6619e6c07551..000000000000
--- a/net-misc/dropbear/files/dropbear-2022.82-tests.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/test/Makefile.in
-+++ b/test/Makefile.in
-@@ -4,18 +4,13 @@ SHELL=bash
- 
- all: test
- 
--test: venv/bin/pytest fakekey
--	(source ./venv/bin/activate; pytest --hostkey=fakekey --dbclient=../dbclient --dropbear=../dropbear $(srcdir) )
-+test: fakekey
-+	pytest --hostkey=fakekey --dbclient=../dbclient --dropbear=../dropbear $(srcdir)
- 
--one: venv/bin/pytest fakekey
--	(source ./venv/bin/activate; pytest --hostkey=fakekey --dbclient=../dbclient --dropbear=../dropbear $(srcdir) -k exit)
-+one: fakekey
-+	pytest --hostkey=fakekey --dbclient=../dbclient --dropbear=../dropbear $(srcdir) -k exit
- 
- fakekey:
- 	../dropbearkey -t ecdsa -f $@
- 
--venv/bin/pytest: $(srcdir)/requirements.txt
--	python3 -m venv init venv
--	./venv/bin/pip install --upgrade pip
--	./venv/bin/pip install -r $(srcdir)/requirements.txt
--
- .PHONY: test
diff --git a/net-misc/dropbear/files/dropbear-2024.84-fix-aslr-test-no-venv.patch b/net-misc/dropbear/files/dropbear-2024.84-fix-aslr-test-no-venv.patch
deleted file mode 100644
index 62e87f230974..000000000000
--- a/net-misc/dropbear/files/dropbear-2024.84-fix-aslr-test-no-venv.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-We don't use a venv for this test, remove it.
-
---- a/test/test_aslr.py
-+++ b/test/test_aslr.py
-@@ -9,9 +9,7 @@
- 	This indicates that re-exec makes ASLR work
- 	"""
- 	map_script = (Path(request.node.fspath).parent / "parent_dropbear_map.py").resolve()
--	# run within the same venv, for python deps
--	activate = own_venv_command()
--	cmd = f"{activate}; {map_script}"
-+	cmd = f"{map_script}"
- 	print(cmd)
- 	r = dbclient(request, cmd, capture_output=True, text=True)
- 	map1 = r.stdout.rstrip()
diff --git a/net-misc/dropbear/files/dropbear-2024.84-fix-channels-tests.patch b/net-misc/dropbear/files/dropbear-2024.84-fix-channels-tests.patch
deleted file mode 100644
index 0db292da8332..000000000000
--- a/net-misc/dropbear/files/dropbear-2024.84-fix-channels-tests.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-dbclient obeys $HOME, but dropbear (the server) resolves HOME using getpwnam.
-Use sys-libs/nss_wrapper to fake it during tests.
-
---- a/test/Makefile.in
-+++ b/test/Makefile.in
-@@ -4,7 +4,15 @@ SHELL=bash
- 
- all: test
- 
-+uid:=$(shell id -u)
-+gid:=$(shell id -g)
- test: fakekey
-+	mkdir -p ~/.ssh
-+	../dropbearkey -t ecdsa -f ~/.ssh/id_dropbear
-+	../dropbearkey -y -f ~/.ssh/id_dropbear | grep ^ecdsa > ~/.ssh/authorized_keys
-+	echo "$(LOGNAME)::$(uid):$(gid):$(USER):$(HOME):/bin/bash" >> ~/passwd
-+	echo "$(LOGNAME)::$(gid):" >> ~/group
-+	chmod 0700 ~ ~/.ssh ~/.ssh/authorized_keys ~/passwd ~/group
- 	pytest --hostkey=fakekey --dbclient=../dbclient --dropbear=../dropbear $(srcdir)
- 
- one: fakekey
---- a/test/test_dropbear.py
-+++ b/test/test_dropbear.py
-@@ -27,7 +27,11 @@ def dropbear(request):
- 		]
- 	print("subprocess args: ", args)
- 
--	p = subprocess.Popen(args, stderr=subprocess.PIPE, text=True)
-+	env = os.environ
-+	env['LD_PRELOAD'] = 'libnss_wrapper.so'
-+	env['NSS_WRAPPER_PASSWD'] = env['HOME'] + '/passwd'
-+	env['NSS_WRAPPER_GROUP'] = env['HOME'] + '/group'
-+	p = subprocess.Popen(args, stderr=subprocess.PIPE, text=True, env=env)
- 	# Wait until it has started listening
- 	for l in p.stderr:
- 		if "Not backgrounding" in l:
diff --git a/net-misc/dropbear/files/dropbear-2024.84-tests.patch b/net-misc/dropbear/files/dropbear-2024.84-tests.patch
deleted file mode 100644
index a7c53a42884e..000000000000
--- a/net-misc/dropbear/files/dropbear-2024.84-tests.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Create all the keys needed for the tests.
-Enable testing server auth.
-
-dbclient obeys $HOME, but dropbear (the server) resolves HOME using getpwnam.
-Use sys-libs/nss_wrapper to fake it during tests.
-
---- a/test/Makefile.in
-+++ b/test/Makefile.in
-@@ -4,18 +4,24 @@
- 
- all: test
- 
--test: venv/bin/pytest fakekey
--	(source ./venv/bin/activate; pytest --hostkey=fakekey --dbclient=../dbclient --dropbear=../dropbear $(srcdir) )
-+uid:=$(shell id -u)
-+gid:=$(shell id -g)
-+test: fakekey
-+	mkdir -p ~/.ssh
-+	../dropbearkey -t ecdsa -f ~/.ssh/id_dropbear
-+	../dropbearkey -y -f ~/.ssh/id_dropbear | grep ^ecdsa > ~/.ssh/authorized_keys
-+	../dropbearkey -t ecdsa -f ~/.ssh/id_dropbear_key2 | grep ^ecdsa | sed 's/[^ ]*$$/key2 extra/' >> ~/.ssh/authorized_keys
-+	../dropbearkey -t ecdsa -f ~/.ssh/id_dropbear_key3 | grep ^ecdsa | sed 's/[^ ]*$$/key3%char/' >> ~/.ssh/authorized_keys
-+	../dropbearkey -t ecdsa -f ~/.ssh/id_dropbear_key4 | grep ^ecdsa | sed 's/[^ ]*$$/key4,char/' >> ~/.ssh/authorized_keys
-+	echo "$(LOGNAME)::$(uid):$(gid):$(USER):$(HOME):/bin/bash" >> ~/passwd
-+	echo "$(LOGNAME)::$(gid):" >> ~/group
-+	chmod 0700 ~ ~/.ssh ~/.ssh/authorized_keys ~/passwd ~/group
-+	DBTEST_IN_ACTION=y pytest --hostkey=fakekey --dbclient=../dbclient --dropbear=../dropbear $(srcdir)
- 
--one: venv/bin/pytest fakekey
--	(source ./venv/bin/activate; pytest --hostkey=fakekey --dbclient=../dbclient --dropbear=../dropbear $(srcdir) -k exit)
-+one: fakekey
-+	pytest --hostkey=fakekey --dbclient=../dbclient --dropbear=../dropbear $(srcdir) -k exit
- 
- fakekey:
- 	../dropbearkey -t ecdsa -f $@
- 
--venv/bin/pytest: $(srcdir)/requirements.txt
--	python3 -m venv init venv
--	./venv/bin/pip install --upgrade pip
--	./venv/bin/pip install -r $(srcdir)/requirements.txt
--
- .PHONY: test
---- a/test/test_dropbear.py
-+++ b/test/test_dropbear.py
-@@ -27,7 +27,11 @@ def dropbear(request):
- 		]
- 	print("subprocess args: ", args)
- 
--	p = subprocess.Popen(args, stderr=subprocess.PIPE, text=True)
-+	env = os.environ
-+	env['LD_PRELOAD'] = 'libnss_wrapper.so'
-+	env['NSS_WRAPPER_PASSWD'] = env['HOME'] + '/passwd'
-+	env['NSS_WRAPPER_GROUP'] = env['HOME'] + '/group'
-+	p = subprocess.Popen(args, stderr=subprocess.PIPE, text=True, env=env)
- 	# Wait until it has started listening
- 	for l in p.stderr:
- 		if "Not backgrounding" in l:
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
index 17238a6441d3..a6b561550e35 100644
--- a/net-misc/socat/Manifest
+++ b/net-misc/socat/Manifest
@@ -4,6 +4,6 @@ DIST socat-1.8.0.1.tar.bz2 579492 BLAKE2B 0af65b18dc6fec28e59d75048b1e1c4f442f13
 DIST socat-1.8.0.2.tar.bz2 579370 BLAKE2B 148bc4a49113af987f3c9faf9971bd309e1114358d2f32722c975715a151a4d8f194be58858c4a1a1833c53e2f4334afe105423550776bc174afc84126f8d0db SHA512 549380b3bf95fcf7088a7b774e0cbf5532c6fa86895cfbb44ee1dd7895391f3696f78bda886e786275951656d7c90b99c658eb28e58d2365eb33946768f04321
 EBUILD socat-1.7.4.4-r1.ebuild 1289 BLAKE2B d7df603c3746365cb9a58decfac745ffbba4ea08e2eddc8fe898fd88e514208a4d3dfcffb39cce1cde7978f817980d940107a4ebe095348a6df3e615811f6cfb SHA512 a6c3be213579322554ab721ba6e0adf5780e8839b9bb92b2556fc6856fe31310932035d04854c499c07816bf83c28dafbd4345a433b9ae4e64bba0c79add87d8
 EBUILD socat-1.8.0.0.ebuild 1516 BLAKE2B ecbe31340acd6ded2cca104d85a151cff58fb90b5235fec144e392b681305aebc8a7b2038f8726da304b282d03b3b14d8f80bbfbf7386c9de7a0196079d15a69 SHA512 90b51074849619b0dd7a78f39c75929281d8253543703dbe74d284b72a30a13b5487d8cb1ef0c11b8c7e9c67cbc1a21ac566c54b80bdfc89e7ad5dbf378c54b9
-EBUILD socat-1.8.0.1.ebuild 1373 BLAKE2B a1db28d8239def64609dcd807d358196d5b32070824d9d8fa725c0fef964818208ea582f19ef23be6a926e69856a47f1142b3ec58928d3ebe63a745d1eec8b48 SHA512 f632e0fbb05aed980365e28823210717b54632e097a8608ba2c30687a30e11996ad70488b75c6af378d48526c732103ab8b7b91698815bfa74d9b0ab7438c527
+EBUILD socat-1.8.0.1.ebuild 1370 BLAKE2B b0f66bd46914277a34d3b5cd6586070fdd3e9cba98251cde4e3bb9c1113a7cfd9032388421b28d7b4e9ec46fcb7651c1c9dfeea69ad683e4943ee81d45cf35e6 SHA512 cc86a2134fb8cdd32cb928b8416daafe01b2babb76b909df0a280c74d5f6837f8a6408d8b3e19240cf49596af2a20e899e9336287b462043237ee7855be187ab
 EBUILD socat-1.8.0.2.ebuild 1453 BLAKE2B 98ccf5d36e8bb148b75b423d87971bffbe46cef5188e88c20ae857a546b13eb466a1545378096df735b43340a7b1984f391a60ecdd210d1697ce29653e325a3e SHA512 e72090c12c6da1d34fb8f7efd6e326ab8c6ed4c82429041bd03880a80928ed3558f2b0dfd7a8d2f7842cfa0daf89ba4187c39e8b73d1f36c50ce35bed3eed5df
 MISC metadata.xml 468 BLAKE2B 3b8eb979af07fe02eac29cbb79d6da3782adf46025c072e03026bd765c562ddb7ae18dff9f162b18f9f9a07fa5fff3b3fda9a4445c9dc75d65d4395abc0de217 SHA512 0c3b9355c7420ea8bba4932c9c5f457393e0b7719fa65e5f9cd05ce38209d8cf8ab3e4401b8608a62fc8277742cf2b8728b9718b1183b634cfd596cedbe353aa
diff --git a/net-misc/socat/socat-1.8.0.1.ebuild b/net-misc/socat/socat-1.8.0.1.ebuild
index 2d9c8f3c989b..fe8114abe0af 100644
--- a/net-misc/socat/socat-1.8.0.1.ebuild
+++ b/net-misc/socat/socat-1.8.0.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="ipv6 readline ssl tcpd"
 
 DEPEND="
diff --git a/net-misc/xmrig/Manifest b/net-misc/xmrig/Manifest
index 7fa28c0daa56..26f119d66a69 100644
--- a/net-misc/xmrig/Manifest
+++ b/net-misc/xmrig/Manifest
@@ -9,6 +9,6 @@ EBUILD xmrig-6.21.1.ebuild 1551 BLAKE2B e590f209544572f41c8ef3f9984791cedcf33d73
 EBUILD xmrig-6.21.3.ebuild 1341 BLAKE2B d2f8d0871564e00c9def07f57444aab0ad456abbad57d4f4669f12a84704c7905b23f085926eaffed7bc2ebbbcd54b8468f30e95bb441544a27dba0395bd03b4 SHA512 35aff6ef111de16ecfe59add1ecb5685e8c48c3e06e2319911a3c3d97428b0187167dfd6f802dd73c20877ba1ab17923486aa13c2901f5535a2f4cf760672d81
 EBUILD xmrig-6.22.0.ebuild 1341 BLAKE2B d2f8d0871564e00c9def07f57444aab0ad456abbad57d4f4669f12a84704c7905b23f085926eaffed7bc2ebbbcd54b8468f30e95bb441544a27dba0395bd03b4 SHA512 35aff6ef111de16ecfe59add1ecb5685e8c48c3e06e2319911a3c3d97428b0187167dfd6f802dd73c20877ba1ab17923486aa13c2901f5535a2f4cf760672d81
 EBUILD xmrig-6.22.1.ebuild 1341 BLAKE2B d2f8d0871564e00c9def07f57444aab0ad456abbad57d4f4669f12a84704c7905b23f085926eaffed7bc2ebbbcd54b8468f30e95bb441544a27dba0395bd03b4 SHA512 35aff6ef111de16ecfe59add1ecb5685e8c48c3e06e2319911a3c3d97428b0187167dfd6f802dd73c20877ba1ab17923486aa13c2901f5535a2f4cf760672d81
-EBUILD xmrig-6.22.2.ebuild 1341 BLAKE2B d2f8d0871564e00c9def07f57444aab0ad456abbad57d4f4669f12a84704c7905b23f085926eaffed7bc2ebbbcd54b8468f30e95bb441544a27dba0395bd03b4 SHA512 35aff6ef111de16ecfe59add1ecb5685e8c48c3e06e2319911a3c3d97428b0187167dfd6f802dd73c20877ba1ab17923486aa13c2901f5535a2f4cf760672d81
+EBUILD xmrig-6.22.2.ebuild 1340 BLAKE2B 520f41a6991bf62c15e2fe1c4d41f5e02185f94fcecdc2abb2c4cdf1de6cfe5d14c41b1d2a76c024a2aa5d342154226e20643144c0853f1f346e2ca18d9d4c3e SHA512 99e9377eed0696452c7d1a4083fbc83c375608063e3169ad6a3ae254102cb363e6984700353c9b2201ef8100e11c0019dfdd14448d13161b0469f24b0d28315f
 EBUILD xmrig-9999.ebuild 1341 BLAKE2B d2f8d0871564e00c9def07f57444aab0ad456abbad57d4f4669f12a84704c7905b23f085926eaffed7bc2ebbbcd54b8468f30e95bb441544a27dba0395bd03b4 SHA512 35aff6ef111de16ecfe59add1ecb5685e8c48c3e06e2319911a3c3d97428b0187167dfd6f802dd73c20877ba1ab17923486aa13c2901f5535a2f4cf760672d81
 MISC metadata.xml 719 BLAKE2B c8e2f6946503bafb5899f2b2ff022fb5e123cacd82ebd6ba2d983b5e8c94cc0ad35bc057a1b0147e0ce85701223abbe22464f8087c27453607cff278bc4fa860 SHA512 1611d29f42483a1aa4f1a3c438fd51a53473fdb0611bd428f068a9ae38e8a93c7cb278ecb834e4ae17957fdb2873461e7364267050ef1b776d534779166c824a
diff --git a/net-misc/xmrig/xmrig-6.22.2.ebuild b/net-misc/xmrig/xmrig-6.22.2.ebuild
index 2061563b6ac5..a064c4ee2233 100644
--- a/net-misc/xmrig/xmrig-6.22.2.ebuild
+++ b/net-misc/xmrig/xmrig-6.22.2.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
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/xmrig/xmrig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="~amd64 arm64"
 fi
 
 LICENSE="Apache-2.0 GPL-3+ MIT"
diff --git a/net-misc/yt-dlp/Manifest b/net-misc/yt-dlp/Manifest
index 42099ac34b95..86f69d17e286 100644
--- a/net-misc/yt-dlp/Manifest
+++ b/net-misc/yt-dlp/Manifest
@@ -1,4 +1,4 @@
 DIST yt-dlp-2025.02.19.tar.gz 5842393 BLAKE2B e35716ceb51739668ed1b9f263d643ef33de3fd4ed38d21cc02971f3f454484814b57f370730a91ea8e2c21995027b8f2e13caf6a41bbdfd0798f8856416d124 SHA512 91179c08f6d3eafc8b796671f513b7908a53632b2c926293bbe887cbb3843c6dc80c80de90a7f892b98e6dd5b77daeea10f02e5a2ee078855ce78227e4c9be4a
-EBUILD yt-dlp-2025.02.19.ebuild 2477 BLAKE2B 42f0b2dc409fb91a1357a8792c9481ff869c7dd1ee3762fd2b85a1f98f4634f6167da605e476140a8f141d0ccd6074edbd5d24b0b5ddfe423f8188d0cfb2631a SHA512 ac7fcfbae2fbd005097aaf457da353f72eab77afdcd26f3359311fe45e7866a05fb1ef9b230a5c39ef73e74dbb30696ddea6b5d289ee65ea9bcc8625753d9704
-EBUILD yt-dlp-9999.ebuild 2206 BLAKE2B 53a6276965387a5439cf0c88320b9c0f21ac33ed042b66256582ef99f7288e4cef53c91d443b77117ad2c14ec030db59bca9f7922b6305bf802d8275dac91c19 SHA512 0874070cad522d1569e1efc2d6b05c90ed91e97a75387f3d145e21bde3cf32b58ea9d77ca94b9d78089dab545dd5cfc682c0f982719258473b71459e5cd9565a
+EBUILD yt-dlp-2025.02.19.ebuild 2420 BLAKE2B aa87bfbc02c62dffcc5fbc5711e59c9a49f9ad9869b1f82ba7eb61ed1f569c6668bc263cdbf5e83eb5f2327a91e1b0ec75bac3251f7d21591ddb1123e574dbe2 SHA512 8129eb5a482a97ac44ab5ce796fcaee1a297fc433016a34fcb6a5ef2a65b2a45aa6b4e81bc8d824df380375b2928ad4d8873bf4404d7f400ca7e036cc6532123
+EBUILD yt-dlp-9999.ebuild 2440 BLAKE2B 54ec3a69363bad6385e63fbf29994d9b0885762e1a08f15c3326298cf06724164a082e4f346b56c7b5fe31498c7c472613318af4dc59b2667d3c32325b2a2959 SHA512 ec6ddabd3970f6e474df85c5e3057021ba3d919f0f7cdaf0d43a668554538a967a6fc3ae67596e87cf888a9d39392a1b7671709904cec053c5c2167556ed2cc2
 MISC metadata.xml 392 BLAKE2B d2aa6fc43f7f9038d320197a18107f15e56ed5e242e6c3cdc1b7111184580ab14fae8cbd16776794d207dd39ea0ca65975c08a54449f4cf90370ea95a66083d9 SHA512 867c61c1e41d7594decd5e10a2b45d934313cb751ba22356fc1ab61e0a40b2543847b195d20c7a39ba92370d8b3908e6f90d690915579b55808872efe8d3cebe
diff --git a/net-misc/yt-dlp/yt-dlp-2025.02.19.ebuild b/net-misc/yt-dlp/yt-dlp-2025.02.19.ebuild
index db37821e73bc..9b9eb962a869 100644
--- a/net-misc/yt-dlp/yt-dlp-2025.02.19.ebuild
+++ b/net-misc/yt-dlp/yt-dlp-2025.02.19.ebuild
@@ -34,10 +34,10 @@ python_test() {
 		test/test_networking.py::TestHTTPRequestHandler::test_connect_timeout
 		# fails with FEATURES=distcc, bug #915614
 		test/test_networking.py::TestYoutubeDLNetworking::test_proxy\[None-expected2\]
-		# needs (optional) websockets-15 which is not stable yet, and
-		# it is not considered a big issue if websockets tests fails
-		# as not even advertised as a optfeature, so just skip for now
-		test/test_websockets.py::TestWebsSocketRequestHandlerConformance::test_verify_cert\[Websockets\]
+		# websockets tests break easily depending on dev-python/websockets
+		# version and, as far as I know, most users do not use/need it --
+		# thus being neither in RDEPEND nor optfeature (bug #940630,#950030)
+		test/test_websockets.py
 	)
 
 	epytest -m 'not download'
diff --git a/net-misc/yt-dlp/yt-dlp-9999.ebuild b/net-misc/yt-dlp/yt-dlp-9999.ebuild
index e6e7a5d4cb47..5e48f1d170d0 100644
--- a/net-misc/yt-dlp/yt-dlp-9999.ebuild
+++ b/net-misc/yt-dlp/yt-dlp-9999.ebuild
@@ -41,6 +41,10 @@ python_test() {
 		test/test_networking.py::TestHTTPRequestHandler::test_connect_timeout
 		# fails with FEATURES=distcc, bug #915614
 		test/test_networking.py::TestYoutubeDLNetworking::test_proxy\[None-expected2\]
+		# websockets tests break easily depending on dev-python/websockets
+		# version and, as far as I know, most users do not use/need it --
+		# thus being neither in RDEPEND nor optfeature (bug #940630,#950030)
+		test/test_websockets.py
 	)
 
 	epytest -m 'not download'