gentoo auto-resync : 13:12:2024 - 02:01:50

11 files changed, 492 insertions, 4 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 3fe31f1ae1b0..2ca24e9f3336 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index db43cabcccd4..b32b31402aae 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -5,6 +5,7 @@ AUX curl-8.11.0-duphandle-init-netrc.patch 5422 BLAKE2B 6e2fe6e3e9995dcff165a1b2
 AUX curl-8.11.0-mbedtls-global-init.patch 1868 BLAKE2B 722959cd1f70d336f093ae83304bbb2800cc3d38eead28493955770e7e8f8e2f3d7cbf8eacfd6b8631b554768b618eb5278a3bd856d58d0e68e72864333c91c3 SHA512 316eb357b06a46484103f47c46a9103e80d5131463a17248ca1000f035e6c34acc73d78a73ab931d7a9710feacb859ff641bfac7912bda40b4d61536bf7b1208
 AUX curl-8.11.0-netrc-large-file.patch 719 BLAKE2B b7a838f76a6c6eba341bacb7826caf1c7ca73c57a3b60f8136b47b32e91bfe3b0663d47b3273095b8a93736ceda96833d25f106d82efbc7afe6315020bfca798 SHA512 ef0d4204e6ca7bee17ccebf20ea6873076a571819bcece058eae7e6c3a62bff431d6161aa4da0725ea1e8b278f121d682361f4df1fe4adc58a1375e611a510a8
 AUX curl-8.11.0-setopt-http_content_decoding.patch 691 BLAKE2B a812c178c0a3a4f5dc78fc576c9aef247de70eb32ab02b96e2e1e5b9428e6928c538e0a981ac98ae2f1428ae4c12bad767e1efc32a48a21ed99e0afc50180ec6 SHA512 9ef6fca7ae98bce6cee40ca5c25e7a22e937e0118bcee948e95cb8a8c5e6ca3f7e8b2327716cf7d55d976bfd6d30d57617d7da52ff971b82b22ff33878fa1d3e
+AUX curl-8.11.1-async-thread-close-eventfd.patch 1080 BLAKE2B fa1ff8ff20870c80a4c7dd0ef2ec116ce78a987b9659a77f513c44b6237f0b0b6bf48e547cefd6e157d85ee6113669bffe02e6f7321b19a8ffec12caa2d655f4 SHA512 a4662fbea884a05e151c0d100e012e9f1c1f8de53f70f20c9df6fc54ea9d293211475dd084bae32bf0508c7438971f921f6840cae4e9424589511dbe44584609
 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
@@ -21,12 +22,15 @@ DIST curl-8.10.1.tar.xz 2726748 BLAKE2B bfdfa24f6d652884044c5e8eea5d70daad651b46
 DIST curl-8.10.1.tar.xz.asc 488 BLAKE2B 8e8f2b628d4e8964a76c1c43c5557aacbfc2d2dbc51be8a0fa1b157c257f15f29aedba842cba7cb270c4adcf0b4a5d9c8b0b3d49633c48b061fb3e1472303d66 SHA512 21d6d560c027efc9e3e5db182a77501d6376442221ba910df817e2ec980bee44a9fe2afc698205f8d5e8313ae47915a341d60206a46b46e816d73ee357a894ac
 DIST curl-8.11.0.tar.xz 2750684 BLAKE2B 3db13ed558bee332e07e1eab878b5ecae14cd049c115eea3a25fcb78cf28aadfe577dc224df75b62844529994ec478a9a74fed5c9bae338f809d231420ae5d0a SHA512 3a642d421e0a5c09ecb681bea18498f2c6124e9af4d8afdc074dfb85a9b0211d8972ade9cf00ab44b5dfed9303262cd83551dd3b5e0976d11fc19da3c4a0987e
 DIST curl-8.11.0.tar.xz.asc 488 BLAKE2B 5d91dc654d6a62c66e344ca92676b42e7a49f437e14f9fb714f7ae64a266d24d9bb7006b4512fc323459072ff0d9e05f627e494f34f845eadbedbd83acacc2ce SHA512 71073dde48e8f0013e392eb88bf70f6b8a4a4f0c955a3fb56db98e74aa10acc1004e2a0483f30be082e61b59a76fa75ae1d90545ace7c6b07bca8164078375f0
+DIST curl-8.11.1.tar.xz 2751236 BLAKE2B a87ec2c78c5d6daf44eee4cf8e3ed124849d067f6c63145205fda18f33ddd3adce386058ead8f9b713f8e595f5e059acd13479eb00edc226247aabd3c2234112 SHA512 7c7c47a49505575b610c56b455f0919ea5082a993bf5483eeb258ead167aadb87078d626b343b417dcfc5439c53556425c8fb4fe3b01b53a87b47c01686a3e57
+DIST curl-8.11.1.tar.xz.asc 488 BLAKE2B 53d58ebb8ab722d8394b7ce94b646c876324cd89b3e47d9129bddcfbb6db338c1dbe93a5e72a25caf7be9ddd450c2b0832cfee17beb8ba701bdeefe653235d53 SHA512 c09bedb67e83fb8ca3ad73c5bd0d92fed7fc2c26dbe5a71cccb193fd151c7219713241a9fe74baefcd1d008cfafba78142bf04cec24dd4a88d67179184d35824
 DIST curl-8.8.0.tar.xz 2748860 BLAKE2B c14903bad4cbd1752a5335afa6bcc78be1a484692fce0e0a6c2061963e0e6b4e56defb8332cef32d0dbddb481ad0443b71faf3a52a6e9d945c89ecbce373d2a3 SHA512 9d2c0d3a0d8f6c31ba4fabe48f801910f886fde43dc198dc4213708d6967ed5e040a1bb7348aa1cb126577ee508a3ec36fe65256d027d861d6ffb70f6383967a
 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.1-r1.ebuild 11385 BLAKE2B 0f09cc5b469e9edebd995a6130d923bf4671c5cfbc6c3ce457410be96e76dafa4a46bfa775c3794cf7d1d4b7cae78b022de68e310f213d75e5c9622f6e7333df SHA512 0fca00398603ad0f3bc567813a93e44b58256960e453e2a92ff8df8d27426aac840d79a2f3a2fb253b39059c8fb5e79fe7a015d4443510fe8b816a72c9c165c6
 EBUILD curl-8.11.0.ebuild 11726 BLAKE2B c6fd58bc7434bea257db5919b1f9f8fa2b44b31dc97de0b214ab94d35ed66c345ae8324cdf7d770e6ad5b53a6581b48d13209925a3a3ad634c38956ca9e01ee7 SHA512 cbcbcee909da5c8b52400edaf8053b42f399d85459115590be24af153a8245a7a4c42936df77ccf52f7c4c1b24688c6506f660a4093215c2dc04d19786fd1997
+EBUILD curl-8.11.1-r1.ebuild 11445 BLAKE2B 648d54cac69dfb1a357c70be06d42c1b56313e6eb4128aaf776132c28c48337084985bc0cadf062bf28d83efc984fcf702a27485bdf0a6dc3dd0114941e9eb0d SHA512 e6d13d51d639a0664165b1b3ec27a69e70280f29d166bac3de67bf427f001575ac740e54ec721c3221cb23c202200b66e5967691dc8bb41b1e66e96d735269eb
 EBUILD curl-8.8.0-r1.ebuild 11486 BLAKE2B 78e181625ecccde5701d54c9bdc7e695b8e54c5b7a7e2218ed49a163a23f9f43cedf202aec23662be82efd983d48722545332d23c2a66a051f37efd6dd355e3e SHA512 6d0130b4eb2ee00e49b6cf90adafcdc29e4522abbb928771a6b8c2aa6b80a298e0919550615e6810a24347484f20921c5bf1b6e237ec442744fabdbb92b5b553
 EBUILD curl-8.9.1-r1.ebuild 11435 BLAKE2B c54e700dbd603d459b7ec54da874c0fa9f27ad6192caa4057d83858599e1b9c0f8744268e689fc98942aff850b65d6638fa2081c43be19fb6018cc31c4c54f8c SHA512 bf5211f859acfc46b7903df7ca0edc2b88c10efb1343f55d2c21ef30c5e2f1844657babb9efb81ea28960c2b69174992c903181d9cf6d213f0ea72db14343b24
 EBUILD curl-9999.ebuild 11392 BLAKE2B 12be74dfe0743353d6f03ff2ab8eb18cf5fa28ff6021632943b6a56743c6d07410494a0dbf017e075c30c3e6ba381d0ae4c2193f0910a259ed90a9d17287009d SHA512 163515c9094f91135226569336bfc7ed7c76d83c77dac1a4c3bed6d9cbfa859af2e170c937cd3f2f2913aae036af2c21885e33cd07187c532c5a164c42e5c431
diff --git a/net-misc/curl/curl-8.11.1-r1.ebuild b/net-misc/curl/curl-8.11.1-r1.ebuild
new file mode 100644
index 000000000000..ddd74bc97377
--- /dev/null
+++ b/net-misc/curl/curl-8.11.1-r1.ebuild
@@ -0,0 +1,384 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maintainers should subscribe to the 'curl-distros' ML for backports etc
+# https://daniel.haxx.se/blog/2024/03/25/curl-distro-report/
+# https://lists.haxx.se/listinfo/curl-distros
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielstenberg.asc
+inherit autotools multilib-minimal multiprocessing prefix toolchain-funcs verify-sig
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.se/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/curl/curl.git"
+else
+	SRC_URI="
+		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"
+fi
+
+LICENSE="BSD curl ISC test? ( BSD-4 )"
+SLOT="0"
+IUSE="+adns +alt-svc brotli debug +ftp gnutls gopher +hsts +http2 +http3 idn +imap kerberos ldap mbedtls +openssl +pop3"
+IUSE+=" +psl +progress-meter +quic rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp +websockets zstd"
+# These select the default tls implementation / which quic impl to use
+IUSE+=" +curl_quic_openssl curl_quic_ngtcp2 curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls"
+RESTRICT="!test? ( test )"
+
+# Only one default ssl / quic provider can be enabled
+# The default provider needs its USE satisfied
+# HTTP/3 and MultiSSL are mutually exclusive; it's not clear if MultiSSL offers any benefit at all in the modern day.
+# https://github.com/curl/curl/commit/65ece771f4602107d9cdd339dff4b420280a2c2e
+REQUIRED_USE="
+	quic? (
+		^^ (
+			curl_quic_openssl
+			curl_quic_ngtcp2
+		)
+		http3
+		ssl
+	)
+	ssl? (
+		^^ (
+			curl_ssl_gnutls
+			curl_ssl_mbedtls
+			curl_ssl_openssl
+			curl_ssl_rustls
+		)
+	)
+	curl_quic_openssl? (
+		curl_ssl_openssl
+		quic
+		!gnutls
+		!mbedtls
+		!rustls
+	)
+	curl_quic_ngtcp2? (
+		curl_ssl_gnutls
+		quic
+		!mbedtls
+		!openssl
+		!rustls
+	)
+	curl_ssl_gnutls? ( gnutls )
+	curl_ssl_mbedtls? ( mbedtls )
+	curl_ssl_openssl? ( openssl )
+	curl_ssl_rustls? ( rustls )
+	http3? ( alt-svc quic )
+"
+
+# cURL's docs and CI/CD are great resources for confirming supported versions
+# particulary for fast-moving targets like HTTP/2 and TCP/2 e.g.:
+# - https://github.com/curl/curl/blob/master/docs/INTERNALS.md (core dependencies + minimum versions)
+# - https://github.com/curl/curl/blob/master/docs/HTTP3.md (example of a feature that moves quickly)
+# - https://github.com/curl/curl/blob/master/.github/workflows/http3-linux.yml (CI/CD for TCP/2)
+# However 'supported' vs 'works' are two entirely different things; be sane but
+# don't be afraid to require a later version.
+# ngtcp2 = https://bugs.gentoo.org/912029 - can only build with one tls backend at a time.
+RDEPEND="
+	>=sys-libs/zlib-1.1.4[${MULTILIB_USEDEP}]
+	adns? ( >=net-dns/c-ares-1.16.0:=[${MULTILIB_USEDEP}] )
+	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+	http2? ( >=net-libs/nghttp2-1.15.0:=[${MULTILIB_USEDEP}] )
+	http3? ( >=net-libs/nghttp3-1.1.0[${MULTILIB_USEDEP}] )
+	idn? ( >=net-dns/libidn2-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,${MULTILIB_USEDEP}] )
+	psl? ( net-libs/libpsl[${MULTILIB_USEDEP}] )
+	quic? (
+		curl_quic_openssl? ( >=dev-libs/openssl-3.3.0:=[quic,${MULTILIB_USEDEP}] )
+		curl_quic_ngtcp2? ( >=net-libs/ngtcp2-1.2.0[gnutls,ssl,-openssl,${MULTILIB_USEDEP}] )
+	)
+	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+	ssh? ( >=net-libs/libssh2-1.0.0[${MULTILIB_USEDEP}] )
+	ssl? (
+		gnutls? (
+			app-misc/ca-certificates
+			>=net-libs/gnutls-3.1.10:=[static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/nettle:=[${MULTILIB_USEDEP}]
+		)
+		mbedtls? (
+			app-misc/ca-certificates
+			net-libs/mbedtls:=[${MULTILIB_USEDEP}]
+		)
+		openssl? (
+			>=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
+		)
+		rustls? (
+			>=net-libs/rustls-ffi-0.14.0:=[${MULTILIB_USEDEP}]
+		)
+	)
+	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-lang/perl
+	virtual/pkgconfig
+	test? (
+		sys-apps/diffutils
+		http2? ( >=net-libs/nghttp2-1.15.0:=[utils,${MULTILIB_USEDEP}] )
+		http3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
+	)
+	verify-sig? ( sec-keys/openpgp-keys-danielstenberg )
+"
+
+DOCS=( README docs/{FEATURES.md,INTERNALS.md,FAQ,BUGS.md,CONTRIBUTE.md} )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	__builtin_available
+	closesocket
+	CloseSocket
+	getpass_r
+	ioctlsocket
+	IoctlSocket
+	mach_absolute_time
+	setmode
+	_fseeki64
+	# custom AC_LINK_IFELSE code fails to link even without -Werror
+	OSSL_QUIC_client_method
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-prefix-3.patch"
+	"${FILESDIR}/${PN}-respect-cflags-3.patch"
+	"${FILESDIR}/${P}-async-thread-close-eventfd.patch"
+)
+
+src_prepare() {
+	default
+
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
+	local myconf=()
+
+	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
+	if use ssl; then
+		myconf+=( --without-gnutls --without-mbedtls --without-rustls )
+
+		if use gnutls; then
+			multilib_is_native_abi && einfo "SSL provided by gnutls"
+			myconf+=( --with-gnutls )
+		fi
+		if use mbedtls; then
+			multilib_is_native_abi && einfo "SSL provided by mbedtls"
+			myconf+=( --with-mbedtls )
+		fi
+		if use openssl; then
+			multilib_is_native_abi && einfo "SSL provided by openssl"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		fi
+		if use rustls; then
+			multilib_is_native_abi && einfo "SSL provided by rustls"
+			myconf+=( --with-rustls )
+		fi
+		if use curl_ssl_gnutls; then
+			multilib_is_native_abi && einfo "Default SSL provided by gnutls"
+			myconf+=( --with-default-ssl-backend=gnutls )
+		elif use curl_ssl_mbedtls; then
+			multilib_is_native_abi && einfo "Default SSL provided by mbedtls"
+			myconf+=( --with-default-ssl-backend=mbedtls )
+		elif use curl_ssl_openssl; then
+			multilib_is_native_abi && einfo "Default SSL provided by openssl"
+			myconf+=( --with-default-ssl-backend=openssl )
+		elif use curl_ssl_rustls; then
+			multilib_is_native_abi && einfo "Default SSL provided by rustls"
+			myconf+=( --with-default-ssl-backend=rustls )
+		else
+			eerror "We can't be here because of REQUIRED_USE."
+			die "Please file a bug, hit impossible condition w/ USE=ssl handling."
+		fi
+
+	else
+		myconf+=( --without-ssl )
+		einfo "SSL disabled"
+	fi
+
+	# These configuration options are organized alphabetically
+	# within each category.  This should make it easier if we
+	# ever decide to make any of them contingent on USE flags:
+	# 1) protocols first.  To see them all do
+	# 'grep SUPPORT_PROTOCOLS configure.ac'
+	# 2) --enable/disable options second.
+	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+	# 3) --with/without options third.
+	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+
+	myconf+=(
+		$(use_enable alt-svc)
+		--enable-basic-auth
+		--enable-bearer-auth
+		--enable-digest-auth
+		--enable-kerberos-auth
+		--enable-negotiate-auth
+		--enable-aws
+		--enable-dict
+		--disable-ech
+		--enable-file
+		$(use_enable ftp)
+		$(use_enable gopher)
+		$(use_enable hsts)
+		--enable-http
+		$(use_enable imap)
+		$(use_enable ldap)
+		$(use_enable ldap ldaps)
+		--enable-ntlm
+		$(use_enable pop3)
+		--enable-rt
+		--enable-rtsp
+		$(use_enable samba smb)
+		$(use_with ssh libssh2)
+		$(use_enable smtp)
+		$(use_enable telnet)
+		$(use_enable tftp)
+		--enable-tls-srp
+		$(use_enable adns ares)
+		--enable-cookies
+		--enable-dateparse
+		--enable-dnsshuffle
+		--enable-doh
+		--enable-symbol-hiding
+		--enable-http-auth
+		--enable-ipv6
+		--enable-largefile
+		--enable-manual
+		--enable-mime
+		--enable-netrc
+		$(use_enable progress-meter)
+		--enable-proxy
+		--enable-socketpair
+		--disable-sspi
+		$(use_enable static-libs static)
+		--enable-pthreads
+		--enable-threaded-resolver
+		--disable-versioned-symbols
+		--without-amissl
+		--without-bearssl
+		$(use_with brotli)
+		--with-fish-functions-dir="${EPREFIX}"/usr/share/fish/vendor_completions.d
+		$(use_with http2 nghttp2)
+		--without-hyper
+		$(use_with idn libidn2)
+		$(use_with kerberos gssapi "${EPREFIX}"/usr)
+		--without-libgsasl
+		$(use_with psl libpsl)
+		--without-msh3
+		$(use_with http3 nghttp3)
+		$(use_with curl_quic_ngtcp2 ngtcp2)
+		$(use_with curl_quic_openssl openssl-quic)
+		--without-quiche
+		$(use_with rtmp librtmp)
+		--without-schannel
+		--without-secure-transport
+		--without-test-caddy
+		--without-test-httpd
+		--without-test-nghttpx
+		$(use_enable websockets)
+		--without-winidn
+		--without-wolfssl
+		--with-zlib
+		$(use_with zstd)
+		--with-zsh-functions-dir="${EPREFIX}"/usr/share/zsh/site-functions
+	)
+
+	if use debug; then
+		myconf+=(
+			--enable-debug
+		)
+	fi
+
+	if use test && multilib_is_native_abi && ( use http2 || use http3 ); then
+		myconf+=(
+			--with-test-nghttpx="${BROOT}/usr/bin/nghttpx"
+		)
+	fi
+
+	if [[ ${CHOST} == *mingw* ]] ; then
+		myconf+=(
+			--disable-pthreads
+		)
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# Avoid building the client (we just want libcurl for multilib)
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+	fi
+
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi; then
+		# Shell completions
+		! tc-is-cross-compiler && emake -C scripts
+	fi
+}
+
+# There is also a pytest harness that tests for bugs in some very specific
+# situations; we can rely on upstream for this rather than adding additional test deps.
+multilib_src_test() {
+	# See https://github.com/curl/curl/blob/master/tests/runtests.pl#L5721
+	# -n: no valgrind (unreliable in sandbox and doesn't work correctly on all arches)
+	# -v: verbose
+	# -a: keep going on failure (so we see everything that breaks, not just 1st test)
+	# -k: keep test files after completion
+	# -am: automake style TAP output
+	# -p: print logs if test fails
+	# Note: if needed, we can skip specific tests. See e.g. Fedora's packaging
+	# or just read https://github.com/curl/curl/tree/master/tests#run.
+	# Note: we don't run the testsuite for cross-compilation.
+	# Upstream recommend 7*nproc as a starting point for parallel tests, but
+	# this ends up breaking when nproc is huge (like -j80).
+	# The network sandbox causes tests 241 and 1083 to fail; these are typically skipped
+	# as most gentoo users don't have an 'ip6-localhost'
+	multilib_is_native_abi && emake test TFLAGS="-n -v -a -k -am -p -j$((2*$(makeopts_jobs))) !241 !1083"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi; then
+		# Shell completions
+		! tc-is-cross-compiler && emake -C scripts DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
+	rm -rf "${ED}"/etc/ || die
+}
+
+pkg_postinst() {
+	if use debug; then
+		ewarn "USE=debug has been selected, enabling debug codepaths and making cURL extra verbose."
+		ewarn "Use this _only_ for testing. Debug builds should _not_ be used in anger."
+		ewarn "hic sunt dracones; you have been warned."
+	fi
+}
diff --git a/net-misc/curl/files/curl-8.11.1-async-thread-close-eventfd.patch b/net-misc/curl/files/curl-8.11.1-async-thread-close-eventfd.patch
new file mode 100644
index 000000000000..2bdfc51838d7
--- /dev/null
+++ b/net-misc/curl/files/curl-8.11.1-async-thread-close-eventfd.patch
@@ -0,0 +1,33 @@
+https://github.com/curl/curl/commit/ff5091aa9f73802e894b1cbdf24ab84e103200e2
+From: Andy Pan <i@andypan.me>
+Date: Thu, 12 Dec 2024 12:48:56 +0000
+Subject: [PATCH] async-thread: avoid closing eventfd twice
+
+When employing eventfd for socketpair, there is only one file
+descriptor. Closing that fd twice might result in fd corruption.
+Thus, we should avoid closing the eventfd twice, following the
+pattern in lib/multi.c.
+
+Fixes #15725
+Closes #15727
+Reported-by: Christian Heusel
+---
+ lib/asyn-thread.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/lib/asyn-thread.c b/lib/asyn-thread.c
+index a58e4b790494ab..32d496b107cb0a 100644
+--- a/lib/asyn-thread.c
++++ b/lib/asyn-thread.c
+@@ -195,9 +195,11 @@ void destroy_thread_sync_data(struct thread_sync_data *tsd)
+    * close one end of the socket pair (may be done in resolver thread);
+    * the other end (for reading) is always closed in the parent thread.
+    */
++#ifndef USE_EVENTFD
+   if(tsd->sock_pair[1] != CURL_SOCKET_BAD) {
+     wakeup_close(tsd->sock_pair[1]);
+   }
++#endif
+ #endif
+   memset(tsd, 0, sizeof(*tsd));
+ }
diff --git a/net-misc/ipmiview/Manifest b/net-misc/ipmiview/Manifest
index f9e80d4c29d6..b027fe20aa09 100644
--- a/net-misc/ipmiview/Manifest
+++ b/net-misc/ipmiview/Manifest
@@ -1,5 +1,5 @@
 AUX fake-java-r1.bash 289 BLAKE2B 1bd0c9477af5d064f4479fadd040338d972195ad99f87e7244b4953764da3f4a2bc4ffb7118bbe8bcc9c6d8cf9c5e42a1990219ca7e8d89cb931f5ee6265d214 SHA512 9de74481bcff69098484b328157ad2208255e791dd4595e1ba926a2754c7bbae04b94ec4d717e7b9556b64bf4fdc749e012c99fdc771844fbf003021d9cda65a
 AUX launcher-pre.bash 143 BLAKE2B b33051ba8052380465c59b68733416298166949bcc794047a097816dac68fed0bc7ad39dc056e57e5114f622faf64b67598028b35b83d6ded95034d2a71126d0 SHA512 2a1b35175fe6364eb7790de93878d4834ca69f1dde438fdcf0cebd7c7bf16600f2eaacf334f91c740512ad068914c1adb7a09017a23694bcceb837be20989161
-DIST IPMIView_2.22.0_build.241017_bundleJRE_Linux_x64.tar.gz 185685 BLAKE2B f260060b4cf0bfbfc2c85454da30487ed7153512aaa5a660e9a7864db2359c2c4879fbf8911dc6e01a8a47851c1c500f0e92c1c5c7b0776ff5b357c9dcd3fcea SHA512 b73612d43221f992059d6d313c1ccb179e4fe9a2326a56b41050395f300ea37ea1c70de2743bfbf77d0c4d77c506dccc798240c4d9906dcd89ad7f9197808f04
+DIST IPMIView_2.22.0_build.241017_bundleJRE_Linux_x64.tar.gz 186223 BLAKE2B 7a8aef0bc7427887182390bb79736ea859a010d63213f7e3a9ddc3d8da20c9e8a78656b94c22f579a59f6f0bbabc91cac611a59cfad3934c3d8d10aa48d5d7a2 SHA512 86288015345a7d74f101b92e8b6fd7b2d5a265056af038ee37c23eab21a75ab41589381834f7bb4e86cd53dcabe90db9bc17d0b10cf71a00ef002b186c4a6df7
 EBUILD ipmiview-2.22.0.241017.ebuild 2016 BLAKE2B 4c83d87543e1c469c074b3abff97b7e1b0a134a06a8e47a09efcf2cab1cdd9709406211b4f5d3a434407c17bf15f39daabc5c1dea3b0d35d79168c44b30d6460 SHA512 2d448c7168da5c86d1946dbd1ca577a2b8e631eb042ee0acdeeb6b7ca2dafe3b4c75accc2837f49524876339c2cf20470afdb6bf9c3de1fa3252e0482e69f486
 MISC metadata.xml 703 BLAKE2B dc49c70c55ec3fab0bffd75b82500d88c0abcf072e61b96db1653373e6c7f6e01998441c9e107f7eb498ba23eb611c8c18fbf4f187c6aaa127f935754fa49f5a SHA512 e831ad0df261192f11dd6cd89fd62604a474e8810df47bd7a4275ed63a6056ef4d0dd005ed446842e492fc47beaa6d58c4a39ae85e329d80226914219aeeaadf
diff --git a/net-misc/kio-zeroconf-common/Manifest b/net-misc/kio-zeroconf-common/Manifest
index bc16d2ca1194..73eaccfcee04 100644
--- a/net-misc/kio-zeroconf-common/Manifest
+++ b/net-misc/kio-zeroconf-common/Manifest
@@ -1,3 +1,5 @@
 DIST kio-zeroconf-24.08.3.tar.xz 44896 BLAKE2B 28e0acfbc943c4942e65e87a6d5f10dccbd17d61372b592d7167a1de0103fa54007b399036531897a942ced0e6dcd9cd26a757dda9244d6dc643cf9c57d1d2e8 SHA512 5b88d06d998702556bb0f2c533b12c289f039ed7803e9785f224b21509bf5dd4de2e17c3c6cddfa70bd374aab6b9c63a8d2b24e8019e2a4d33b8a8b0412007c5
+DIST kio-zeroconf-24.12.0.tar.xz 44888 BLAKE2B 0fc277660d95dc311263e0ba06f114586295931dc70d4be0118970e409ae7edb4c8d5a16004fd6200bf737312f8077dd24fa3b6fea0ba0a12243411fd42b76aa SHA512 7810a69260c2eddbccf4fa7988fae7532c970b6e620785c7b2eb067e79ad02158cbb706777e1112fdeacbbca09201b56541becff4521577aa2c0bf8184d3d898
 EBUILD kio-zeroconf-common-24.08.3.ebuild 573 BLAKE2B 9d34c10ef15bf0d402ca47193688b6b264b5f017ce3558f3069e8cdc1838a0e95ffd076b9e3da3d84a0584ed757627891bc3693e6efe18541988cb1474bb7bc9 SHA512 5b044dcd7b474e1856c66be7fc69bdce4ccfb36c439696bc8ed2f81c5441113c01195c9bbb06355d61a6381bd4f58f14cb0e19d336fc6f64bdd2507cc21574d6
+EBUILD kio-zeroconf-common-24.12.0.ebuild 576 BLAKE2B 37bf7e5c06b94934c88dbde5c6de4c25b70a750b9564b690f68d4a39a90aea49acb6d3936e9a036651ccf2832351dd237f8f31c70ceb3940a89589387220101c SHA512 fa88fa458b701e256180f03165de38579e849e494b8a389cbb7933541a619ce5c70873299146a5d7f74f072eb22184e71cd32b6397620b3ba21e3d29ee5c91ca
 MISC metadata.xml 382 BLAKE2B 19f8c78ccf78582ea7cae867c450dc668813811f0429fedbad2fdae7a6f4ca7c0e7e5e2fe4d4e8987471fc52d816e6e31c6f30961f6f247f3b124c3a20a57db4 SHA512 b65cfb16894cfff9500b62d90c04b25693b85de026d2637834befb117daa4a7744ae033aa10b4aaf9ef04349f442a199be598e250e05e53253f6d30c6e37eb2c
diff --git a/net-misc/kio-zeroconf-common/kio-zeroconf-common-24.12.0.ebuild b/net-misc/kio-zeroconf-common/kio-zeroconf-common-24.12.0.ebuild
new file mode 100644
index 000000000000..4ab4638c9e5a
--- /dev/null
+++ b/net-misc/kio-zeroconf-common/kio-zeroconf-common-24.12.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="false"
+KDE_ORG_NAME="${PN/-common/}"
+KFMIN=5.115.0
+inherit ecm-common gear.kde.org
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!<net-misc/kio-zeroconf-23.08.5-r2:5
+	!<net-misc/kio-zeroconf-24.08.0-r1:6
+"
+
+ECM_INSTALL_FILES=(
+	kdedmodule/org.kde.kdnssd.xml:\${KDE_INSTALL_DBUSINTERFACEDIR}
+	kioworker/zeroconf.desktop:\${KDE_INSTALL_DATADIR}/remoteview
+	org.kde.kio_zeroconf.metainfo.xml:\${KDE_INSTALL_METAINFODIR}
+)
diff --git a/net-misc/kio-zeroconf/Manifest b/net-misc/kio-zeroconf/Manifest
index 564b7f004d34..38b5493d8f2f 100644
--- a/net-misc/kio-zeroconf/Manifest
+++ b/net-misc/kio-zeroconf/Manifest
@@ -1,5 +1,7 @@
 DIST kio-zeroconf-23.08.5.tar.xz 44360 BLAKE2B bf441b10221ba8c731756cb5455664fff5a1c8904a952e558084dadb6fe5bcc3a3da072ff58fd31f6c2c35a40ea27241c85403a3db16fd46b52e1a87586b1b5c SHA512 33ed5cb23280ba85ccd4fee149f5983e64164ff0c5f7730e2d49c80784b445c569aa7b925e2d44221854cf7588310f211920d8e4492d87f20be531dbbc9198e6
 DIST kio-zeroconf-24.08.3.tar.xz 44896 BLAKE2B 28e0acfbc943c4942e65e87a6d5f10dccbd17d61372b592d7167a1de0103fa54007b399036531897a942ced0e6dcd9cd26a757dda9244d6dc643cf9c57d1d2e8 SHA512 5b88d06d998702556bb0f2c533b12c289f039ed7803e9785f224b21509bf5dd4de2e17c3c6cddfa70bd374aab6b9c63a8d2b24e8019e2a4d33b8a8b0412007c5
+DIST kio-zeroconf-24.12.0.tar.xz 44888 BLAKE2B 0fc277660d95dc311263e0ba06f114586295931dc70d4be0118970e409ae7edb4c8d5a16004fd6200bf737312f8077dd24fa3b6fea0ba0a12243411fd42b76aa SHA512 7810a69260c2eddbccf4fa7988fae7532c970b6e620785c7b2eb067e79ad02158cbb706777e1112fdeacbbca09201b56541becff4521577aa2c0bf8184d3d898
 EBUILD kio-zeroconf-23.08.5-r2.ebuild 897 BLAKE2B 5ec0fbd21425a398b502398990944a517aaab0af2750326897f2439b540407b2aefa817e40e0969675096e7bc2482146c6029803cdb22184a822005235691621 SHA512 b5c4e1ac89b9fa4e3a74da79e068e5e4d71d14f3fefa283e8c4a79bba2f5357da226103a88c61957dd5a45edd6849bc791f76ff24a91f2aada479058a63fe632
 EBUILD kio-zeroconf-24.08.3.ebuild 906 BLAKE2B bf41a0bb6caea46491dd52e4fa4ff55f512f943e47348d3ee5ce3d59ffe6dceb7ac1fe75cf816d733d1de0b94ff0e47dc5395141680594b28bb9135e092ddf73 SHA512 c445f8e066530589b541d40ea54cfea7c8f1cab0a5d112894a5ee3880fc91828f91ab2b9436cfbcb40950aa29675a2dece30e2b67489b7e9c0394f8565114dfa
+EBUILD kio-zeroconf-24.12.0.ebuild 908 BLAKE2B ee09cbfb4cf487ac7fe0771c266e7cf6585cb53496da5c5845bb6a00df390b286af025b386aef989b40e4ef1d231c30095a8a7ae42f832825d88eb3d7b831edc SHA512 84628d3019eeaab0effb007c0ed7eebe44082e69cf1f301c67051607828567f4e6d384580b5990162f64257234cbeba53d37419200a689110404f2d6bdee5c22
 MISC metadata.xml 382 BLAKE2B 19f8c78ccf78582ea7cae867c450dc668813811f0429fedbad2fdae7a6f4ca7c0e7e5e2fe4d4e8987471fc52d816e6e31c6f30961f6f247f3b124c3a20a57db4 SHA512 b65cfb16894cfff9500b62d90c04b25693b85de026d2637834befb117daa4a7744ae033aa10b4aaf9ef04349f442a199be598e250e05e53253f6d30c6e37eb2c
diff --git a/net-misc/kio-zeroconf/kio-zeroconf-24.12.0.ebuild b/net-misc/kio-zeroconf/kio-zeroconf-24.12.0.ebuild
new file mode 100644
index 000000000000..1c51d9b1efb0
--- /dev/null
+++ b/net-misc/kio-zeroconf/kio-zeroconf-24.12.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KFMIN=6.5.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="KIO worker to discover file systems by DNS-SD (DNS Service Discovery)"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-qt/qtbase-${QTMIN}:6[dbus]
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kdnssd-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	>=net-misc/${PN}-common-${PV}
+"
+
+# Shipped by net-misc/kio-zeroconf-common package for shared use w/ SLOT 5
+ECM_REMOVE_FROM_INSTALL=(
+	/usr/share/dbus-1/interfaces/org.kde.kdnssd.xml
+	/usr/share/remoteview/zeroconf.desktop
+	/usr/share/metainfo/org.kde.kio_zeroconf.metainfo.xml
+)
+
+src_prepare() {
+	ecm_src_prepare
+	ecm_punt_po_install
+}
diff --git a/net-misc/x2goclient/Manifest b/net-misc/x2goclient/Manifest
index 01bf726b9b7b..43f1835e2030 100644
--- a/net-misc/x2goclient/Manifest
+++ b/net-misc/x2goclient/Manifest
@@ -1,5 +1,5 @@
 DIST x2goclient-4.1.2.2.tar.gz 2576404 BLAKE2B 2a29f73516282af119cc4ea0a511c29156cdb71564adcdbf307f60298b87c2a7eee0ca121a3e165a63c110130c2704b49b90b3b9abc6a39b6105b1f22ac5afd0 SHA512 85e6db6a34629512be64376883c205d8bf0696c4697cf216970b57a91ffe68dcf7f38bfda0d396c104602f6991b596c5fb0934e75fa4a93f7d0e41c2b3f5ac4d
 DIST x2goclient-4.1.2.3.tar.gz 2582072 BLAKE2B ee167d7f8b293220ce5d9a315dc11997ba9cf8bc5c9840155888ddbf816d18a39553659ccd363619f6198d1e7ebadc9932327082ddfc2bb83970df61ada86778 SHA512 1bd59efaaf560bf36dad979cbb67cf90df13943688e1259e86d441ba17677d523ad1f69061d2f65b0ca8eee9e7d00ee242e95c555b4446d72f37acef70a9b435
 EBUILD x2goclient-4.1.2.2-r1.ebuild 1260 BLAKE2B 5d5d3f2ac8938f530f273573ff0cfeccdf2043ab70f66169a87feda0f6bc586ab440884e16e5cb363013b6f25a88f78b5cb3905eea065f1ceea27dfb6f0becae SHA512 b3a54be7590fb0e4ed75166c00b0535970867070a6925105d849a1749d5d753139329405f1bc3872e8f4b7678a0c4215217d753225d4970bcf796c7d0940a207
-EBUILD x2goclient-4.1.2.3.ebuild 1257 BLAKE2B c8fc8f7618f3e0fdbfb3d880c02521f37295949f8e6a705b992d21f76d20afd858c0d0182bc2922cf04fcd3f57b7bb21fe4cbf3d3c5604ccec43bbe9f7a47b2e SHA512 bff1a3036869c35b964fdf14d82c7cf94c7fc45accace16e47cb106b3532c929ca43d3576837c416ea2fccb4a6c94e8ac8ecac8ad0ab6a3b5714aabe0b871f3b
+EBUILD x2goclient-4.1.2.3.ebuild 1256 BLAKE2B 4a672536fd77b339f54e4242b6ff49c6ed975cdac6309acafd7671db03f6d9ad5c91c7b67d9b03f634ee967cb4727908a35a98bc9c8b58bbd9595965c264bd90 SHA512 a2b36f202edab195a60746fef4d37b3c5c58d4f4532c91be9b832e27619bff6a3f8512e709fbb586a8596ba079430c2d6a3e1cfdc94b0c7770b5a4d06e374463
 MISC metadata.xml 253 BLAKE2B 8557c513beef73e834b0a000c523a3241da961c6307b6e98ac857dad0888c4bbd028c98f8499f01086c24e8f2f57c64bc75db20154dab232adefc2510fccac03 SHA512 67dd372ef7b684101d9198c6199a6403f8750132d80aab4f4daa4b31ebaea3d82eb9a18e904734e2ac10c77b237d67210055949ff1c6d5aad4f75951a096884a
diff --git a/net-misc/x2goclient/x2goclient-4.1.2.3.ebuild b/net-misc/x2goclient/x2goclient-4.1.2.3.ebuild
index 8738dcc0114d..b001cabb15d3 100644
--- a/net-misc/x2goclient/x2goclient-4.1.2.3.ebuild
+++ b/net-misc/x2goclient/x2goclient-4.1.2.3.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=8
@@ -11,7 +11,7 @@ SRC_URI="https://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="ldap"
 
 DEPEND="