19 files changed, 23 insertions, 191 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 7484cd097d8f..9bbb66af07c0 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index be8209cf0ce0..de90259e7c65 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -20,6 +20,6 @@ DIST curl-8.9.1.tar.xz.asc 488 BLAKE2B 437268f6e5ba5db73f205fd87f3ded1e5fc200e8b
 EBUILD curl-8.10.1.ebuild 11392 BLAKE2B c62287914b25282543b8000a8a82f2ff82e65cc274ce2aa38837d4b919dd7f5f19d5da5330155731a431398e2bab5058fbfcfad3b0965f77943244719899619f SHA512 f08d3e6f150ec8efb2e155248a895b68c3295034f3362f114fbae4937d0c404fb2007ed0cecbf8a3fab137b2c53cccdee509fae179271b5120f79f248cf26ff6
 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 11437 BLAKE2B 5c15af12e413d1ffe706d8d2a8b4ed61122385bfebfa371df5aef1c7c9c98bdb92435654514269f5edb8e47da16b11debeb26ea3f4bb0373cb22bc830a34b987 SHA512 046129a10d26bc2107c105fbca816bf41efda10fce9caba0f7d6d909ae7933909db01c2a736848ba2c5b91dbd0fdfac35cc0ca344707a1fb0b226ff6254e6507
+EBUILD curl-8.9.1-r1.ebuild 11436 BLAKE2B 337069288e50cd94f75b2a749e26fb3ff294a1ec61030e19539bbfea814ac0f6bf94225aa299596ef5edc4003336a2eb89fdcb6f3f30a4602a51bc30ddde6d67 SHA512 c8ed815844fcfccb3b22b548a59ede8eaf06a49ab3b55754c499d0a5c7bf165a49d30cf50eaae6996ff3b308c5086aa95a890612fc6716b1ea19a2f67ed84b99
 EBUILD curl-9999.ebuild 11392 BLAKE2B c62287914b25282543b8000a8a82f2ff82e65cc274ce2aa38837d4b919dd7f5f19d5da5330155731a431398e2bab5058fbfcfad3b0965f77943244719899619f SHA512 f08d3e6f150ec8efb2e155248a895b68c3295034f3362f114fbae4937d0c404fb2007ed0cecbf8a3fab137b2c53cccdee509fae179271b5120f79f248cf26ff6
 MISC metadata.xml 2215 BLAKE2B aa0851849ffda831aeec7a6315d23892c35680ab42c0bc9a5662238e7b8289d5f48d5f2a60ab0bacba06f71271bf60d14958bfec029a048f732d22fdc60faded SHA512 7da9247a1bbb533ae0bdc919f5bd2ad7ed298a7f9e986dce6d2471cedeee9f1542a8ef79b1fdbca5a1a0d33194b99ff3d3f5c27054ac01a3f1e40a1e94d6c1b2
diff --git a/net-misc/curl/curl-8.9.1-r1.ebuild b/net-misc/curl/curl-8.9.1-r1.ebuild
index 8e993f5f0233..cb175aa92671 100644
--- a/net-misc/curl/curl-8.9.1-r1.ebuild
+++ b/net-misc/curl/curl-8.9.1-r1.ebuild
@@ -21,7 +21,7 @@ else
 		https://curl.se/download/${P}.tar.xz
 		verify-sig? ( https://curl.se/download/${P}.tar.xz.asc )
 	"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="BSD curl ISC test? ( BSD-4 )"
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index 38e6a3a9989a..1c7390e44099 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -8,7 +8,7 @@ DIST dhcpcd-10.0.6.tar.xz 269392 BLAKE2B 4afd08cf7377b2262d33bf3f7ac503e081572a7
 DIST dhcpcd-10.0.8.tar.xz 272116 BLAKE2B 1bf27387c13f192c6216e2f1ecad06bfa82267d5d6e08ddaa123789699fe9154222c33b1aa1f603e65ae8dce510cb24d48e72701494e0793c766e81f024f8bc5 SHA512 8c9bcd49a828dbc1089f49b73decefb6d1c3ef47fecaae242b08e3bdc8c3c49540d1d3551ab879d58df0dca64dcc64d7a29c665d1b1ebbd72d6a52662529eea4
 DIST dhcpcd-10.1.0.tar.xz 271660 BLAKE2B 9d47ae8b97ba082f980966a2c3f688c6a8addb10989c166dafebdb6491793815c4caddc3016334f6549923632fd01fc8ce0987eca31af01948b0f4a643f88b38 SHA512 25b3304471c85975e004f101fdd8dc6155065009e9d94719aadc6181717839c501d66740f002aa00acda73cce3c0d924f4241eed177688c4e794be301b059e04
 DIST dhcpcd-9.5.1.tar.xz 258280 BLAKE2B 355a98d415253608e8f586809d41e7654c1973d956cb3951218e1ff8c928ee414aa1b9854180c78e975898d9eb0f4cb9cc0fe64eefd5690b371989093e1bcb5a SHA512 979c180743d3e01d1996033d42c5606792e3acaef4e600f0ea51c362643a5b2743c6dc2792314c3b66edfa99c3b98d17f46cf3421e2088b37804e6e2167037ee
-EBUILD dhcpcd-10.0.10.ebuild 4928 BLAKE2B d091a9b7abdbca46dff1d9da2797a910719d62111e5a0a2f406e5c077096a389834e6e431c5d6dfdc267c774076390db736cd6e70bfd69adbeeec8c1285751ad SHA512 79abd5f89b642c6bb6acd07c8bbdf17c601f042e27592ab0c49bbbe7f64621aeabfaf2dc0e4551e6fbbd88be5905a14938b6c2fa77fdaf776cf5794ba8ee477d
+EBUILD dhcpcd-10.0.10.ebuild 4927 BLAKE2B 3dbfb502559abb44bd51cc3f732ae5610c493fae91f1b16e60428ea3ef31922c3d2ec4e75a040b5826607e411c07604d675fc8762c8008ef79982a0adc1a91a9 SHA512 1e4404ce6a14ec4e0bddf7d3eb169fcc50dc91e85951955896380b4798d28a97b02c7b35ebc86453a70f2798d4e72ce6b363ecf212a679f39865fff46987003c
 EBUILD dhcpcd-10.0.6-r2.ebuild 4908 BLAKE2B bc0e0e9861b2be679817a74bd7ff749038dd04f8653d7ca13732602c3184ff9728b1b6efcfb411972e77e425f444cc01b084dc95cc4310e82da32667151e1d36 SHA512 480c9c9c4d74bd0ff52e3efb339d73abb2ba2b2fc8373e6f6f2aa2075d628d6e230b0d707f5bbaf6581b86759bc561c708bf962f1e6a6cfe07f53cf267e5269a
 EBUILD dhcpcd-10.0.6-r3.ebuild 5147 BLAKE2B 9fefbb6c238edf8124d7a015954f6e3aab60870fe91664c705d2df6ee5a8e9694b542cee7fece90927ebbdb50ff249d5cbc6c928eac9938475b36fbc07280ea7 SHA512 8a3b7fb39663b07481239d2de7d4b8d6449e38b7f8024c280c97cdbbf1da59a031c1d23ee24fbc9af37565efe67eb8c3bf56e64568f761e26ddada8a76bcf388
 EBUILD dhcpcd-10.0.8.ebuild 5055 BLAKE2B 84dd290736fd5df2b1eee34233f906938928d2346e84e83893153db86a6bb66827913ff1e48eac5f47ff4d122a3c32e3782a977e7129c3e751d4466cb34d6ce3 SHA512 2905b9d6f5a8c12a801423972da34f6a0edf568ab48814b8d4cdfea9bc1e660d67444cd52162efc8cccabd3962d6be915c7bfb0dd69a4d1c501166d6f77a068c
diff --git a/net-misc/dhcpcd/dhcpcd-10.0.10.ebuild b/net-misc/dhcpcd/dhcpcd-10.0.10.ebuild
index 124741db8ce3..4a63060cb6be 100644
--- a/net-misc/dhcpcd/dhcpcd-10.0.10.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-10.0.10.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/NetworkConfiguration/dhcpcd/releases/download/v${PV}/${MY_P}.tar.xz"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
diff --git a/net-misc/dibbler/Manifest b/net-misc/dibbler/Manifest
index 9fba0eadee42..1965d1819040 100644
--- a/net-misc/dibbler/Manifest
+++ b/net-misc/dibbler/Manifest
@@ -6,6 +6,5 @@ AUX dibbler-client.service 134 BLAKE2B f425f3460ae1188b2a391e240dd8f64e3ed9b8114
 AUX dibbler-relay 348 BLAKE2B c9a8d1f2b130e00e9d0f4ad517fc5256ec1d09cde6b66c8641cdf6b171b170944866842d76a4619f2294dd30de9670dc45775d16253e96a1ee4a668ece576285 SHA512 5eb62c4c7e9a4c5b558d0fed79a41b5a2db996349ab5ebfdff2f50d2bf0ba0e4293aab1a9bb089014aacaa3a502a7a13c14b3f3fe9510d1c0d91fca2b0674745
 AUX dibbler-server 354 BLAKE2B 08b1177bbe9f3f1f1be809dd9f3617368257072e22ad6fe1e1a671429a2e488ac47d2902defd34b60b0adf9b6aaf0db119c8edb4c4ce8d510df8e0f0a8b260dd SHA512 3d2f1df6263e3373988d5ba75479a7bed16c3a363809fdde582afeebab0cda746c91d02f8a9535e15ed1095c098f4ab3721322092bc692e0403f8c46f16adcd5
 DIST dibbler-1.0.1.tar.gz 4375118 BLAKE2B 1418a20ecf96f0793b25165d2790bb12aec0dc9ffbdf248f996f736e375f466a5853f698bc3da753dae57db4493a662cc8962e5d1fb6d9dd7c0c9d893128773e SHA512 2369d4a3ca50a1c60bd5a47bf4168d4c113e2fdcb1ae4d937a3bf226c057142f2e81f6c46bf4e1dfa9ca0d2e92f7f857572a4bfb0d0dd721c35efe762e6c3ea0
-EBUILD dibbler-1.0.1-r3.ebuild 1496 BLAKE2B 124983839c7e8d03d2dbfb2d2918a6a3a199103d023eab28f390ae642b03c7ba221997947f9854b502e3998e09fbe8709623e295fa83d7655f013e1d4bafaf28 SHA512 d63eac62060c52868894a978220ead74436e533a49d4ec439f137dbba40e637fab7efb065233ea303cba6d2f21d5d842f6bc336c8525d2dd740d7dfb4a913f60
-EBUILD dibbler-1.0.1-r4.ebuild 1583 BLAKE2B e09ca17bc70657d26517df03180fc02546944a365394de71327b32b4e4fe7875d381b3bdf847784120a4b8679d3e9b9121886a497d841457ca88896ee0febcec SHA512 21e100c592326650998ea9d44bf8336bd5036d870e622edb4070ec0c21c816f0dd6d727647ff9e0448f4a2a069315e6df88f4bd04c3f1e147e3f33eacf65452c
+EBUILD dibbler-1.0.1-r4.ebuild 1581 BLAKE2B 70694f774c304384510d9e6c3ee1954b75137cefeb0b06ff442dbf768b033d297fea9ca673046f0e66a5cbfc0377b4194853485041bd04e922cf89e6d16573b5 SHA512 08cdcabd99b4ec15135b321ba56f09bca3f91c84ca0f24f79a1acd21083f97278d844aee3bf74b2a307a88ca209552d914004a6bc2e8a5088cc96de20394773e
 MISC metadata.xml 351 BLAKE2B 51aff11f362c4c0e745e34dbae88fcda3e9659536002bed0f2b4fd0cc6f41850be26c953a42192622e9a92876f1a0f2ec9859eadbbf8e580357bb370d81d3e12 SHA512 8f50b3f2c45a785458bc463af6e904de6649a3d4b4635dc63dddcbb37e8d792a4bc6dfc71fa8115aa62ad1521af692b1c57c4638429fc204f98c9423bf2f9eba
diff --git a/net-misc/dibbler/dibbler-1.0.1-r3.ebuild b/net-misc/dibbler/dibbler-1.0.1-r3.ebuild
deleted file mode 100644
index 0568063a62b9..000000000000
--- a/net-misc/dibbler/dibbler-1.0.1-r3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic readme.gentoo-r1 systemd
-
-DESCRIPTION="Portable DHCPv6 implementation (server, client and relay)"
-HOMEPAGE="http://klub.com.pl/dhcpv6/"
-SRC_URI="http://klub.com.pl/dhcpv6/dibbler/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~mips x86"
-IUSE="doc resolvconf"
-
-RDEPEND="resolvconf? ( virtual/resolvconf )"
-DEPEND="${RDEPEND}
-	doc? ( dev-texlive/texlive-latexextra )"
-
-PATCHES=( "${FILESDIR}"/${P}-fno-common.patch
-	"${FILESDIR}"/${P}-gnu-ism.patch
-	)
-
-DOC_CONTENTS="Make sure that you modify client.conf, server.conf and/or relay.conf
-to suit your needs. They are stored in /etc/dibbler"
-
-src_configure() {
-	# ODR violations, bug #861611
-	filter-lto
-
-	# Uses removed 'register' keyword
-	append-cxxflags -std=c++14
-
-	econf $(use_enable resolvconf)
-}
-
-src_compile() {
-	default
-	# devel documentation is broken and users should consult the online version
-	# http://klub.com.pl/dhcpv6/doxygen/
-	use doc && emake -C doc/ user
-}
-
-src_install() {
-	default
-	readme.gentoo_create_doc
-
-	dosbin dibbler-{client,relay,server}
-	doman doc/man/*.8
-
-	insinto /etc/dibbler
-	doins doc/examples/*.conf
-	keepdir /var/lib/dibbler
-
-	dodoc AUTHORS CHANGELOG RELNOTES TODO
-	use doc && dodoc doc/dibbler-user.pdf
-
-	doinitd "${FILESDIR}"/dibbler-{client,relay,server}
-	systemd_dounit "${FILESDIR}"/dibbler-client.service
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/net-misc/dibbler/dibbler-1.0.1-r4.ebuild b/net-misc/dibbler/dibbler-1.0.1-r4.ebuild
index fb3201a46045..84707e2e900e 100644
--- a/net-misc/dibbler/dibbler-1.0.1-r4.ebuild
+++ b/net-misc/dibbler/dibbler-1.0.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://klub.com.pl/dhcpv6/dibbler/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~x86"
+KEYWORDS="amd64 ~arm64 ~hppa ~mips x86"
 IUSE="doc resolvconf"
 
 RDEPEND="resolvconf? ( virtual/resolvconf )"
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index 5579558081ca..dab7f70aacf5 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -18,6 +18,6 @@ DIST dropbear-2024.86.tar.bz2 2306244 BLAKE2B 988e2cc03c123685c93ab8b1148b1844ce
 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 5406 BLAKE2B a818f64c8f8cef6e88634b7bfcd32a044941cc75e096f1f59a6dcdb0ba84ce1b789f847413dcb18ad07f2a48d93ec876c488e1a9a25bbfeffb01bfed27608cb7 SHA512 be7e426b3b49a1d8af7a81212564caff0390beb9a30e056cfd12931808ec4f66b72d3377e4970f7e7a2673f26ba8cfa3ae5ff8e020323dd6fe79325bf3c66054
+EBUILD dropbear-2024.85-r2.ebuild 5404 BLAKE2B bce5d3ac239a165f356ecaa525b46030c3f31094220c8b43ceeea219a445d2314ba19a4d289eaf25ae00c8a5a65970d74b75a588a391f2adecef45ac0db70e11 SHA512 75040e4392091ea25db242997d04a3b894807699c58ecc6d7909bb5b1fad289b9d83de399c1f8154d8df21ce27bb095e71569b2f4f7a0bc63e901cc8ec6f5331
 EBUILD dropbear-2024.86.ebuild 5558 BLAKE2B bab3a449dbdecc68138de6e0c40e0b1b4becdcfd9a805ce9cd2fcc42aef8970afb282147480b58f9eb11156dbfe09be02de7563238c2c53bd7ce52644145cd00 SHA512 b3a560c5f3d5edf7c63739940e058e9da37df3e5509bd38f0cc59977688b8007bed87773fa61d1fb27a90849ab27a46a6f7e0f9371b2776e4f6c4fa208fc3693
 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
index e5e747699863..282d72502f91 100644
--- a/net-misc/dropbear/dropbear-2024.85-r2.ebuild
+++ b/net-misc/dropbear/dropbear-2024.85-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI+=" verify-sig? (
 
 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"
+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 )"
 
diff --git a/net-misc/gallery-dl/Manifest b/net-misc/gallery-dl/Manifest
index b43a896cdf59..57714a5d5631 100644
--- a/net-misc/gallery-dl/Manifest
+++ b/net-misc/gallery-dl/Manifest
@@ -3,7 +3,7 @@ DIST gallery-dl-1.27.5.gh.tar.gz 722422 BLAKE2B cd15c00549e9ed9605b39b76b271932c
 DIST gallery-dl-1.27.6.gh.tar.gz 730206 BLAKE2B 4b47cb50599d401e3b3edf726afbe175e82b1617397cdd9c0ce389f1e43b16ece6d94dc44a015e515bb3e397f52b11f863e56b12fccb3bedc8e5d9e39fd90bcc SHA512 a72c30e0c7e64fb7eb8fd2b5a8de0c0b1570b5c2fc13adaddeb0a1ce9e721b299132b2e7ebbf932155b8880283c1b3e2783e037151557a167a8664ef01cce0f8
 DIST gallery-dl-1.27.7.gh.tar.gz 738516 BLAKE2B af29a40de14c392101c50698ae2199f64b458c8e5ab997982625773f21b069d5b3133c1a7897a743255962c5494e0536f36f4c4067872a06761a5a3a333e44ca SHA512 384c5a5c7dfac01ad48dbbe12750e5bec5814620bebd1d49866a9a3b6d64f7aac60e4173f737ed2678c6d57e372b6957cb747d28444981a4ddb7721bd4f9cff9
 EBUILD gallery-dl-1.27.4.ebuild 1137 BLAKE2B 6bddf5d2f20b3d3d9b480e3e7fee9a1d16790ce228a9080a30cbe0849ad027965eb86c0fe629f60099d84dbd65ac6c59ddd79ed43ff9ee234b4d8099b8b4c124 SHA512 85b53fc950769856e4d17aa0a359004e10e3353c9c627669db03e9fb71beec64d499fc76a844d65c6ab079bdd1c57486448fe6ba1c5c44eb39b374893c6e5f13
-EBUILD gallery-dl-1.27.5.ebuild 1144 BLAKE2B 8ae03c0e61632d87295dfff8aa25382716fd107415260bf3142a6ec0c5c9601cd219c03696e0e97bb9d0efe4e26dccad3be782473122f68f6fa9186332cb66d3 SHA512 f5761a87af190e6e5e259ea4c4fdb3eae2762c09632016842e5a5a10147510b6960f34255cc3c5aa175b6fecaf2e74bc89ceb7c6beb853c05696457f0a8a7668
+EBUILD gallery-dl-1.27.5.ebuild 1137 BLAKE2B f572a713f9a7b56f6c167b8a9ead10cd4a702e3e5f2ba106bf2d2f238b5583b6ac3a59cdae6be7777d5e99a6155e392f20efe0ce99e17ee27b0076c7ec782a78 SHA512 b6b65910d0a220cbf1df9f92ec2ad4162dc2c70ec399cf1e7d1982faba7a0f81e7d22ef479dc8d468c32d4320b17555254fb0eb778bf455f0d9dc72128e08e3d
 EBUILD gallery-dl-1.27.6.ebuild 1144 BLAKE2B 8ae03c0e61632d87295dfff8aa25382716fd107415260bf3142a6ec0c5c9601cd219c03696e0e97bb9d0efe4e26dccad3be782473122f68f6fa9186332cb66d3 SHA512 f5761a87af190e6e5e259ea4c4fdb3eae2762c09632016842e5a5a10147510b6960f34255cc3c5aa175b6fecaf2e74bc89ceb7c6beb853c05696457f0a8a7668
 EBUILD gallery-dl-1.27.7.ebuild 1167 BLAKE2B 9dd3c132317169d2e1d91c097399cbc6b70497472d7bba764133e43e81c5f89853779dde55e9dee71dfaa699ab1c79b72c91c27c9134b90cd7b16b8e1942cdd4 SHA512 70f0ed192f07d6cc9ac4bf58bdfeeae52ec16c5b3b7eb53ff435331bad41ccb3d2a968df714ef8ab1558bc78154245b1533063bfdd3a37f97e71c6d6444c9f58
 EBUILD gallery-dl-9999.ebuild 1165 BLAKE2B 51e7568c9f9e34ffdb20055f96ca9b91ce2f6831ea304028c88c43dfd4fbda0ff8bbaa310553e73a1b73408c12c2633af18e09e53e0127034f257ab6d90c7cee SHA512 0948a7989105ff3df14ccb9b71aa3cce1e67e053e9e52ea6823afca40863ea8fd16a50d53fea4b2aff9020bf7db110bbf534a85fca184d730999835b305bcfac
diff --git a/net-misc/gallery-dl/gallery-dl-1.27.5.ebuild b/net-misc/gallery-dl/gallery-dl-1.27.5.ebuild
index c785e9eeb31f..c166188396ab 100644
--- a/net-misc/gallery-dl/gallery-dl-1.27.5.ebuild
+++ b/net-misc/gallery-dl/gallery-dl-1.27.5.ebuild
@@ -20,7 +20,7 @@ else
 	SRC_URI="https://github.com/mikf/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz"
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 hppa ppc ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/net-misc/geomyidae/Manifest b/net-misc/geomyidae/Manifest
index 8c12008d5b1b..089f6c2aa298 100644
--- a/net-misc/geomyidae/Manifest
+++ b/net-misc/geomyidae/Manifest
@@ -1,5 +1,3 @@
-DIST geomyidae-v0.34.tgz 22242 BLAKE2B bc25f50c49c10e5a04b83a12cdcd7546b33f6a7d93eab504122bcfb2fdacfbcb82205890d5fd999d1b8b681c65dc0ef0dc5f95ea2d56a795fa371031c4af43b8 SHA512 55b7845c8b9fbee70b2e2bd71d2e3bb8e34c3029a1ea410cb39750763c81d5c31af8c703f7b673aa28fbfd61dd7915300ed4ff22f94c8430ac754681bc30ce41
-DIST geomyidae-v0.69.tar.gz 34631 BLAKE2B a1d7e33d403df5d6bb4d5fdc0999fdcfa94da058dd5dc1c0f22c49b9cc1b06cf45fafdb839eb91dec78be0aa778e3a74bf26d8ffa5054d45e5c6e86918480ad4 SHA512 c66f751472c35107c2c91f1675ab40bf68da1d3d5742ec94125c8ecba54b2832e82c8106a3627da53216cf3802ae7900ef8457c383160614ecce2a07b318662a
-EBUILD geomyidae-0.34-r1.ebuild 1092 BLAKE2B ac44156e892812b7c00ec072999f3c86a0d68f02c2b7dae9826778586d6486b9d0520627f2ccc89babaf2f310e8ced288e9893740c2be6a65861a89b2648cc70 SHA512 49a96889f0c256ad49eb7e7e6e424769ec40932551416ae89ebc23a19dbfa9b3e63257d354d1b4d5c056087a06d862feeec168750a57483500b8870ecf16ffcf
-EBUILD geomyidae-0.69.ebuild 938 BLAKE2B c338eaa89241505ddb2e4079d2cafe72f01eee13674c9ea8c99fa1b8ee106ee93909094e93e770288bfab2c38337ac57ddf5c684b12f9b52466bb651adc9f62d SHA512 2eedcb6e80195eed604fda396f72170d398a20e6bffa114d9735e22c80f2e376beaf91719041a7c108e7b75d7dc643a145445027cb9db6c5404059115aa224fb
+DIST geomyidae-v0.96.tar.gz 38373 BLAKE2B 30bc409e8a124a6375ef113919f6b78fcb59103243237e57951ee0cc2907adf9a45168e7ceed55cb29af09d83e96a2e8f6123ba4586e4f216dc1eb4eb8f031c9 SHA512 3c73baca4ae3a58dfc2b064c448ec7c1d34b110f8b88c301a4287d0565ad22ee1676a5cf18707771bb26352291f04586276d5dec74c10b66d3a1c340805afc91
+EBUILD geomyidae-0.96.ebuild 1023 BLAKE2B 96ad856de8713aab625a5aff1e81137b4f6373bc0d4958df9242cdc562d0c4166c818d62b8c8848a3340f1897c2c0a92058ff765c9f5f12c1ffaf08b6706094d SHA512 c44e619ffdb268fa2710e16d5f278e2885fd95cc7f46b4ea2d9005417c0d1072c0f0d14d0b5316e8ab62c91b788403214394c9e05c45a899f4a36a6ecdfa2912
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/net-misc/geomyidae/geomyidae-0.34-r1.ebuild b/net-misc/geomyidae/geomyidae-0.34-r1.ebuild
deleted file mode 100644
index 36930da5891e..000000000000
--- a/net-misc/geomyidae/geomyidae-0.34-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="A daemon to serve the gopher protocol"
-HOMEPAGE="http://r-36.net/scm/geomyidae/"
-SRC_URI="ftp://bitreich.org/releases/geomyidae/${PN}-v${PV}.tgz"
-S="${WORKDIR}/${PN}-v${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-RDEPEND="
-	acct-group/gopherd
-	acct-user/gopherd
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# enable verbose build
-	# respect CFLAGS
-	# remove /usr/lib from LDFLAGS, bug #731672
-	sed -i \
-		-e 's/@${CC}/${CC}/g' \
-		-e '/CFLAGS/s/=/?=/' \
-		-e '/GEOM_LDFLAGS/s:-L/usr/lib ::' \
-		Makefile || die 'sed on Makefile failed'
-	# fix path for pid file
-	sed -i \
-		-e 's:/var/run:/run:g' \
-		rc.d/Gentoo.init.d || die
-
-	eapply_user
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dosbin ${PN}
-
-	newinitd rc.d/Gentoo.init.d ${PN}
-	newconfd rc.d/Gentoo.conf.d ${PN}
-
-	insinto /var/gopher
-	doins index.gph
-	fowners -R root.gopherd /var/gopher
-	fperms -R g=rX,o=rX /var/gopher
-
-	doman ${PN}.8
-	dodoc CGI README
-}
diff --git a/net-misc/geomyidae/geomyidae-0.69.ebuild b/net-misc/geomyidae/geomyidae-0.96.ebuild
index 3bd6b1bc1db3..0ca0e14bb6b9 100644
--- a/net-misc/geomyidae/geomyidae-0.69.ebuild
+++ b/net-misc/geomyidae/geomyidae-0.96.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="A daemon to serve the gopher protocol"
-HOMEPAGE="http://r-36.net/scm/geomyidae/"
+HOMEPAGE="https://r-36.net/scm/geomyidae/"
 SRC_URI="ftp://bitreich.org/releases/geomyidae/${PN}-v${PV}.tar.gz"
 
 S="${WORKDIR}/${PN}-v${PV}"
@@ -15,12 +15,13 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 
+BDEPEND="acct-group/gopherd"
+DEPEND="dev-libs/libretls:0="
 RDEPEND="
-	acct-group/gopherd
+	${BDEPEND}
+	${DEPEND}
 	acct-user/gopherd
-	dev-libs/libretls:0=
 "
-DEPEND="${RDEPEND}"
 
 src_prepare() {
 	# remove /usr/lib from LDFLAGS, bug #731672
@@ -32,6 +33,7 @@ src_prepare() {
 }
 
 src_compile() {
+	append-cflags -D_FILE_OFFSET_BITS=64 # bug 927733
 	emake CC="$(tc-getCC)"
 }
 
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 127b58180f68..09825f57e34f 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -29,6 +29,6 @@ DIST openssh-9.9p1.tar.gz 1964864 BLAKE2B 817d267e42b8be74a13e0cfd7999bdb4dab635
 DIST openssh-9.9p1.tar.gz.asc 833 BLAKE2B 0e19668eb5cadea0e7b06caf2bc2f4cee7e7656a780a128090dcdf2acc25c6e0e0fc7c4c83c95ffcd567cd03941ec772b0f5b273e6f79ff4e440e1d9f22bcdb7 SHA512 916e975c54eb68c0b2f0b0006522b241cbe54c4caa88d31537a6278490c93d9d732c2ab3a080ac084bf75cbdd5402901ec68583cbe7c7cde4a8e40e7a8b78c28
 EBUILD openssh-9.7_p1-r6.ebuild 14116 BLAKE2B 423d6ab5e9af91f0996bb74e70984fbdc41f276e3364f35d9e1db39d2cd72582b8ca5192c67d07e57a6322289061e9e1ddcfc2cddcee9137cd7e79486157178a SHA512 fe3ceb2912f342fbd0ac9bd6229ddb4c00c0d7c0c0225763d68dfcd2dc69c128ae2cd5101bdac91a4baa179544b273708770dc63c686b2b9751d3391b2799239
 EBUILD openssh-9.8_p1-r2.ebuild 15271 BLAKE2B d8d4f794f7e9b7f9e9d74acc813bb4860ccdf660c38a629cd4c3553e0ddcc2eabbd1dab7603ae06e4bbe031421083e0a4813c25ca38625989f0a74fb06620e24 SHA512 3b36919fce944984eeb9c21d6df80e3dd9a7c34846165a31e8c48652fb0c3428599b505147092e14aee3e6f5ac6b4ef37aabcb3a7300d3b04da6f32eb47e18a6
-EBUILD openssh-9.8_p1-r3.ebuild 15369 BLAKE2B 5024d63792ce1415170a1fc9054c019e519c6a47754b8f34c3449f416f46658c2e319d67732e648682d2cf19041c64707323bc9dc54b29dcf83461ed280e9e0d SHA512 e4a4e382335d30ab3a0bd0050b3309f4600f2c332cad08bd9f62e899fc899a035cbdc6729720e1422a92ccae9d9400c30eace2a86115caa73c8918b86cd648a9
+EBUILD openssh-9.8_p1-r3.ebuild 15367 BLAKE2B 89b1c96fc61495ca4ad07cf3250d0a41cfd483f45c4dd9dfda5dc60585c421790a4335e9dcbdbf3d7e58858737058f0cb453d5ec7edab4a7664780ff7395f0c0 SHA512 7c5e736e16421ca625b9df3fe59facefbbb0576f5f44a185eb0685425bd3c58c244e384e44fb91ceaf89e84eaee94813691e3c82d2b6a55102805506bea53f1f
 EBUILD openssh-9.9_p1.ebuild 15564 BLAKE2B 3f8dc0f461af2d92c67ce8dbdd199f844a5585acc7c95237cdea669cdbbcc6da0441a7ab999b1460501a870de7180be1f6d3619b29847873ef434938789e33a9 SHA512 c3fa33708753f53866f5f54a0a468dbea3fda4dd1eb40c4becbdea44b9496a21609ddbb37fcf4540887ba5971c212ad1dcb7bb44bdd60fe614fbbc0c7376d82c
 MISC metadata.xml 1967 BLAKE2B 9e586a4c515035bc31be950c3872c379e01dae2cc460239cde37b83d6ca8494d36d1e1f858195b34af76074a966278c323ab24ba5e78adfa70be297c1f21336f SHA512 83563c27789a4c12149f037d9318b66d6caf383a82f0f6f7025378bd2a3017d41ff96b5aea3d08e4407d85f3d1a089a51ae6c7fa3970c20b2d8d721962ddbf69
diff --git a/net-misc/openssh/openssh-9.8_p1-r3.ebuild b/net-misc/openssh/openssh-9.8_p1-r3.ebuild
index 771c209d6170..129f86bd6eb7 100644
--- a/net-misc/openssh/openssh-9.8_p1-r3.ebuild
+++ b/net-misc/openssh/openssh-9.8_p1-r3.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${PARCH}"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 # Probably want to drop ssl defaulting to on in a future version.
 IUSE="abi_mips_n32 audit debug kerberos ldns legacy-ciphers libedit livecd pam +pie security-key selinux +ssl static test xmss"
 
diff --git a/net-misc/zsync/Manifest b/net-misc/zsync/Manifest
index a7f3761d5d70..17dfafbedd43 100644
--- a/net-misc/zsync/Manifest
+++ b/net-misc/zsync/Manifest
@@ -2,6 +2,5 @@ AUX zsync-0.6.2-musl-off_t-fix.patch 326 BLAKE2B 9907bac0ca55ebae23318555a0b150f
 AUX zsync-0.6.2-zlib-1.2.3-support.patch 7069 BLAKE2B 841778a6495e1e0853965b8e7c6b8f2df51d98e73806f78197ac147a9ed57331e9b13d17dbc92f13c0dbc6887d145946ce5dcf769d51234aac9d40ade2d4fe7a SHA512 b572510cb135f97d63df6d49e3f07ce91c30926c91d1096f73d4577be754bcb37c8106ac51a1a0a651d9e77b971b4fdbdc82380b081b2065183ffa95930bcd47
 DIST zlib-1.2.3.tar.bz2 425209 BLAKE2B e4226371cbb4219d5f287bbb48a7bf6f8195b9b8de05c168238f39d82f53727f9a2090ceaac45032c6bbece9f839882cf0cd59c783d38be285eae0c02a30b895 SHA512 edae735960279d92acf58e1f4095c6392a7c2059b8f1d2c46648fc608a0fb06b392db2d073f4973f5762c034ea66596e769b95b3d26ad963a086b9b2d09825f2
 DIST zsync-0.6.2.tar.bz2 245592 BLAKE2B 9e5a7538a2268d4d3042db44722546d2e76d69d28bd965a3674bf517b12429c4ac6dea86b022047d635163bfd7e71d7e332b5a831cbee7db2544b9ed56d3a4ee SHA512 56437594831f2320c532759805b5c51116c53c8848f14b54cfd9b76676d1d061abe7fc914264f496ed1c7922fbbd5b884166c855a2fb9eb1285f216e478c5f0d
-EBUILD zsync-0.6.2-r2.ebuild 1078 BLAKE2B 15822b79f5e8a7c46624f8a12c7f466264689b609899af6a9d819062f1d4ef549c0267f5a02469f2c2648442c75f49c0971df59dde286680302ffff0ab6e3bb4 SHA512 8d4fd032dca7d9bb4de29aff16297ccca060c92fbd66d7bf81ae2612d7e888c04abc2e6e5847811c07801f4e9703bbdd6f9aa185d62ca9badc3c306f78564e61
 EBUILD zsync-0.6.2-r3.ebuild 1139 BLAKE2B fade6f795770c982e95a019f85fd55326167a853399360f4a210604311e66e20c177a4a9f3c6f3232c26a22f51b18b83ee38ab0e921befcb934f6a8cc10adbca SHA512 ce00c18d12a9bee8a0a2373a43709c23269ac09c68d52896f01eb3715b445ba1ed37adf3fdb5865d566d483366af737f55e85d7f6ad38851d35cb0aa95b1f09c
 MISC metadata.xml 1324 BLAKE2B 6a0cf68e98964abcd423f9d5d9e293c5d4c152b1ed2fc98ab805927d2f0dcdda6a07e2a16bbe590bbbe23590e1fae99e4c618680d4db3864d7cec20b175a6656 SHA512 99151fb2267583e7f3174087a2758aebfcfbcb81196af87c7d4f84c847806f08ad35a361fbc3ade104a60fcd555b5110712b8569a9993bbfd0574992eb36704c
diff --git a/net-misc/zsync/zsync-0.6.2-r2.ebuild b/net-misc/zsync/zsync-0.6.2-r2.ebuild
deleted file mode 100644
index 1c720f6dd78f..000000000000
--- a/net-misc/zsync/zsync-0.6.2-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-ZLIB_PV=1.2.3
-ZLIB_P="zlib-${ZLIB_PV}"
-
-DESCRIPTION="Partial/differential file download client over HTTP using the rsync algorithm"
-HOMEPAGE="http://zsync.moria.org.uk/"
-SRC_URI="
-	http://zsync.moria.org.uk/download/${P}.tar.bz2
-	http://www.gzip.org/zlib/${ZLIB_P}.tar.bz2
-	http://www.zlib.net/${ZLIB_P}.tar.bz2"
-ZLIB_S="${WORKDIR}/${ZLIB_P}"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-
-src_prepare() {
-	default
-	# Move old zlib-1.2.11 out the way
-	mv "${S}"/zlib zlib-1.2.11-modified || die
-
-	cd "${ZLIB_S}" || die
-	# I am not sure how many other zlib patches we will need to port as well
-	# This covers the security vuln in 1.2.11
-	eapply "${FILESDIR}"/${P}-${ZLIB_P}-support.patch
-	rm Makefile || die
-
-	cd "${S}" || die
-	cp -a "${ZLIB_S}" "${ZLIB_P}-modified" || die
-	ln -s "${ZLIB_P}-modified" zlib || die
-
-	eautoreconf
-}
-
-src_install() {
-	dobin zsync zsyncmake
-	dodoc NEWS README
-	doman doc/zsync.1 doc/zsyncmake.1
-}