gentoo auto-resync : 15:09:2024 - 12:11:38

34 files changed, 419 insertions, 558 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 46674f59c5cc..461535e1405b 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/asterisk-base/Manifest b/net-misc/asterisk-base/Manifest
index 0d69dba4ae33..56d77a8587af 100644
--- a/net-misc/asterisk-base/Manifest
+++ b/net-misc/asterisk-base/Manifest
@@ -9,5 +9,5 @@ AUX tmpfiles-1.conf 84 BLAKE2B 133761739570a08bebb88059df1a870ddaef194bd1c5a1a4d
 DIST asterisk-base-3.tar.gz 14589 BLAKE2B 854df19a0aa6cbd6c452ec03f8766f166824580f30edbf158f9e23baa451b092388b5f653999cab63d3232d7ff2c1efb7784c8e69d9ea1f2855dd446613ade87 SHA512 e2b53a3db6cb38fcc8456c3c69806452ecdd748f7d5833c6fdc426f436f92b651d69a902f6f588ffc371903c5a1374a9fc0695a74f9b4e47e75df3b1ce50764e
 EBUILD asterisk-base-1.ebuild 1009 BLAKE2B fee1b726a36acff9a1ec4c56a157bf5d03363bc869aa82f6ca3bb9e0e68ca0a240248fcdafb1e0280ce9dc564dbeea5b06648b73d7bc43f38f818091012fdbd2 SHA512 c73fdf5eca5afe8fb53e52d76bdb6274fe05e9a1d2b0ec57fb29c91916b7c56b2c36b2895e095a5a8d960da478c81fec024f340ade1269f311fc86b104bb2033
 EBUILD asterisk-base-2.ebuild 1021 BLAKE2B 57408ea752cc26cd7f72a7e8f32de9268ea1b66d3eaacb17fb6220133abb519736a336f905789fba1cfd7d9f1c9b59ad88388c2fe720264d030892089864468a SHA512 dfd90fa5c5688c1723d8a95107a68fb319cede39fad9d4a8354d7cda10381348f1232bef945fea70c23a48c09d4843daf47172551c30c8913a75b692c70dbce3
-EBUILD asterisk-base-3.ebuild 883 BLAKE2B b398640cb5161e6cc346814f71c96d3b7b54fd58dc6272e5577c0d392674435870ac4c800de9cabbc0e97b992547c299e48ceceba72a2892e8d25eadf27d264d SHA512 7e9e8820d35d09da1a3d59a12b3ea29d2f9087b16832f795e548a45eb48314d81e319b6fe2594b7251ad55ccf656ec1c87868518feeb788d0649a305ecbb3d3e
+EBUILD asterisk-base-3.ebuild 881 BLAKE2B 6962ee8df0b936851d7fe7b46e2ed87706d6c1cb813475c8a8af3c36f59000d764f34f468a7cbd16c1618ea7f10f0bcb416dd26a85507d425c3c73d6852870a7 SHA512 8e1bc6732bbe06ae031758cdee776a4f1acaddeff71d406e8ce5afe1dd8a21fcbb1d8eb93d92d19ac0d24cd20ec79051b48f5be462ef55e0b2de4acfaf240af3
 MISC metadata.xml 475 BLAKE2B cd7c9c6474cecd6aeda2b62144f3db03156ba2a5cfeda845d36d2fd24b16dce5bd05b5d425a559409c36806b4d3242ee0746aec44afb2645024166b94fc22d6e SHA512 fb5795745d56526501ade0894424c7558019283ab07faa6a64daebeadf813aa565afaa11a2215c106cf0d3c99c79e10f820b57fac6981e32cc0091a75046ab86
diff --git a/net-misc/asterisk-base/asterisk-base-3.ebuild b/net-misc/asterisk-base/asterisk-base-3.ebuild
index 3d9e4d044130..5be15bd8601b 100644
--- a/net-misc/asterisk-base/asterisk-base-3.ebuild
+++ b/net-misc/asterisk-base/asterisk-base-3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jkroonza/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	net-misc/asterisk
diff --git a/net-misc/axel/Manifest b/net-misc/axel/Manifest
index 58ad88bf7f8f..3c9c09c39034 100644
--- a/net-misc/axel/Manifest
+++ b/net-misc/axel/Manifest
@@ -1,7 +1,7 @@
-DIST axel-2.17.10.tar.xz 274648 BLAKE2B ee89614412dda04092bd89821ce78d1fff9224d0e026b136d50f2c52a42bbb6a3a110dcf8c0e8110dfdb6a67d0b6aecf0322101f75016b38888f35f44849340c SHA512 f102ae742940d123364de49f01fe97cc146afc32adfb3776437a53ffef14fcca0c5926c39d6ac338fe2bd368529d18b0c885b694de48f7cb0e6d0195d2339437
 DIST axel-2.17.11.tar.xz 279964 BLAKE2B d2a740b6a9471cc384ddb8556c3dce946edffc3ef7b2740306040cb22d4cbabea92064ed3b0f351235f004b1017cefb5b0fc8a427691a74f29880eec7e3f5b85 SHA512 111e8b3bbb70e717bee8b3c318c18d0121776301c609c0894376a371238dd839f5dae7edda6738d2b89296fd4b6ac1083399acf62308eaa479b6d70b080e65a1
 DIST axel-2.17.13.tar.xz 224788 BLAKE2B 07b3918277fa2a4b0cda5e989c3c001058cc0c8da52e479d56bd88956362cb1bbfa927b85ed870c5b0ddc599839fadb25aa5733bd295f060879d31c211913e16 SHA512 e36129de893c3c56fe89f7ff3accba9803b4e6d3b5094ed4266c10b33639b973c2fdc41beaf0a80d4fb5e62339580383497a15b4b7caad7d70c8fc581c0c4fc2
-EBUILD axel-2.17.10.ebuild 987 BLAKE2B 501a8487c3c9ee7dc1259684e4b786cd2d85c7b54f770410278b431ae59b14f2ba3d337e49f152e9e8805b54f2d07baf3b88ea71fe6393d4b30cf9eebeaf66c9 SHA512 06300c333d23f5060f559694990429223884a79a77f6f13d51f2ba84842a5f2de01ea5de13fa6bf47751098beddaff9ab4edc31615e41a770034b3e2c4b256eb
+DIST axel-2.17.14.tar.xz 226132 BLAKE2B e9b89222f1d03897904b6db24716263173d94e000646db3561f23701b87d7894ebce09e309354d86e47c5c7f502eefc7a68b34c5fe1d1a7288dc61856fb7e0a9 SHA512 73ea499f581d9411197269fc96d7eeed83dcdb7470aba2ef93db0a1032689bfb66e03a194e9ae5191477ca86cc772d204c6672233009cf210b9ebb3ae29bc9c0
 EBUILD axel-2.17.11.ebuild 994 BLAKE2B 0459b09b2345c5d1f7a05dddd348bf6495fdcd307a4d96385988456b1adeb3a52d42314449643d67cc691b6523ad08896bef625fbd1d42608c7587190c6dcba5 SHA512 db17d0680199b4dcb64fb641834b85154c707560220d8a87cb8bf97193eb06990ba0b206a84274481f99e05015cb9c61a3fb09ef877da798f4b4b915e54810fa
-EBUILD axel-2.17.13.ebuild 987 BLAKE2B 71b5e3d438d47804650ffd7691e471ae1fc3384298ab595f95f5eac0e9b5c51bdb2da9874d8fef4e3426d8292333c380ca503e85e7417a6d7960ecb8da3f1e39 SHA512 83da7b1928c7aa4137a5782b37079a91322c56cc49c0245e5fadfff8c23c01eb7f41c60e00862f2cfe3c52baa4bd9f0335e4fa8760606167bd309676a8dc0de6
+EBUILD axel-2.17.13.ebuild 987 BLAKE2B e08fefafb91a5ca23b4b9e171b0627bd9f0fd954309210aa4fa20f4c06c72ea3a1633d035bfd672cb31c8bea05674d163e814eedc8c14e24c33b3100d65d6795 SHA512 2a6a3ec4bf09b7655d49126479f3f9fc6de6c293d94e4d03064c9639d8c4e8d319bf82564f3d533ec25118ab803c6cd449ff53291f6c56a1863c7bb6ebbee83b
+EBUILD axel-2.17.14.ebuild 1045 BLAKE2B 2096fc41dd0617937739e5a564d9a1c3507ebefe174697bee800474c2a6d6e47750b5f46b6c4a7df0c7c6afaf7aeaad7c3da12862d5163afa058434975246229 SHA512 28513e84eb6da188bbbf54acd91959fce0005762b3cc9476b0042edb018ee7250e2384ea9629df4759bffbdefefc044286303deb8e644fb76d7b2d3f5cc9f6ce
 MISC metadata.xml 263 BLAKE2B 7f3d07ed49d8af3f586e46467ca42c96ce16f07efa052e5434dad8486f3af7d458ec03af4131ae649df1ee1be71041f8bfd87e6d19326787210c3aef070302c5 SHA512 fdec3d4ab843b1c07c7bab771f38caca1392bd7f09f8d043355b95015b91b22b327a50d3d37f6438ac985b754cf896ae1a73a3f13ad003573f7debf077bd985e
diff --git a/net-misc/axel/axel-2.17.10.ebuild b/net-misc/axel/axel-2.17.10.ebuild
deleted file mode 100644
index 9ec3f17398db..000000000000
--- a/net-misc/axel/axel-2.17.10.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Light Unix download accelerator"
-HOMEPAGE="https://github.com/axel-download-accelerator/axel"
-SRC_URI="https://github.com/axel-download-accelerator/axel/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="debug nls ssl"
-
-CDEPEND="
-	ssl? (
-		dev-libs/openssl:0=
-	)
-"
-DEPEND="${CDEPEND}
-	nls? ( sys-devel/gettext )"
-RDEPEND="${CDEPEND}
-	nls? ( virtual/libintl virtual/libiconv )"
-
-DOCS=( doc/. )
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_with ssl)
-}
-
-pkg_postinst() {
-	einfo 'To use axel with Portage, one can configure make.conf with:'
-	einfo
-	einfo 'FETCHCOMMAND="axel --timeout=30 --alternate --no-clobber --output=\"\${DISTDIR}/\${FILE}\" \"\${URI}\""'
-	einfo 'RESUMECOMMAND="axel --timeout=30 --alternate --no-clobber --output=\"\${DISTDIR}/\${FILE}\" \"\${URI}\""'
-}
diff --git a/net-misc/axel/axel-2.17.13.ebuild b/net-misc/axel/axel-2.17.13.ebuild
index d2b41dac25da..b93851ca667c 100644
--- a/net-misc/axel/axel-2.17.13.ebuild
+++ b/net-misc/axel/axel-2.17.13.ebuild
@@ -22,7 +22,7 @@ DOCS=( doc/. )
 src_configure() {
 	econf \
 		$(use_enable nls) \
-		$(use_with ssl ssl=openssl)
+		$(use_with ssl ssl openssl)
 }
 
 pkg_postinst() {
diff --git a/net-misc/axel/axel-2.17.14.ebuild b/net-misc/axel/axel-2.17.14.ebuild
new file mode 100644
index 000000000000..c53db4796073
--- /dev/null
+++ b/net-misc/axel/axel-2.17.14.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Light Unix download accelerator"
+HOMEPAGE="https://github.com/axel-download-accelerator/axel"
+SRC_URI="https://github.com/axel-download-accelerator/axel/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="nls ssl"
+
+DEPEND="ssl? ( dev-libs/openssl:0= )"
+RDEPEND="
+	${DEPEND}
+	nls? (
+		virtual/libintl
+		virtual/libiconv
+	)
+"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+DOCS=( doc/. )
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with ssl ssl openssl)
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		einfo 'To use axel with Portage, one can configure make.conf with:'
+		einfo
+		einfo 'FETCHCOMMAND="axel --timeout=30 --alternate --no-clobber --output=\"\${DISTDIR}/\${FILE}\" \"\${URI}\""'
+		einfo 'RESUMECOMMAND="axel --timeout=30 --alternate --no-clobber --output=\"\${DISTDIR}/\${FILE}\" \"\${URI}\""'
+	fi
+}
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 506c8b9e9165..fe1a1a4174b4 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,3 +1,4 @@
+AUX curl-8.10.0-sendrecv-poll.patch 2113 BLAKE2B 8f00179a27b3f544c8cf9c8f1adfc087011eb2c84792f64847052fe34fdf0a39c953a677aaf8a77f27634ec619101562203d0105c415664952b036f791083db9 SHA512 2e00a8004bcc50f184c5768ab30d0daaa0b845c5d5d2368ee8d35971da4832dd6bb7f30733e4ecb9fb3dd6547facfbc8d152fc59a40bf2858a8564130f83b308
 AUX curl-8.7.1-chunked-post.patch 2389 BLAKE2B d283816be5dca19ab0058db1937d686b4f9056caf3c46a8dcd731bc69ae91df1b01d10f643ce127eeec7aac0e9282f8b5c5109fe1cea82b30d2cf3270e93ae24 SHA512 3b1a67010704f4863f973e79d6a695e6e13b938fbaa695a05bc92b1a577fa5852c310b38f9c88518275f82c7d088474f5e4c585ac5ff790043e6ca969b0dc1d9
 AUX curl-8.7.1-fix-compress-option.patch 6222 BLAKE2B 7ff5c096fa6cc5cc039f47188a85c49364cdfe6cfeae3a9c58b38939eb59896bcf204c682f36e89ace37a0753236593307e1af45bc2d0f099ff685af8e366713 SHA512 1622adf015a016a205d4bf621715ed06fd345cd45f032ad44b6d9324d398c0e2004f04fe734401b12007c3eb145dac84aa3ce90bdaa9b16e09b5908da75f902f
 AUX curl-8.7.1-http2-git-clone.patch 14120 BLAKE2B 5bc2c0765ebd400f2e79d0552621c98640c757f189ae0fa029d8fb6d9fa74ac0e4fd93948fed6bc7f93b329e30948a585be1f20dde18423acf162cd36b4fb166 SHA512 278720daae7d4d3288502e0dd2b591ada66a559040eb341b0cf5673094e9d214eb166772279378487da96f43912313e04d3b174fdcb2b2cbfa766f241df62f34
@@ -17,7 +18,7 @@ DIST curl-8.8.0.tar.xz 2748860 BLAKE2B c14903bad4cbd1752a5335afa6bcc78be1a484692
 DIST curl-8.8.0.tar.xz.asc 488 BLAKE2B d80c0ff357b344d7ec2b975a92f1eeb7557993b61a69e7adaaeab89c9b5a53ddade5104fe1a0ad260145db9c90fc0aae36dfc22320492db6696f290da9ff675b SHA512 37b501770225dff6b1e7bde1157f556f10ec1c597fcbbb5c8b8c370efb97a3a70f585f2f5c201b96380d68466696474a5f65a07da59b704678d6927567d25359
 DIST curl-8.9.1.tar.xz 2782364 BLAKE2B 6e38e20e2b03ab5bfbb8d9797442dfdd9644fc80d7b1f7c1efb1f44e0d730524e82ccf7413b2c6f4555bd61ae42f91ec7c0201e2c0d563811c85164aa234aada SHA512 a0fe234402875db194aad4e4208b7e67e7ffc1562622eea90948d4b9b0122c95c3dde8bbe2f7445a687cb3de7cb09f20e5819d424570442d976aa4c913227fc7
 DIST curl-8.9.1.tar.xz.asc 488 BLAKE2B 437268f6e5ba5db73f205fd87f3ded1e5fc200e8bf63a83cdb7e21dfbf2f4a4620e598cd0bf5d8fa1548ade08d45b386599542cd988df46a238b85790409f42e SHA512 18acd58436d70900ab6912b84774da2c451b9dbfc83d6d00f85bbbe7894b67075918e58956fdb753fcc1486e4f10caa31139d7c68b037d7c83dc2e9c2fae9f9b
-EBUILD curl-8.10.0.ebuild 11392 BLAKE2B c62287914b25282543b8000a8a82f2ff82e65cc274ce2aa38837d4b919dd7f5f19d5da5330155731a431398e2bab5058fbfcfad3b0965f77943244719899619f SHA512 f08d3e6f150ec8efb2e155248a895b68c3295034f3362f114fbae4937d0c404fb2007ed0cecbf8a3fab137b2c53cccdee509fae179271b5120f79f248cf26ff6
+EBUILD curl-8.10.0-r1.ebuild 11432 BLAKE2B a82ade1d3f05e25126629574f824cb4140f69802c481f3fc6d5acbfdf7551b018bbb254bcc9671f7dcbb0cc0680ebf84917d50930f6cc33768c278d1ec66f6b0 SHA512 094010c501d5a5ba0a3cf13b3b4e5e9fc0d54bae5763c141064f54c2b05feca89aecf256622045703eca47cea696619ae69b8c4fa16169480cfa785156c093d2
 EBUILD curl-8.7.1-r4.ebuild 11261 BLAKE2B 0d1acdce1b58e97d83ee0e67ac0e145894a1bd19e23635649bec06bcd6a45e6487954b497992a7039243ca6860393d2b5115caf2d9edab1a3fbefc46451e2c6f SHA512 687aa43ec10a118f2d53d8532423bf3ffc6eb1ee60f509c3677cc4afcfe1f871b87e18fa5bd045fa86570ae4285432da59adb5f0b548e7da6ed46c9d8a9ad3e5
 EBUILD curl-8.8.0-r1.ebuild 11487 BLAKE2B e97f24d529bd6d41556d0584f3bc296754d9ec04b9080bd8ca1dfdce1e12ddf7c50683f2a9c6249b85392f9fd988a3707c04e2ef2bf4a7956390a394cbca6831 SHA512 8c8b3b2ffc3a4c2bb8d83f0da258e3bb664a365c9fc29af387b33df079658c0ec6cd148a93fc36c34c990bf98637125db1826415d3c34887e60f9a6458e2bba4
 EBUILD curl-8.9.1-r1.ebuild 11442 BLAKE2B 314ab850c3dd3128e7e9168a019dc5088f4f1d4cb4a78fc19b09c15fe13d2384053c576f54cba0c728f8f2ac5b42d32b3013ae0ff954fb3dbb60e517ff09aa25 SHA512 a446c2d115798704cbf41d06904089bd3429d88ae203b7a77e86a87aa592696f85ae2a2d844575ece18f3f8291af9eaa2652d44baf707144468d3ada94cdb89a
diff --git a/net-misc/curl/curl-8.10.0.ebuild b/net-misc/curl/curl-8.10.0-r1.ebuild
index 8aa5f19b3d9c..335c3c36a022 100644
--- a/net-misc/curl/curl-8.10.0.ebuild
+++ b/net-misc/curl/curl-8.10.0-r1.ebuild
@@ -158,6 +158,7 @@ QA_CONFIG_IMPL_DECL_SKIP=(
 PATCHES=(
 	"${FILESDIR}"/${PN}-prefix-2.patch
 	"${FILESDIR}"/${PN}-respect-cflags-3.patch
+	"${FILESDIR}"/${P}-sendrecv-poll.patch
 )
 
 src_prepare() {
diff --git a/net-misc/curl/files/curl-8.10.0-sendrecv-poll.patch b/net-misc/curl/files/curl-8.10.0-sendrecv-poll.patch
new file mode 100644
index 000000000000..44654377008a
--- /dev/null
+++ b/net-misc/curl/files/curl-8.10.0-sendrecv-poll.patch
@@ -0,0 +1,51 @@
+https://github.com/curl/curl/commit/a33bcc9b53b9d6ea9f879624e8abea0b012b008e
+From: Stefan Eissing <stefan@eissing.org>
+Date: Fri, 13 Sep 2024 18:36:53 +0200
+Subject: [PATCH] transfer: fix sendrecv() without interim poll
+
+There was a "clever" optimization that skipped sendrecv() handling when
+the transfer's pollset was empty. This happens for paused transfers, for
+example.
+
+Unforunately, if the libcurl application never calls curl_multi_poll(),
+the pollset is and will aways remain empty, prevent the transfer from
+progressing.
+
+Remove this "optimization" and always try send/receive where applicable.
+
+Fixes #14898
+Reported-by: Victor Kislov
+Closes #14901
+--- a/lib/transfer.c
++++ b/lib/transfer.c
+@@ -431,8 +431,6 @@ CURLcode Curl_sendrecv(struct Curl_easy *data, struct curltime *nowp)
+     if(select_bits_paused(data, data->state.select_bits)) {
+       /* leave the bits unchanged, so they'll tell us what to do when
+        * this transfer gets unpaused. */
+-      /* DEBUGF(infof(data, "sendrecv, select_bits, early return on PAUSED"));
+-      */
+       result = CURLE_OK;
+       goto out;
+     }
+@@ -440,16 +438,13 @@ CURLcode Curl_sendrecv(struct Curl_easy *data, struct curltime *nowp)
+     /* DEBUGF(infof(data, "sendrecv, select_bits %x, RUN", select_bits)); */
+     select_bits = (CURL_CSELECT_OUT|CURL_CSELECT_IN);
+   }
+-  else if(data->last_poll.num) {
+-    /* The transfer wanted something polled. Let's run all available
+-     * send/receives. Worst case we EAGAIN on some. */
+-    /* DEBUGF(infof(data, "sendrecv, had poll sockets, RUN")); */
++  else {
++    /* try both directions if the transfer wants it. We used to poll
++     * the socket here and on ran send/recv depending on POLLIN/OUT, but
++     * that does not when connections are multiplexed or handshake,
++     * or other direction reversals are happening. */
+     select_bits = (CURL_CSELECT_OUT|CURL_CSELECT_IN);
+   }
+-  else if(data->req.keepon & KEEP_SEND_TIMED) {
+-    /* DEBUGF(infof(data, "sendrecv, KEEP_SEND_TIMED, RUN ul")); */
+-    select_bits = CURL_CSELECT_OUT;
+-  }
+ 
+ #ifdef USE_HYPER
+   if(data->conn->datastream) {
diff --git a/net-misc/dhcpcd-ui/Manifest b/net-misc/dhcpcd-ui/Manifest
index df8f731e9873..229569b00996 100644
--- a/net-misc/dhcpcd-ui/Manifest
+++ b/net-misc/dhcpcd-ui/Manifest
@@ -1,5 +1,3 @@
-DIST dhcpcd-ui-0.7.8.tar.xz 135028 BLAKE2B f3e79bb00708e2ce2ebb93d917506bb0fb015071b415768c47979d7f2b5e35d6f22bf71a58c43989dedc6561f0a8be738824f06627d2fa0995e335d7ef1925cd SHA512 5f0d2c32c32fc141feca0ab43a531d9b4f45e071a8a1e3ee1923d6394a3e5d6322e6f7e607b91154af4cfee93d649164c7ed3b805731dfc242c3ac367ec156c4
 DIST dhcpcd-ui-0.7.9.tar.xz 104100 BLAKE2B 7e2bbbb9ad657deccc16296a0c7191f35fa15dbc84f1f8ac4f8ac5de4c56e5948da457398409527774ffc62e58659cac2dd37aa66842179f710db04a9791ab9e SHA512 fe0c9ff2f777e7b97438eb50507fce765b8e18b1a71883d76e9b6570a18e6f13414f8e64d8034f9c3352496775c283a0540e331ec449d6fbe48ddc8d64e14691
-EBUILD dhcpcd-ui-0.7.8.ebuild 1317 BLAKE2B 9184c0a56b1163f7ddf4a2de6f84bf6a3ee3b0d25029686aa55c1a8f4ed00a318ca586bde1b5798ca2c42afbe5979d098a997eb0e9e9ea517384f97aab0036f8 SHA512 d19ab69d655ae6886654cc69fb49a2ec5b8bd2c07d66fc62f92806e6ce437f5425783ed365dac7f91c05a6dd8fbf7b1780f8b65ed9a8171523f088fe57c7dee8
 EBUILD dhcpcd-ui-0.7.9.ebuild 1670 BLAKE2B 892634b4a79064d3ba090f859e9b455a9391c4f6e0273d396b52b46eb090a45b33e3ed99f6af74525e89fdba3d9e22a655e40bfbe9ded0b3385691d96e2860d8 SHA512 26ba1e59dc89b85a70c8484962038076799dc332dfcf650ed69acafd86e0acd1e4c2070bfc91474eb0bd34c95be730e69ef860a5dfbafed5eb7fa3153f21e242
 MISC metadata.xml 263 BLAKE2B b158e1cc9bc26face8e3b7b4d791a998a637db216ab41d8b809061c1652df0028ff4ffdd67ca515be38304b2a6c53d366fcf05b3e06e816e67e9689b1aadb46b SHA512 2b6c4b4581d1103715b80c20f9d0c5afe2899935f9d18157b8336e72fa5cbf646d38ebd90692af3c8727b1f8484aab162dceb280b0aa331f68bf9fd20a95d26d
diff --git a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.8.ebuild b/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.8.ebuild
deleted file mode 100644
index fbb1017029b5..000000000000
--- a/net-misc/dhcpcd-ui/dhcpcd-ui-0.7.8.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils systemd xdg
-
-DESCRIPTION="Desktop notification and configuration for dhcpcd"
-HOMEPAGE="https://github.com/NetworkConfiguration/dhcpcd-ui https://roy.marples.name/projects/dhcpcd-ui/"
-SRC_URI="https://roy.marples.name/downloads/${PN%-ui}/${P}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug gtk libnotify ncurses qt5"
-
-REQUIRED_USE="libnotify? ( gtk )
-	qt5? ( !libnotify )"
-
-BDEPEND="
-	virtual/libintl
-"
-DEPEND="
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3
-	)
-	libnotify? ( x11-libs/libnotify )
-	ncurses? ( sys-libs/ncurses:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		media-libs/mesa
-	)
-"
-RDEPEND="${DEPEND}
-	>=net-misc/dhcpcd-6.4.4
-"
-
-src_configure() {
-	local myeconfargs=(
-		--without-qt
-		$(use_enable debug)
-		$(use_enable libnotify notification)
-		$(use_with gtk gtk 'gtk+-3.0')
-		$(use_with ncurses curses)
-		$(use_with qt5 qt)
-	)
-	QMAKE="$(qt5_get_bindir)/qmake" \
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
-	systemd_dounit src/dhcpcd-online/dhcpcd-wait-online.service
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index 4ed54f0d5666..835a93993064 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -1,9 +1,12 @@
 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.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
@@ -12,4 +15,5 @@ DIST dropbear-2024.85.tar.bz2 2304594 BLAKE2B 631b71733437a256267057a1c4846afa4d
 DIST dropbear-2024.85.tar.bz2.asc 833 BLAKE2B 1d0cc37fb1c528c6f7f6e064d3ec3d7c63617b568d8889592ca162171a325a46e84a23f24c16069b5396c806b2270434552833138ba95c7f34c8b5e6e425fcc7 SHA512 d2ad10b60f53d8d598a7a57337fe890c26c60bea115fb919f6135a01fe3f8f7e5863b0a7ed6c7eacbd5a3b810169b600c0004251a8d748d4b40584933c2c7383
 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 5408 BLAKE2B 3eedb9e3f8b436fc7d132d263f4aa7e92466c8b7a4899b4ef7fb045bda7819306ec3284399336d71daccf9b5f11884bb24849d45a2660ad0c165ec5dab4202c1 SHA512 100994259d94fc1d47a514aa475988aabb45a2a528daa7684e4b044ff1b7b16baf57d60443f74c063e51d57cdc6687fe3c847593f42a80a534d11dade7529c49
 MISC metadata.xml 1866 BLAKE2B 820902b27de934f6d7f0edc5d9f8c7bccf5c5f51d0e81ebd13fb53d6ba9e385c924d4fd0a191096fb191c253800227ff6b30f7bd44edfb532307e7076f39df8f SHA512 8e073a34877f230207ef391084b99014db9482aec680a1b292ac95e3bade426ecf362092337b7fcb19091f273085a06ae81cfd7d5e69a46a28067ae68f615cd4
diff --git a/net-misc/dropbear/dropbear-2024.85-r2.ebuild b/net-misc/dropbear/dropbear-2024.85-r2.ebuild
new file mode 100644
index 000000000000..609bbb453aa4
--- /dev/null
+++ b/net-misc/dropbear/dropbear-2024.85-r2.ebuild
@@ -0,0 +1,199 @@
+# 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-2024.84-fix-aslr-test-no-venv.patch b/net-misc/dropbear/files/dropbear-2024.84-fix-aslr-test-no-venv.patch
new file mode 100644
index 000000000000..62e87f230974
--- /dev/null
+++ b/net-misc/dropbear/files/dropbear-2024.84-fix-aslr-test-no-venv.patch
@@ -0,0 +1,15 @@
+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-non-interactive-tests-no-syslog.patch b/net-misc/dropbear/files/dropbear-2024.84-non-interactive-tests-no-syslog.patch
new file mode 100644
index 000000000000..b5a464884d20
--- /dev/null
+++ b/net-misc/dropbear/files/dropbear-2024.84-non-interactive-tests-no-syslog.patch
@@ -0,0 +1,13 @@
+Force tests to be non-interactive
+
+--- a/test/test_dropbear.py
++++ b/test/test_dropbear.py
+@@ -23,7 +23,7 @@
+ 	args = opt.dropbear.split() + [
+ 		"-p", LOCALADDR + ":" + opt.port, # bind locally only
+ 		"-r", opt.hostkey,
+-		"-F", "-E",
++		"-F", "-s",
+ 		]
+ 	print("subprocess args: ", args)
+ 
diff --git a/net-misc/dropbear/files/dropbear-2024.84-tests.patch b/net-misc/dropbear/files/dropbear-2024.84-tests.patch
new file mode 100644
index 000000000000..a7c53a42884e
--- /dev/null
+++ b/net-misc/dropbear/files/dropbear-2024.84-tests.patch
@@ -0,0 +1,57 @@
+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/libteam/Manifest b/net-misc/libteam/Manifest
index 86975b71108d..f56ac690d876 100644
--- a/net-misc/libteam/Manifest
+++ b/net-misc/libteam/Manifest
@@ -1,8 +1,4 @@
-DIST libteam-1.23.tar.gz 173445 BLAKE2B 143e43cb092ac9aab8b152101c4c91c995436a6b02cf85fb710fa095a0bbd46fe70666149cfa9d86135b5496dd0287296e55d68f511aa5965c1d4f22f61ded57 SHA512 f78ceca4606b93e75fafdd97aa3cc44153fc42d31209f216c3da9c71abf38a2e4a690c71b8631ae09e02d7285d6bbd8292983fdc69eb921b0537a75558bc89f5
-DIST libteam-1.31.tar.gz 176331 BLAKE2B 77aae059b37a018e5503642138aa469f0769d305ec2043642fb1d84ff1d05f6eb90083946ca113cf3f9c21a09a17b3fbda327b714eb96743a10e99b89d5d5c83 SHA512 1382cc3b0a2d0211f33e506e8a6fd8a1847398fa5bba56abfc959da70bcc8417cf1dba9e26a777da5729eb237f51a66b3f9cfa33fb830ed684aa076f4c8cec9e
 DIST libteam-1.32.tar.gz 177184 BLAKE2B dd3e988d52a373c3c006e749ffee35b12f7b26f0cd154479769b4426d97a23509a52d0b50430ef4220bce4ef6ee73c827b3eeb3fe28537f40f65c45fcacb18b6 SHA512 38a0926f22733000dedb5669e8ba29bd9bce61b00dbdc713220eee520e10ce6eb979b02408f785463cd7b61ff3e57a78b43ed6baffb305e63a0fab0883493507
-EBUILD libteam-1.23.ebuild 1385 BLAKE2B b2e0d1cc1a2462590bddaf1f596ffe2ec5809b3fb0ce93cd5cf061888262d61f2774df44c2bd9f1e4aa1622f1444482ee64744b651a96261235c703be10a0e54 SHA512 5800a8bfd4f8e22bc13b3ebec6001b32893fedf2ecb83a1f4b83d7b216159b176e319ed9148ef9de4e1d75a64507dc6cea5be8da602e1be7645488a9120be579
-EBUILD libteam-1.31-r1.ebuild 1385 BLAKE2B b612417a4cb5696808efa9a1875f80a36109fbd9d40b95a2391779f27561a9f26e662fdea9fe2e7ba2034e8efbb2c138abe4b2b3fd42ffc972f91284b3e39a6f SHA512 b1038ba0dd24b60cb8094da49a54f5cf5e503bd7b73d9c7999b658601a5d4f8ab4a249cd1b4dc596155b6e69dce13b69f349b86352b928b3d52129545b2f58d9
-EBUILD libteam-1.32.ebuild 1439 BLAKE2B 32f33ffe89e0c85c4f327e82ec54e80d583d18ef8f487dd1928668673c1689e76210b9c1ca831fa6597d4372dd4275e16f97f3ed69509019b335ea50f3bcb7c3 SHA512 726788d0c1913a90042ef8b9a2c0f8bb60d175fe32348af32f7a853ff815cd7d543c3310c3ab166ff0ce86f63e025840b06ff5e99fbd18ef67adc1b871605931
-EBUILD libteam-9999.ebuild 1439 BLAKE2B 32f33ffe89e0c85c4f327e82ec54e80d583d18ef8f487dd1928668673c1689e76210b9c1ca831fa6597d4372dd4275e16f97f3ed69509019b335ea50f3bcb7c3 SHA512 726788d0c1913a90042ef8b9a2c0f8bb60d175fe32348af32f7a853ff815cd7d543c3310c3ab166ff0ce86f63e025840b06ff5e99fbd18ef67adc1b871605931
+EBUILD libteam-1.32-r1.ebuild 1531 BLAKE2B bbc6151a01b4c2ccad1e725e3ca5d7f172ed5eb9b9f8cd654b7b1954bccaf4307b39c8b5566001589799334c5be599f41293ca7fc7c35203c618a7d165c39f6d SHA512 1281f32015bd56724987966de78d9d92ded92f0a5f59c4261d7f4707e5348726054601f59a72146086a2d0e3265d3e8d70889c892eda886d22c2f204398d4002
+EBUILD libteam-9999.ebuild 1536 BLAKE2B 530700358726ff283cf4aca7ce976d78f893fcf0ba5e1f751b954066e0c26a9c190cfc5deb10f58c54017cb39a24074cd5f6a53bd69185a3b3a1bf015ecdef71 SHA512 2ab3e5081c9a19f3bab18668f3e7f68193dde789483b468b2a18e064bad8019d25fd96b38a6f27dbaf7e654045cb86141abaf53c05eb59a9751260f826bd695d
 MISC metadata.xml 335 BLAKE2B 481d37450ef0da0cd8a77fd8b73d67fee888f13bd984d52764c8e1694f5e128ad0dafa76c2851780ebc14a72d32a31cf0e598dee6960e9b10bfeca443dbb58ed SHA512 a6cb9893ad138246b783e91995b343d5b99d2becf776917bd413e64946373bfab7389fd958e8096061e1a8f2c52bb35ad69538bbddc6a0a9cba42ccfc1703c00
diff --git a/net-misc/libteam/libteam-1.23.ebuild b/net-misc/libteam/libteam-1.23.ebuild
deleted file mode 100644
index 1b9b1ec0290c..000000000000
--- a/net-misc/libteam/libteam-1.23.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pirko/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/jpirko/libteam/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Library and tools set for controlling team network device"
-HOMEPAGE="http://libteam.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="dbus debug examples static-libs +syslog zmq"
-
-DEPEND=">=dev-libs/jansson-2.4:=
-	dev-libs/libdaemon
-	>=dev-libs/libnl-3.2.19[utils]
-	dbus? ( sys-apps/dbus )
-	zmq? ( >=net-libs/zeromq-3.2.0 )
-	"
-
-RDEPEND="${DEPEND}
-	syslog? ( virtual/logger )"
-
-CONFIG_CHECK="~NET_TEAM ~NET_TEAM_MODE_ROUNDROBIN ~NET_TEAM_MODE_ACTIVEBACKUP ~NET_TEAM_MODE_BROADCAST ~NET_TEAM_MODE_RANDOM ~NET_TEAM_MODE_LOADBALANCE"
-ERROR_NET_TEAM="NET_TEAM is not enabled in this kernel!
-Only >=3.3.0 kernel version support in team mode"
-
-DOCS=( README )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable syslog logging) \
-		$(use_enable dbus) \
-		$(use_enable zmq)
-}
-
-src_install() {
-	default
-
-	insinto /etc/dbus-1/system.d
-	doins teamd/dbus/teamd.conf
-
-	if use examples; then
-		docinto examples
-		dodoc teamd/example_configs/*
-	fi
-}
diff --git a/net-misc/libteam/libteam-1.31-r1.ebuild b/net-misc/libteam/libteam-1.31-r1.ebuild
deleted file mode 100644
index 553f8a920da5..000000000000
--- a/net-misc/libteam/libteam-1.31-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pirko/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/jpirko/libteam/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Library and tools set for controlling team network device"
-HOMEPAGE="http://libteam.org"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="dbus debug examples static-libs +syslog zmq"
-
-DEPEND=">=dev-libs/jansson-2.4:=
-	dev-libs/libdaemon
-	>=dev-libs/libnl-3.2.19[utils]
-	dbus? ( sys-apps/dbus )
-	zmq? ( >=net-libs/zeromq-3.2.0 )
-	"
-
-RDEPEND="${DEPEND}
-	syslog? ( virtual/logger )"
-
-CONFIG_CHECK="~NET_TEAM ~NET_TEAM_MODE_ROUNDROBIN ~NET_TEAM_MODE_ACTIVEBACKUP ~NET_TEAM_MODE_BROADCAST ~NET_TEAM_MODE_RANDOM ~NET_TEAM_MODE_LOADBALANCE"
-ERROR_NET_TEAM="NET_TEAM is not enabled in this kernel!
-Only >=3.3.0 kernel version support in team mode"
-
-DOCS=( README )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable syslog logging) \
-		$(use_enable dbus) \
-		$(use_enable zmq)
-}
-
-src_install() {
-	default
-
-	insinto /etc/dbus-1/system.d
-	doins teamd/dbus/teamd.conf
-
-	if use examples; then
-		docinto examples
-		dodoc teamd/example_configs/*
-	fi
-}
diff --git a/net-misc/libteam/libteam-1.32.ebuild b/net-misc/libteam/libteam-1.32-r1.ebuild
index 23c3186d0a44..c2da265182f1 100644
--- a/net-misc/libteam/libteam-1.32.ebuild
+++ b/net-misc/libteam/libteam-1.32-r1.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=8
 
-inherit autotools linux-info
+inherit autotools linux-info systemd
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/jpirko/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="https://github.com/jpirko/libteam/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="Library and tools set for controlling team network device"
@@ -20,15 +20,16 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="dbus debug examples static-libs +syslog zmq"
 
-DEPEND=">=dev-libs/jansson-2.4:=
+DEPEND="
+	>=dev-libs/jansson-2.4:=
 	dev-libs/libdaemon
 	>=dev-libs/libnl-3.2.19[utils]
 	dbus? ( sys-apps/dbus )
 	zmq? ( >=net-libs/zeromq-3.2.0 )
-	"
-
+"
 RDEPEND="${DEPEND}
-	syslog? ( virtual/logger )"
+	syslog? ( virtual/logger )
+"
 
 CONFIG_CHECK="~NET_TEAM ~NET_TEAM_MODE_ROUNDROBIN ~NET_TEAM_MODE_ACTIVEBACKUP ~NET_TEAM_MODE_BROADCAST ~NET_TEAM_MODE_RANDOM ~NET_TEAM_MODE_LOADBALANCE"
 ERROR_NET_TEAM="NET_TEAM is not enabled in this kernel!
@@ -40,11 +41,13 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable syslog logging) \
-		$(use_enable dbus) \
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable syslog logging)
+		$(use_enable dbus)
 		$(use_enable zmq)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
@@ -54,6 +57,7 @@ src_install() {
 
 	insinto /etc/dbus-1/system.d
 	doins teamd/dbus/teamd.conf
+	systemd_dounit teamd/redhat/systemd/teamd@.service
 
 	if use examples; then
 		docinto examples
diff --git a/net-misc/libteam/libteam-9999.ebuild b/net-misc/libteam/libteam-9999.ebuild
index 23c3186d0a44..bd9779d7355e 100644
--- a/net-misc/libteam/libteam-9999.ebuild
+++ b/net-misc/libteam/libteam-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools linux-info
+inherit autotools linux-info systemd
 
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/jpirko/${PN}.git"
@@ -20,15 +20,16 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="dbus debug examples static-libs +syslog zmq"
 
-DEPEND=">=dev-libs/jansson-2.4:=
+DEPEND="
+	>=dev-libs/jansson-2.4:=
 	dev-libs/libdaemon
 	>=dev-libs/libnl-3.2.19[utils]
 	dbus? ( sys-apps/dbus )
 	zmq? ( >=net-libs/zeromq-3.2.0 )
-	"
-
+"
 RDEPEND="${DEPEND}
-	syslog? ( virtual/logger )"
+	syslog? ( virtual/logger )
+"
 
 CONFIG_CHECK="~NET_TEAM ~NET_TEAM_MODE_ROUNDROBIN ~NET_TEAM_MODE_ACTIVEBACKUP ~NET_TEAM_MODE_BROADCAST ~NET_TEAM_MODE_RANDOM ~NET_TEAM_MODE_LOADBALANCE"
 ERROR_NET_TEAM="NET_TEAM is not enabled in this kernel!
@@ -40,11 +41,13 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable syslog logging) \
-		$(use_enable dbus) \
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable syslog logging)
+		$(use_enable dbus)
 		$(use_enable zmq)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
@@ -54,6 +57,7 @@ src_install() {
 
 	insinto /etc/dbus-1/system.d
 	doins teamd/dbus/teamd.conf
+	systemd_dounit teamd/redhat/systemd/teamd@.service
 
 	if use examples; then
 		docinto examples
diff --git a/net-misc/tipcutils/Manifest b/net-misc/tipcutils/Manifest
index 318ea3894802..f448b7c66ec0 100644
--- a/net-misc/tipcutils/Manifest
+++ b/net-misc/tipcutils/Manifest
@@ -1,5 +1,3 @@
-DIST tipcutils-2.0.3.tar.gz 166337 BLAKE2B 70a06e0f71550123da9b10cc9330e89e2f0722614f00ab93d229baa78f189b3ae03a9aa70722245886e6dee4b9ebf9f95b9ecc06c4c552096afdf54cf28fab0c SHA512 7f07b4729dbd2c0c93cd69ffe6d2d082cd10f8de8bda335555548d14bd6287229da3686d288be3c10024cc6b607e6e4be983716f734f2d049352f924409511ec
 DIST tipcutils_3.0.6.tgz 84464860 BLAKE2B ff1422a651b74eb74351691510ef9f71453f48c713fae3da5239c4775e3d9c9c65621210827fc4fad6bdd1b794b8f20f550aeb3c600652de2c9e288312bfcc47 SHA512 b17f9d8ebd9a7b1134aacde3a2d8d99247c07dd1cab1be51ad7ba354e7384e50ec1bde02e338cb600746226209f0398ee9b2375fcd73191bdb75723bc66af606
-EBUILD tipcutils-2.0.3.ebuild 412 BLAKE2B 2b98ab0fef308984a0813a42d81ce04928d95d04c16702b0eca17d8e9bf1f65feed4c9723995ddf1f589433f433918aa5dd22df49988d63d9e579022f8b12fd3 SHA512 35a2cc33c8593c0b066483055d8169c80c5c48ab93cf2718ab88ca9c9eb040f78c9b1cadf957f3892a267b592341bc2caaeb18438d7cf7690a55e97e75a38877
 EBUILD tipcutils-3.0.6.ebuild 585 BLAKE2B e16d014c531df444a9a552de2624aab38ef8c29c35e79b034a1a67a7fcc67f3a5088fcf488ddbed9871c8fb6fdc10d3b5234f32c2c969a7e34e2e0d66b8c3639 SHA512 49293f7c63834918e695bfaf3155027258c8c26c303aa619b20c5780ac3a94228e6c5d07cc430f0309b2c49b2315a32c52d63dc08167afa3a968bf85a5f0504a
 MISC metadata.xml 242 BLAKE2B 2463df74d3a1b2a051fe5b0c4c8c451201c383a6fc0d1620cf1af24a00e6b19b746ce44129c03b8c148887792afe1631c76150da5090cbd177ddbba2116bb3c7 SHA512 623c82cb794dff9f0dcca67cb95845c3b571272e31495fbb81008866aad59e56567fe937e64991fc486856b85a24fc77c0877cb1e4d2e5a7532ca3b71affe813
diff --git a/net-misc/tipcutils/tipcutils-2.0.3.ebuild b/net-misc/tipcutils/tipcutils-2.0.3.ebuild
deleted file mode 100644
index 02ececd6a08d..000000000000
--- a/net-misc/tipcutils/tipcutils-2.0.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Utilities for TIPC (Transparent Inter-Process Communication)"
-HOMEPAGE="https://tipc.sourceforge.net"
-SRC_URI="https://downloads.sourceforge.net/tipc/${P}.tar.gz"
-
-LICENSE="|| ( BSD-2 GPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=sys-kernel/linux-headers-2.6.39"
-
-DOCS=( README )
diff --git a/net-misc/tuba/Manifest b/net-misc/tuba/Manifest
index c8ef7a92ce10..a0e77381819a 100644
--- a/net-misc/tuba/Manifest
+++ b/net-misc/tuba/Manifest
@@ -1,7 +1,5 @@
-DIST Tuba-0.8.2.gh.tar.gz 1751598 BLAKE2B 9fb0a32d7731ca406a6f79223c862fbe0b75493ace5dc2d83cdab111e955ded2f1b42c31542e38b027245df29ba6a84d88014cafdba0214bdb22910c933989bd SHA512 5d00843ae54c7f32adf5bdbecf0798730f797f778aea55bdc6fff1bf7fdb3b386544a209bd621a92774dcbe25d26503ca9da73211355866452069b6fa4542360
 DIST Tuba-0.8.3.gh.tar.gz 1783840 BLAKE2B 11f98de167107bdc53f42aa6e33af14d946b7745e530623b174832bc7ce363ca7b63f83ed2d58f9b179144ebf0499d6773f5be54c2f8fa0f8897b6a2ae020fe8 SHA512 29082a84e0b5149f8a8610575965d252826d564f28eb128a9db3c215a2c1edda23a3b6316f8b62c22a37ab9d340f94e571ea8be96719a3ff714a6b26da90a314
 DIST Tuba-0.8.4.gh.tar.gz 1803987 BLAKE2B 9ec1647bc255a3cef37293fc86f81eed534f4a313e3ec0ab81318766972ed01100b30afcc05448f5344637da08962bb72dc2eb5d44fc0561ce1a61c48b9b8b5d SHA512 8484cdb898174958c1e79ddfd6fab9e74693bca19d1eddde504679d1074cac986580dcf2e2c98fa13ab54fec2a4ffc25b1977bc6e62f1b3a524a6810b2ac268f
-EBUILD tuba-0.8.2.ebuild 1485 BLAKE2B 086983f0f203ccd28029a0e7f9f7181bbcc9400f1f32f08c877f3a138da74bfa14d969e6006e9540bf8a3ea73f1091e4d5c11bd7620d29539cf2c023d2af0049 SHA512 7e2e5f094c2922ad9cab185df380d492ac833e55fc0d058685eef197e8a08a76dfa589b97df5dcc9bf4729add269b9816add99fba68a26b6bcb462a41f54d14b
-EBUILD tuba-0.8.3.ebuild 1487 BLAKE2B b0d2e08a400365b2fc2c6a29f91e16276b971af0e346eb28498cbe57db6810fe73efc24bacdc4f6a96aba79441ace01fae498966741c7fc37c88f15a7edc2161 SHA512 058fd60ea34ee787967cfbb667475a6e8d904489a50eac361fc9a75f31c74edd60b9804c168539ef097f16f311133b0148728c242512c7eba82fbade8b21716d
+EBUILD tuba-0.8.3.ebuild 1485 BLAKE2B 086983f0f203ccd28029a0e7f9f7181bbcc9400f1f32f08c877f3a138da74bfa14d969e6006e9540bf8a3ea73f1091e4d5c11bd7620d29539cf2c023d2af0049 SHA512 7e2e5f094c2922ad9cab185df380d492ac833e55fc0d058685eef197e8a08a76dfa589b97df5dcc9bf4729add269b9816add99fba68a26b6bcb462a41f54d14b
 EBUILD tuba-0.8.4.ebuild 1487 BLAKE2B b0d2e08a400365b2fc2c6a29f91e16276b971af0e346eb28498cbe57db6810fe73efc24bacdc4f6a96aba79441ace01fae498966741c7fc37c88f15a7edc2161 SHA512 058fd60ea34ee787967cfbb667475a6e8d904489a50eac361fc9a75f31c74edd60b9804c168539ef097f16f311133b0148728c242512c7eba82fbade8b21716d
 MISC metadata.xml 324 BLAKE2B b9364b6c365bfaeda33ec6e0600582271501e80f0af0c075545a9d577e823bc4ce35ec37903f2f7f1f22c016b6bb0e7c40ef7d9ba8882fb924a865491bbb8dc7 SHA512 867574ad6665a12cb09aa75c525de101955dabdea5b744e688ab0b7214482ca5d151ed2007c5b050fbc69c48205fdbe5784aea0cb7ebce455d785200048b0a41
diff --git a/net-misc/tuba/tuba-0.8.2.ebuild b/net-misc/tuba/tuba-0.8.2.ebuild
deleted file mode 100644
index 9d6611efb92d..000000000000
--- a/net-misc/tuba/tuba-0.8.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome2-utils meson optfeature vala
-
-MY_P=${P^}
-DESCRIPTION="Browse the Fediverse (GTK client)"
-HOMEPAGE="
-	https://tuba.geopjr.dev/
-	https://github.com/GeopJr/Tuba/
-"
-SRC_URI="
-	https://github.com/GeopJr/Tuba/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-3 CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="amd64 arm64"
-
-# TODO: optional dep on libspelling-1
-DEPEND="
-	app-crypt/libsecret[introspection,vala]
-	>=dev-libs/glib-2.76.0:2
-	dev-libs/icu:=
-	>=dev-libs/json-glib-1.4.4[introspection]
-	>=dev-libs/libgee-0.8.5:0.8[introspection]
-	dev-libs/libxml2
-	>=gui-libs/gtk-4.13.4:4[gstreamer,introspection]
-	>=gui-libs/libadwaita-1.5:1[introspection,vala]
-	>=gui-libs/gtksourceview-5.6.0:5[introspection,vala]
-	net-libs/libsoup:3.0[introspection,vala]
-"
-RDEPEND="
-	${DEPEND}
-"
-BDEPEND="
-	$(vala_depend)
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		# disable calling updaters (see pkg_post*)
-		-Ddistro=true
-		# not packaged
-		-Dclapper=false
-	)
-
-	vala_setup
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	dosym dev.geopjr.Tuba /usr/bin/tuba
-}
-
-pkg_postinst() {
-	optfeature "WebP image support" gui-libs/gdk-pixbuf-loader-webp
-
-	gnome2_schemas_update
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/net-misc/tuba/tuba-0.8.3.ebuild b/net-misc/tuba/tuba-0.8.3.ebuild
index e75bb85f2c86..9d6611efb92d 100644
--- a/net-misc/tuba/tuba-0.8.3.ebuild
+++ b/net-misc/tuba/tuba-0.8.3.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="
diff --git a/net-misc/wput/Manifest b/net-misc/wput/Manifest
index b24c47c6ec3f..561310c61ffb 100644
--- a/net-misc/wput/Manifest
+++ b/net-misc/wput/Manifest
@@ -1,14 +1,7 @@
-AUX wput-0.6-respectldflags.patch 290 BLAKE2B e2880dc839b0eb2052f6f71e32bcb7f37e7ea57b162b661e0a0da216f35cc878f564d05bac1e209a9e0d0851d81f53781002a6237ae8ca2fcf133edd5d79d017 SHA512 48d7f547b5d386f0d80cc3dd96293f112144416b3c59f69ce7827c6f96b303a26cbcd17094b8988ed816113a70e3181846c415de6939034ed5c5c69baab91113
-AUX wput-0.6.2-fno-common.patch 559 BLAKE2B 47937469ca44f74bdbfede40b43fe2900153747ba3fc3735e70b4f6949cb80adb4cb878a7cd9c046d19e05f68921f125b8dd1fdc41459227b5fdd30062e92536 SHA512 4c48dd943e9551d54a70b5c0e289f85af5f4b1518c238a2184e75e62f2fcc1869f681edc48dc40a1249acf98c228c7e79595bc70930b22c1720d82b3e39dc123
-AUX wput-0.6.2-respect-destdir.patch 694 BLAKE2B 4c4466c56b8ecd1e36036c3d33901b76dfe53f918f40f7b3bb34f5e58dc02b701ea7a1969b71d2fdf788b9478d4c5fcaecc7136848fcf2f9e06da09761e58b88 SHA512 a92ef8c35a94b4ff624cb9f1b548cba656151ae88708ed6da889c297e6d09cf161282de9f5324f41ac3d02f2aa0817e86b663637577ff519d780d587cb214c15
 AUX wput-0.6.2_p20130413_p11-exit-not-found-musl.patch 187 BLAKE2B c82a7a26714e725b126dd44ecd8552c3ed4d7741231ff0e916b6b52efbd6753c1a1a95cab654bba16f5674d09166a0a86641b3fd2535ec5969671c0d3b8522b0 SHA512 ea1a376af8dabec687ae55cdb1ed4885df145596ab86aeed71bb109afe1e83661e5f33f2830b26cde9e0a3b369ef827bf5c4b7de8457f46482a192f261221574
 AUX wput-0.6.2_p20130413_p11-no-compress-manpages.patch 1166 BLAKE2B 47443b5de554c9e90dc248168a633c04b39cc06a1b732e57fb7aed20b00541896eeab65068a5397fc883151f4f4e955972e695b88ecb20cdc506e798712c8bf1 SHA512 1337a86ad4dc749bcd774e6cd17db70fb4624166e003c7ca28265b256b39e88f863db3b0e9ccf2e963bbc451fd0dc7a45f155b6f92ba2c81221264d5ba4c1f6f
 AUX wput-0.6.2_p20130413_p11-xopen_source-strdup.patch 607 BLAKE2B 22d150b7ed3d880eb73427fa5847b4892cd772b9de6569d0727afa472043d6d4b6f6795d1ad16964a4a7742cbab0f9f52a158c616893c0efc164b566851cee45 SHA512 06c460f4ec14ba8844330d33c51d75e23f4e023cf468226b23f51b5456bb3bc84940c1baf038f9f1003a0a27a8742b9afab43c5bc04653bcc422a35be0facff7
-AUX wput-fix-crash.patch 1974 BLAKE2B 229d5afe628682831d28ce1ccad0856883061749d863073dbcf58bd0a0cc435d84434d26068309154154e3c15922a0432ecc3fe01127d18767aea5b8d01a83b2 SHA512 2fa1e6793b9cda2695255196f30a5e615a013883efa5b10983c5bd38debf616bfb36ad2e61675700b32f32c0b4057ef7ec0c33c502fc3ead37e1547ecd944783
-DIST wput-0.6.2.tgz 368510 BLAKE2B bf59720e220d837354aff7d90bf06dcf54df4adf10c53ca844cb18dc6f327793ebd5dce7beecc76b43ddccfe273435a1eca918ab2272145dc8bf47293f601004 SHA512 e1d0fb8570cbda44c97215ee1a021a9867f2e91323b3d7f7df1d7fd68a1b2aba40a7f3068e5e85e8c736b1dba1fba62df375af99e3fb96cd0fd414b139c641bd
 DIST wput_0.6.2+git20130413-11.debian.tar.xz 15976 BLAKE2B 4f1facab61d22544855ce49875357c8d67d6eab013cf73cb8507a334c07b1f9e9391e342347eeafdb26b62a4156d4a0a4e2967198662ad66ef8ebb35ed2c9bf8 SHA512 d80e727edee34bd0f9b40b14c0ed1bfd2ec456542445fd38c487f06d47ca210d785e911a71d455d335b9e3940a5cfc19cc7202d93501b0b0f4f3a1e6f6a5fc0a
 DIST wput_0.6.2+git20130413.orig.tar.bz2 257503 BLAKE2B a5386f5de3e8df23d814b3a7ebba1725bcb75f0a61bd26ea402053bd11d717ae5bdd1c1bc9e43d4f4a61f55a91d9222fffe62988b869b68c206c46bfd89cf28b SHA512 f8bb23f60ae008ecd18ec7f891fc17fe8d2b3550d7788c591067e48af00c934f2c3b2e5d07234fc25bcf6cb94464710ff0309151e9ad6dd734f5a30c3fdab06f
-EBUILD wput-0.6.2.ebuild 854 BLAKE2B 70a81f3e2a7c1f6a52f2683d28196866045de2824ab24fdee12d098e879d9824a81e05b147de4bab2a155ec6206389ab81ccdd563f190e4bf70fc8d392fce17c SHA512 3ed6b3251e1b2528b4064a4955c64f631cac382b9a16ba2d7e48b74e6a9f969478b9e9e034d31d2201e54bc693db2142734d17fc49654e72c93cb2be70c601a0
 EBUILD wput-0.6.2_p20130413_p11-r1.ebuild 1455 BLAKE2B 7674c453b541b2dbcf5b6438c0398e920e549541cd7d729632b2492c1aae9db1c781962a71da2bdb8115557a1e0b2d0d523e3e10b135fa62da700d502e184ace SHA512 4868861b57a5ac2e8804bba9b80b588bc959f3e9259d31fae179e9f4e8312e823641c9d06a8603d4e7a1356d32c0cc958b198549c54c9d7febac4da7f38d2654
-EBUILD wput-0.6.2_p20130413_p11.ebuild 1388 BLAKE2B 613e496f6ab833f507f9d636684d31912aeebe06aa4c5531feca705241f5bf0090a0588a0d9f2c349a8dc14e0904e30e2af1ad0c4bcbac15f0e6f2c6b718ae90 SHA512 240d337044a757d32dbc66346c038092da126c73dd5fbabbeb09e35a2768515cc273996d1f83d9d7ca0cee525455cbfc62c3ce6bd31c5830850591e9f4124633
 MISC metadata.xml 240 BLAKE2B cc04007e3c26bf6c24277f885ef462ee5ee707f8e9d71d897736c9e82cd8ca5f1429139335c3f11c77006d8e087d5e5cf33adcc6737ce0c83811814dbc78847d SHA512 135b84e7440cd922b51279e0b3f661c881c49437ba05e185b9f003dbb2b7a5160e9dd0599d2af40ae3149f057d4f8e18a36092ed0d490219199fc0df344042e3
diff --git a/net-misc/wput/files/wput-0.6-respectldflags.patch b/net-misc/wput/files/wput-0.6-respectldflags.patch
deleted file mode 100644
index 9f0e09c4a78d..000000000000
--- a/net-misc/wput/files/wput-0.6-respectldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- wput/src/Makefile.in
-+++ wput/src/Makefile.in
-@@ -23,7 +23,7 @@ ftplib.o: socketlib.h ftplib.h
- ftp-ls.o: ftp.h wget.h url.h
- 
- wput:   $(OBJ)
--	$(CC) -o $(EXE) $(OBJ) $(LIBS)
-+	$(CC) $(LDFLAGS) -o $(EXE) $(OBJ) $(LIBS)
- clean:
- 	rm -f *.o *~ *.bak ../wput getopt/*.o
- win-clean: clean
diff --git a/net-misc/wput/files/wput-0.6.2-fno-common.patch b/net-misc/wput/files/wput-0.6.2-fno-common.patch
deleted file mode 100644
index f188141aa87b..000000000000
--- a/net-misc/wput/files/wput-0.6.2-fno-common.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://sources.debian.org/patches/wput/0.6.2+git20130413-9/single-declaration.patch/
-https://bugs.gentoo.org/706954
---- a/src/wput.h
-+++ b/src/wput.h
-@@ -140,7 +140,9 @@
- 
-   unsigned short int retry_interval;
-   unsigned       int speed_limit;
--} opt;
-+};
-+
-+extern struct global_options opt;
- 
- extern _fsession * fsession_queue_entry_point;
- extern char * email_address;
---- a/src/wput.c
-+++ b/src/wput.c
-@@ -55,6 +55,7 @@
- #include "utils.h"
- 
- extern char *optarg;
-+struct global_options opt;
- 
- #ifdef WIN32
- const static char * version = "0.6.2-w32";
diff --git a/net-misc/wput/files/wput-0.6.2-respect-destdir.patch b/net-misc/wput/files/wput-0.6.2-respect-destdir.patch
deleted file mode 100644
index 9cece1f388f8..000000000000
--- a/net-misc/wput/files/wput-0.6.2-respect-destdir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -16,12 +16,12 @@ win-clean:
- 
- install: all
- 	cd po && $(MAKE) $(MAKEDEFS) $@
--	mkdir -p $(bindir) 
--	mkdir -p $(mandir) 
--	install -m0755 wput $(bindir)
--	install -m0644 doc/wput.1.gz $(mandir)
--	ln -s $(bindir)/wput $(bindir)/wdel
--	install -m0644 doc/wdel.1.gz $(mandir)
-+	install -d $(DESTDIR)/$(bindir)
-+	install -d $(DESTDIR)/$(mandir)
-+	install -m0755 wput $(DESTDIR)/$(bindir)
-+	install -m0644 doc/wput.1 $(DESTDIR)/$(mandir)
-+	ln -s wput $(DESTDIR)/$(bindir)/wdel
-+	install -m0644 doc/wdel.1 $(DESTDIR)/$(mandir)
- 	@echo "----------------"
- 	@echo "Wput and Wdel installed. See 'wput/wdel -h' or 'man wput/wdel' for"
- 	@echo "usage information."
diff --git a/net-misc/wput/files/wput-fix-crash.patch b/net-misc/wput/files/wput-fix-crash.patch
deleted file mode 100644
index 3d0efc9fd37f..000000000000
--- a/net-misc/wput/files/wput-fix-crash.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/src/progress.c
-+++ b/src/progress.c
-@@ -181,7 +181,7 @@
-   static char output[15];
-   time_t secs = time (NULL);
-   struct tm *ptm = localtime (&secs);
--  sprintf (output, "%02d:%02d:%02d", ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
-+  snprintf (output, sizeof(output), "%02d:%02d:%02d", ptm->tm_hour, ptm->tm_min, ptm->tm_sec);
-   return output;
- }
- 
-@@ -261,11 +261,11 @@
- 		unit = 3, trate = trate / (1024 * 1024 * 1024);
- 	
-     if(trate < 100) 
--		sprintf(buf, "%s%.2f%s", (trate < 10) ? " " : "", trate, units[sp][unit]);
-+		snprintf(buf, sizeof(buf), "%s%.2f%s", (trate < 10) ? " " : "", trate, units[sp][unit]);
- 	else if(trate < 1000)
--		sprintf(buf, "%.1f%s", trate, units[sp][unit]);
-+		snprintf(buf, sizeof(buf), "%.1f%s", trate, units[sp][unit]);
- 	else
--		sprintf(buf, " %d%s", (int) trate, units[sp][unit]);
-+		snprintf(buf, sizeof(buf), " %d%s", (int) trate, units[sp][unit]);
-     return buf;
- }
- /* wrapper for our progress_bar */
-@@ -303,13 +303,15 @@
- 	remain = (int) (WINCONV (fsession->local_fsize - transfered) * ((double) time_diff * 1000)
- 	    / (double) WINCONV tbytes / 1000);
-     if(remain < 60)
--		sprintf(buf, "ETA    %02ds", remain);
-+		snprintf(buf, sizeof(buf), "ETA    %02ds", remain);
- 	else if(remain < 3600)
--		sprintf(buf, "ETA %2d:%02dm", remain / 60, remain % 60);
-+		snprintf(buf, sizeof(buf), "ETA %2d:%02dm", remain / 60, remain % 60);
- 	else if(remain < 3600 * 24)
--		sprintf(buf, "ETA %2d:%02dh", remain / 3600, (remain % 3600) / 60);
-+		snprintf(buf, sizeof(buf), "ETA %2d:%02dh", remain / 3600, (remain % 3600) / 60);
-+	else if(remain < 3600 * 24 * 100)
-+		snprintf(buf, sizeof(buf), "ETA %2d:%02dd", remain / (3600 * 24), (remain % (24 * 3600)) / 3600);
- 	else
--		sprintf(buf, "ETA %2d:%02dd", remain / (3600 * 24), (remain % (24 * 3600)) / 3600);
-+		snprintf(buf, sizeof(buf), "ETA **:** ");
-     /* NO, there won't be an eta of weeks or years! 14.4modem times are gone ;). god bless all gprs-users */
- 	
- 	return buf;
diff --git a/net-misc/wput/wput-0.6.2.ebuild b/net-misc/wput/wput-0.6.2.ebuild
deleted file mode 100644
index b721e93da415..000000000000
--- a/net-misc/wput/wput-0.6.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Tiny program like wget, to upload files/whole directories via FTP"
-HOMEPAGE="https://wput.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tgz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="debug nls ssl"
-
-BDEPEND="nls? ( sys-devel/gettext )"
-RDEPEND="ssl? ( net-libs/gnutls )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.6.2-respect-destdir.patch"
-	"${FILESDIR}/${PN}-0.6-respectldflags.patch"
-	"${FILESDIR}/${PN}-fix-crash.patch"
-	"${FILESDIR}/${PN}-0.6.2-fno-common.patch"
-)
-
-DOCS=( ChangeLog INSTALL TODO )
-
-src_configure() {
-	local myconf="--enable-g-switch=no"
-	use debug && myconf="--enable-memdbg=yes"
-	econf \
-		$(use_enable nls) \
-		$(use_with ssl) \
-		"${myconf}"
-}
diff --git a/net-misc/wput/wput-0.6.2_p20130413_p11.ebuild b/net-misc/wput/wput-0.6.2_p20130413_p11.ebuild
deleted file mode 100644
index 44e3ab8667a5..000000000000
--- a/net-misc/wput/wput-0.6.2_p20130413_p11.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="Tiny program like wget, to upload files/whole directories via FTP"
-HOMEPAGE="https://wput.sourceforge.net/"
-
-if [[ ${PV} == *_p* ]] ; then
-	MY_PV=$(ver_cut 1-3)
-	SRC_URI=" mirror://debian/pool/main/w/wput/wput_${MY_PV}+git$(ver_cut 5).orig.tar.bz2"
-	SRC_URI+=" mirror://debian/pool/main/w/wput/wput_${MY_PV}+git$(ver_cut 5)-$(ver_cut 7).debian.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}+git$(ver_cut 5)
-else
-	SRC_URI="https://downloads.sourceforge.net/${PN}/${PN}-${MY_PV}.tgz"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="debug ssl"
-
-RDEPEND="ssl? ( net-libs/gnutls:= )"
-DEPEND="${RDEPEND}"
-# Debian's patches to fix spelling means need gettext to regenerate
-# It's so common that it's not really worth the 'touch' dance to avoid it
-# or conditional patching.
-BDEPEND="sys-devel/gettext"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.6.2_p20130413_p11-xopen_source-strdup.patch
-	"${FILESDIR}"/${PN}-0.6.2_p20130413_p11-no-compress-manpages.patch
-)
-
-src_prepare() {
-	eapply $(sed -e "s:^:${WORKDIR}/debian/patches/:" "${WORKDIR}"/debian/patches/series)
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--enable-g-switch=no
-		--enable-nls
-
-		$(usev debug '--enable-memdbg=yes')
-		$(use_with ssl)
-	)
-
-	econf "${myconf[@]}"
-}