gentoo auto-resync : 25:11:2023 - 10:31:10

20 files changed, 3 insertions, 2032 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 5375e1cd31ba..3a61dcfc718f 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 6d6948a7a6f9..be353719dae1 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -1,14 +1,10 @@
 AUX chrony-2.4-r1.logrotate 131 BLAKE2B 4e649ce1c126639ea73c4e03d42175d1715b1c321544376ff2e48d67ee13bebcf04a8fea56326bf5efe66f568913dc92ff7f16a641ffb39a456e9cdac6004a6c SHA512 e6febb744476be6c83ac086f2054dc2c190b6e1abd2cf20d4187f222b2485817f06c4ad62b8d40fcea3e18a771cf21899fe0a1dafbfb31f5c99da9092d24d79b
 AUX chrony-3.5-pool-vendor-gentoo.patch 544 BLAKE2B 5ef7fcea43c59d1da8f3b3a735f1e70565a8437f142f317abe81531c31e934af05eda5e3043f7874bc9b4592d44579ae1827ddba06c514b4b8124c899931ed0f SHA512 0a109e1b8367def620f5089b3fcb92d84e592eb1a2fced2b60f6c9295159a605d9605e837a06e118c8ba8095208da68592fb9cd537937a153d6eecfa0eb35eb4
 AUX chrony-4.2-systemd-gentoo.patch 538 BLAKE2B 70d3bb2a190aa2401ff566dd88d1cace1d3573261819d082863fe310bb16507fcc1497fd31ec24033cb9dbe8356aef416d91b36df6067fd37f4273e59bc4e330 SHA512 62e54e1c16380812b3cf11a84091e134401341a4a64dda806af1a52dfa4158912adc4c2524388956f67a44e095e893ed714a2eee15650080c38ce44d2bc279ec
-AUX chrony-4.3-strict-prototypes-clang16.patch 1771 BLAKE2B 8da00e991a6ca8c62caa9d31f5d12b311eac0fc400048e8423c5ef689a04fe305668a0fa375726f0ae15c905ef82f0024e0254fe524f31b9a0bad620b8a1bcdf SHA512 24b3f18db7f92d581940eddfb6e25a0955e17402dbd48a0413be828c2bc4d56441e91eaeaf44595956f258509acb373f4c277926f1c8ec54139bc15dee82dd92
 AUX chronyd.conf-r3 390 BLAKE2B aa193e6bcf62cc305620139b7c198d39358feea7106356083cf1a20bdb8fd4b85bd8cce8cf20ce6839e8788fedc1f94e912ec512193988f83283ceef86d6cfc7 SHA512 ab0bbd07c17e391d068c5a37d5f8d9c8fc2c42add2700869217a95784666bd3f23bebd70942cf11b42c124e0947f68c101153998e89bc61ccb71b30a0187cf0c
 AUX chronyd.init-r2 1694 BLAKE2B 5ee55954c8afc2df09291dd7df4c3f1b3a01f97079ae19799a87c0217118c02b24ace0422b1f355fb67d1a0224eacf2104f3b984035f4ac9fa6b41624187d009 SHA512 63d9816017bb13b57c28de4a9d5b8061139d4aea1db5800ec7a4d9e8b2a8f5c5109b556ae5bec5c6d1cc7c4839bd49f12a0046c74fe4d1d11049ead00f1407da
-DIST chrony-4.3.tar.gz 593560 BLAKE2B 51ba6d19312fd52cd6d6d8ab9437c886a3779877170674db6dc37d657e849101e2669fd6c8723d24e43c895cd1924c3d8d2ff442baeef9abe8a6c313929edf5f SHA512 1394bac3ed684352fe89b7fef7da50e61f9f522abee807627ae1fc4c2dde891017bc8e5b13759fced028f3a1e875d5e4e5a4f85de65c63b5f83d0ca03bb4c5df
-DIST chrony-4.3.tar.gz.asc 833 BLAKE2B 12399205da4ee5c442207bfdf936ac88552a49b21b0db8c15b09118b579e2076f7cfec6ad916b08b41edc4f9f8e03b13d7758ed08e116bee54d0f0f9cd68a505 SHA512 300b06f253ac3727edb86a1b7c337f9529ee752bbb471b266217b6a8ac5183e827264177a3210d436425d746673bf11fbdc41da145673213e28165197c6c76b7
 DIST chrony-4.4.tar.gz 612094 BLAKE2B 470c3d4ab9aa5949df1c10d0ecbd556fba3ce9b05e9dc4a5475795c174fca48a624975df68552f78927a19b72cb6b4f136ed4e5fa04a833dbd8139d0be144e4f SHA512 45e060eb0c5892552f28dc436429e5823409cc93533127af27b64d08ff9c769fdc72694272232114f5ca1884c2bc8b5e842fae7956dc457358e937bcd3dda4d7
 DIST chrony-4.4.tar.gz.asc 833 BLAKE2B 07f863381d37e30435c3796c7ff4ac628dd81b248e76fe1b9ce6dff07f9f2bd9423a013c7d0a09f2bfe251a8e176b04731e1cb60829f1dc83a7321274d3f6992 SHA512 bb795b428567434937cbf3a12c559b549b89abe65010d04eed0fbdcfde35e7266771ea01c2c5581f3e5fae993f1782fff5a62c5ae09259d2b65dab9473d756a3
-EBUILD chrony-4.3-r5.ebuild 7002 BLAKE2B 60c97929d7dd4fe526fce6f0953bd42ed145f6716d090528dcb6463593739afeeb65dfa4b9590b22a5ad059bc45762d4fed4b11eec038ef1a6f18bf291c922d0 SHA512 7470764d176a32cffb440b6c9e6649d98bedda01bc6db1fb11a2eea9f96c6359f6951ceeb628d854e22b721507b300125649cf6a889cb333d09c225113874089
 EBUILD chrony-4.4.ebuild 6808 BLAKE2B 493b6a3d644d68d071150c8a97f4f5da12274f94c17651f9018947b4caded8245eb7c76d8f4338aaf6984a23425fbb8d176ee11124e2594fe2a0d9eb8186184f SHA512 b9f4d5cc590515cdd816e42b24e8a66a7febbdae2f2818e8c2e9f76b1a6a9d3109657f84adcd5f1f13bb67eae2007c350e2391daff053fc7e9ad0dffa87f8c26
 EBUILD chrony-9999.ebuild 6816 BLAKE2B 3d2440e0b7a42ff8b0d62cd5d5b8d6fb486afd8da4ad63980b7221849d23dc4b0322db611c51871d42b67a957462bb473b1053aac55100973836da4479a23250 SHA512 b66a630a093e139d9f57377c5a6f21b22da38d618452c61f4c765bdac5ca0eaee4e4110a703d66c9859aace4e7448906b0cb32978848ca49687420ecffad59e3
 MISC metadata.xml 2353 BLAKE2B c5a7458f2aabf443f01e670cf1e1a578c6d1095b607df07a6a979610f8446ad8fbbbc2b86ca79f8f06b49cfeba1a31cd05b2748c46e2d283863fd43d0b8e7a3a SHA512 1ec4023f55368e03158535d45239572e6bd160d94c85126d3c7d1ddd02fd5743d65ee9ea2bf2e6fbde5b010483928432b5d5848bed03bcc78e9f6924ee189b42
diff --git a/net-misc/chrony/chrony-4.3-r5.ebuild b/net-misc/chrony/chrony-4.3-r5.ebuild
deleted file mode 100644
index 4b78f2f22ba9..000000000000
--- a/net-misc/chrony/chrony-4.3-r5.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="NTP client and server programs"
-HOMEPAGE="https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"
-	inherit git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/mlichvar.asc
-	inherit verify-sig
-
-	SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://download.tuxfamily.org/chrony/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )"
-
-	if [[ ${PV} != *_pre* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv sparc x86"
-	fi
-fi
-
-S="${WORKDIR}/${P/_/-}"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+caps +cmdmon debug html libtomcrypt +nettle nss +ntp +nts +phc pps +readline +refclock +rtc samba +seccomp +sechash selinux"
-# nettle > nss > libtomcrypt in configure
-REQUIRED_USE="
-	sechash? ( || ( nettle nss libtomcrypt ) )
-	nettle? ( !nss )
-	nss? ( !nettle )
-	libtomcrypt? ( !nettle !nss )
-	!sechash? ( !nss )
-	!sechash? ( !nts? ( !nettle ) )
-"
-
-DEPEND="
-	caps? (
-		acct-group/ntp
-		acct-user/ntp
-		sys-libs/libcap
-	)
-	libtomcrypt? ( dev-libs/libtomcrypt:= )
-	nettle? ( dev-libs/nettle:= )
-	nss? ( dev-libs/nss:= )
-	nts? ( net-libs/gnutls:= )
-	pps? ( net-misc/pps-tools )
-	readline? ( dev-libs/libedit )
-	seccomp? ( sys-libs/libseccomp )
-"
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-chronyd )
-"
-# bison dep only for 4.3-r1 for ${P}-strict-prototypes-clang16.patch
-BDEPEND="
-	sys-devel/bison
-	html? ( dev-ruby/asciidoctor )
-	nts? ( virtual/pkgconfig )
-	sechash? (
-		nettle? ( virtual/pkgconfig )
-		nss? ( virtual/pkgconfig )
-	)
-"
-
-if [[ ${PV} == 9999 ]] ; then
-	# Needed for doc generation in 9999
-	REQUIRED_USE+=" html"
-	BDEPEND+="
-		sys-devel/bison
-		virtual/w3m
-	"
-else
-	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-mlichvar-20210513 )"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
-	"${FILESDIR}"/${PN}-4.2-systemd-gentoo.patch
-	"${FILESDIR}"/${P}-strict-prototypes-clang16.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
-		doc/* examples/* || die
-
-	cp "${FILESDIR}"/chronyd.conf-r3 "${T}"/chronyd.conf || die
-}
-
-src_configure() {
-	if ! use caps ; then
-		sed -i \
-			-e 's/ -u ntp//' \
-			"${T}"/chronyd.conf examples/chronyd.service || die
-	fi
-
-	if ! use seccomp ; then
-		sed -i \
-			-e 's/ -F 2//' \
-			"${T}"/chronyd.conf examples/chronyd.service || die
-	fi
-
-	tc-export CC PKG_CONFIG
-
-	# Update from time to time with output from "date +%s"
-	# on a system that is time-synced.
-	export SOURCE_DATE_EPOCH=1607976314
-
-	# Not an autotools generated script
-	local myconf=(
-		$(use_enable seccomp scfilter)
-
-		$(usev !caps '--disable-linuxcaps')
-		$(usev !cmdmon '--disable-cmdmon')
-		$(usev debug '--enable-debug')
-
-		# USE=readline here means "readline-like functionality"
-		# chrony only supports libedit in terms of the library providing
-		# it.
-		$(usev !readline '--without-editline --disable-readline')
-
-		$(usev !libtomcrypt '--without-tomcrypt')
-		$(usev !nettle '--without-nettle')
-		$(usev !nss '--without-nss')
-		$(usev !ntp '--disable-ntp')
-		$(usev !nts '--disable-nts')
-		$(usev !nts '--without-gnutls')
-		$(usev !phc '--disable-phc')
-		$(usev !pps '--disable-pps')
-		$(usev !refclock '--disable-refclock')
-		$(usev !rtc '--disable-rtc')
-		$(usev samba '--enable-ntp-signd')
-		$(usev !sechash '--disable-sechash')
-
-		--chronysockdir="${EPREFIX}/run/chrony"
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--mandir="${EPREFIX}/usr/share/man"
-		--prefix="${EPREFIX}/usr"
-		--sysconfdir="${EPREFIX}/etc/chrony"
-		--with-hwclockfile="${EPREFIX}/etc/adjtime"
-		--with-pidfile="${EPREFIX}/run/chrony/chronyd.pid"
-
-		${EXTRA_ECONF}
-	)
-
-	# Print the ./configure call
-	edo ./configure "${myconf[@]}" || die
-}
-
-src_compile() {
-	if [[ ${PV} == 9999 ]] ; then
-		# Uses w3m
-		emake -C doc man txt
-	fi
-
-	emake all docs $(usev !html 'ADOC=true')
-}
-
-src_install() {
-	default
-
-	# Compatibility with other distributions who install to /etc/chrony.conf (bug #835461)
-	dosym -r /etc/chrony/chrony.conf /etc/chrony.conf
-
-	newinitd "${FILESDIR}"/chronyd.init-r2 chronyd
-	newconfd "${T}"/chronyd.conf chronyd
-
-	insinto /etc/${PN}
-	newins examples/chrony.conf.example1 chrony.conf
-
-	docinto examples
-	dodoc examples/*.example*
-
-	newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')"
-
-	if use html ; then
-		docinto html
-		dodoc doc/*.html
-	fi
-
-	keepdir /var/{lib,log}/chrony
-
-	if use caps ; then
-		# Prepare a directory for the chrony.drift file (a la ntpsec)
-		# Ensures the environment is sane on new installs
-		# bug #711058
-		fowners -R ntp:ntp /var/{lib,log}/chrony
-		fperms -R 770 /var/lib/chrony
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
-
-	systemd_dounit examples/chronyd.service
-	systemd_dounit examples/chrony-wait.service
-	systemd_enable_ntpunit 50-chrony chronyd.service
-}
-
-pkg_preinst() {
-	HAD_CAPS=0
-	HAD_SECCOMP=0
-	HAD_PRE_NEW_SECCOMP_LEVEL=0
-
-	# See https://dev.gentoo.org/~zmedico/portage/doc/portage.html#package-ebuild-phases-after-2.1.5
-	# in "Ebuild Phases" for an explanation of why we need to save the variable beforehand
-	if has_version 'net-misc/chrony[caps]' ; then
-		HAD_CAPS=1
-	fi
-
-	if has_version 'net-misc/chrony[seccomp]' ; then
-		HAD_SECCOMP=1
-	fi
-
-	if has_version '>=net-misc/chrony-4.1[seccomp]' ; then
-		# This version introduced a new filter level: -F 2
-		# It's a limited set of seccomp filters designed to be 'bare minimum'
-		HAD_PRE_NEW_SECCOMP_LEVEL=1
-	fi
-}
-
-pkg_postinst() {
-	tmpfiles_process chronyd.conf
-
-	if [[ -n "${REPLACING_VERSIONS}" ]] ; then
-		if use caps && ! [[ ${HAD_CAPS} -eq 1 ]] ; then
-			# bug #719876
-			ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp"
-			ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony"
-			ewarn "This is necessary for chrony to drop privileges"
-		elif ! use caps && [[ ${HAD_CAPS} -eq 0 ]] ; then
-			ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root"
-		fi
-	fi
-
-	# See bug #783915 for general discussion on enabling seccomp filtering
-	# by default.
-	local show_seccomp_enable_msg=0
-
-	# Was seccomp disabled before and now enabled?
-	if [[ ${HAD_SECCOMP} -eq 0 ]] && use seccomp ; then
-		show_seccomp_enable_msg=1
-	fi
-
-	# Are we coming from an old version without the new 'minimal' filter?
-	# (-F 2)
-	if [[ ${HAD_PRE_NEW_SECCOMP_LEVEL} -eq 0 ]] ; then
-		show_seccomp_enable_msg=1
-	fi
-
-	if [[ ${show_seccomp_enable_msg} -eq 1 ]] ; then
-		elog "To enable seccomp in a stricter mode, please modify:"
-		elog "- ${EROOT}/etc/conf.d/chronyd for OpenRC"
-		elog "- systemctl edit chronyd for systemd"
-		elog "to use -F 1 or -F -1 instead of -F 2 (see man chronyd)"
-		elog "By default, we now use -F 2 which is a baseline/minimal filter."
-	fi
-}
diff --git a/net-misc/chrony/files/chrony-4.3-strict-prototypes-clang16.patch b/net-misc/chrony/files/chrony-4.3-strict-prototypes-clang16.patch
deleted file mode 100644
index fb89a1eb3fef..000000000000
--- a/net-misc/chrony/files/chrony-4.3-strict-prototypes-clang16.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-https://git.tuxfamily.org/chrony/chrony.git/commit/?id=7b97668319f9449b4adb1a978bb1fe9b0fb22e4d
-https://bugs.gentoo.org/880519
-
-From 7b97668319f9449b4adb1a978bb1fe9b0fb22e4d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com>
-Date: Wed, 9 Nov 2022 09:17:14 +0100
-Subject: getdate: fix various warnings which will be errors with clang-16
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-These were found by Gentoo's QA while rebuilding the world with
-clang-16: https://bugs.gentoo.org/880519
-
-Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
-
---- a/getdate.y
-+++ b/getdate.y
-@@ -448,9 +448,9 @@ o_merid	: /* NULL */
-    the same signature as the function definition does. */
- #include "getdate.h"
- 
--extern struct tm	*gmtime ();
--extern struct tm	*localtime ();
--extern time_t		mktime ();
-+extern struct tm	*gmtime (const time_t *timep);
-+extern struct tm	*localtime (const time_t *timep);
-+extern time_t		mktime (struct tm *tm);
- 
- /* Month and day table. */
- static TABLE const MonthDayTable[] = {
-@@ -641,16 +641,13 @@ static TABLE const MilitaryTable[] = {
- 
- /* ARGSUSED */
- static int
--yyerror (s)
--     char *s ATTRIBUTE_UNUSED;
-+yyerror (char *s ATTRIBUTE_UNUSED)
- {
-   return 0;
- }
- 
- static int
--ToHour (Hours, Meridian)
--     int Hours;
--     MERIDIAN Meridian;
-+ToHour (int Hours, MERIDIAN Meridian)
- {
-   switch (Meridian)
-     {
-@@ -677,8 +674,7 @@ ToHour (Hours, Meridian)
- }
- 
- static int
--ToYear (Year)
--     int Year;
-+ToYear (int Year)
- {
-   if (Year < 0)
-     Year = -Year;
-@@ -694,8 +690,7 @@ ToYear (Year)
- }
- 
- static int
--LookupWord (buff)
--     char *buff;
-+LookupWord (char *buff)
- {
-   register char *p;
-   register char *q;
-cgit v0.10.2
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index ad9ac33ef723..32af9444115b 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -3,16 +3,11 @@ AUX curl-8.3.0-CVE-2023-38546.patch 4852 BLAKE2B 316a6ca5a05c55ffa029aa97ad9c238
 AUX curl-8.3.0-tests-arm-musl.patch 3472 BLAKE2B 6722ff38b03191a9c26b90b9a2d4dc9d439cfb0d7227e10f1f100bec4a4d8709878bfab89ef9cfa854955dd44462eef66b8eb3a31db75b4555d9eccaa4457729 SHA512 3beaf54c017c9c13e023bdcaa7e187b1689f988ff2837c2e9a998ed9e7beb850e8baf9dafb0a506b60018b853c8039763d59f2849f1772a8bc8b63843111d769
 AUX curl-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd7fe8762d331d1981834044f8ec4db64d527a4ded3f5f4cccc86f281576668de092439eb19f5477d5fcf8369cf SHA512 c7cd13b9ccbd12ed01ea121ffece9c23b898a5b34698bae59ae1dd23b1cf2445180b84d80c4a640981f16dba5018df944f405dd5c660addab54ca21e0e673b7f
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
-DIST curl-8.2.1.tar.xz 2631932 BLAKE2B 77c0b067935397afb3961378f2fe349fa988c6379c1ab7437c5d5f967710b2e9ba7aec91df8fe58a8b26c00c0164d4db9bd095ca27d1bf52b768c8d83cc0ecaf SHA512 3f78c9330c52d32b166f17829fc2be13418ef925e88f75aacad7f369e7afe00dc4a56566418730dbb845b2b284d721b08f639df322e2e1ef2dfab165c4189094
-DIST curl-8.2.1.tar.xz.asc 488 BLAKE2B 569a7c8d338f7175b5035fa281861b57cce7f5327ec6437d79e215e5a806619c9432d7960687e5463787f681cc408371c1eb1f0db7fb8678b8ef34ec50ef69d0 SHA512 31ee66a09e7bd14de949ae991c23a0b905d38407b73ae39bae6d01854d8708355c14bc4d0eab3ff931b85986d0236dd34e934eef6061f4b70739137fd0525084
 DIST curl-8.3.0.tar.xz 2641764 BLAKE2B 6875b20e27ed86f9b6ab256210d85e9fb3b39645e8be710b2e6fe29fba40220f870e06bc21e8a92244670fed0a08c7716e4806a267ede49c4ed6d66e03f5fcd4 SHA512 6404b4c74fe1185cb482631ca3a143996cb7298d0d8a76bfafd7696e7729c00559999a069bdba782dee3f3eb273fb678a4438cb27d3deca54022878cdff83a51
 DIST curl-8.3.0.tar.xz.asc 488 BLAKE2B ef5a749e579710d45db9f73da0cbcb58d77a9dfe73be622536496997fa792fe5cbd0331a31f01e21cbdb36c6384dca44baa647c9f3d20effabb5bfc275b1b491 SHA512 b7d45722640ac50181b20a6d663168ec6eec6691c5604ddfe9c7177f07da598cb2de688c631043dc428c311774d781ccd16bd1e2fb4f038be651e3bee383aec4
 DIST curl-8.4.0.tar.xz 2658376 BLAKE2B ea5ebecc3c1aeac3ae8fd0cf7d8ff3298149b9c4c556fb85ed8d9310e3613228eb6fca133b0dfb9268988f93d694779fab8d53510cfa5710c1320bb6638f05eb SHA512 7027dbf3b759b39d6ec9c4da58fadd254e84bb93bff599541b3bc3135bad4c2955c6237d7ddd60973f9f1a6948bc32d7e312985fb50658bc958b9f22fee74f2b
 DIST curl-8.4.0.tar.xz.asc 488 BLAKE2B 0fd4ea46a0942b9bc440e91e8f9323bba6d0eb02fbc87c227004c90e5be14cc644446bc235ab67f857b617975cdeada6ce38a647da9e0bd783e57d58f354cdb4 SHA512 b8b7a5b76be816e7b1552354f267f335fdc608cdadbd2c40ab44faf6450c6bbd2853b6de5c2746a1292aad33a8ee1c367380d32bb1a8282540b38c3b985a320e
-EBUILD curl-8.2.1.ebuild 10393 BLAKE2B e5ee4dce29c82610b6773cfc01b7ecafda9b63be087a10dcf5402e192cc1e0752a7af79074a55a8c215bea9e84e8581522e0eaed1b6160241bb1df7da44f8ba8 SHA512 4410aa4327174adc886d8d35632e9cb8bfa88196d4900a1d3f68137fd49a7ff5469a9745d287fa9362eb95f997fbb74ee239599fb8428feb3f805e0afa7a61b0
-EBUILD curl-8.3.0-r1.ebuild 10519 BLAKE2B fcfe5acebda7a8347a9b5c56d3aacf14a15ace63d4ecfdba12ffa6b69b2d8fd4778691d0a0f5813482b8ee1d63001b11092d9de2998fdcec329c24ccf6cdd946 SHA512 b1cb3028a0552d6851875b22e247ab8ee5bd8db7991a84abd97c5efe763f45f94fd04a54937874783a87f4976749a5eb862ce8d15a6dae4ae469a2d33ce9f611
 EBUILD curl-8.3.0-r2.ebuild 10601 BLAKE2B 19cc1441f2cf23684095b159430a1e407e351f112aa38849b01af269ae151b45b0751709b8d4202b60f605ea7e060f2bfa054f6650a0de310a31786c808b6d89 SHA512 65248f611a2608b9d965bd8abc2cd8497cc331a112842ab18a230df74942eb79da54cd5f8fc4a0fdd562209b824ad3f560388bf2e1aac80163a4d2e73bf94e04
-EBUILD curl-8.3.0.ebuild 10486 BLAKE2B 0c2e17c8fc2ec4e1e1286e700b654f2590744ca1e4998dd40d0fae04e1236c3f8f94185064d01b36bf135c9aa5e4875404cf201891a24d9f5144e229041fc2cf SHA512 39c92edfe232c23e5b423e8a16225406176b67c7f43cafad3e701ef335f8629e17f6e40a379621426d885dd7ea0ddb841ee3cf6ddc9c47471b4e9550cf9995ba
 EBUILD curl-8.4.0.ebuild 10698 BLAKE2B 5b5627f498d356ca611dc80a8b2199f85a05b5f2f83fb054e14a040a0b06c85c8aeb24686fb9f26983aeb0220976a79626d2a878c21aacd0c9b6e7ef98138ce2 SHA512 5eefbda2c4ba88e4f4938b2b9bb5d093012fb3971872679908b5adf679d699ee14a6519b617a8e4e0efb15562945f25d7707fa1e676fe215fc8160b9a4c92875
 EBUILD curl-9999.ebuild 10703 BLAKE2B 9e6ae064999854a7344c1190f2984ede98dd57bf5ca3138ecaf85e30f264dce2e3f4d735a59d3c2cadcea1476fce5bc1f4132089bb26c0472a122329f7927605 SHA512 5078dabb7e2763330cba648b81395482a0592aad948caa958a1048eb484d9cb4c84eece2b93132a1cb9aed403a9a1567e1ac61f6eaf8c2c2bf5d96e88e1c7545
-MISC metadata.xml 2089 BLAKE2B a6ac2fd44a9a3a462f7ffc325d0ffd7dcb5f0b09b2671f23e1970ba03001796d33978c8b19517d588b0cc0d5d9b6dd4a1e03b952f28172e0c3a2adbbea9a34db SHA512 863e00cd1e56ec374fce3cc02d92cc37331064cf7e6b52c75e04bb313c47d83df53d9b0f194c0c4b89c39b872b47f34b81a1dbb2ff4ce8ccecf9c50b98c5beea
+MISC metadata.xml 2040 BLAKE2B 53dc2ea93f6843d71228f0d1a2315ee9e5d8567e1147b4c240f66b3e3a4d12bb514b94df1890b64b345053fe7d35c5c062417ce47e8a2ae36bad08b51b79cdb5 SHA512 6299919b704f1830f186cd0591503936d89388ebb87e9e9d255f715123829663b1e81432ee870a7d10eaed4f6fa73b8aaeab1b2f061bce00800283b66e42dc73
diff --git a/net-misc/curl/curl-8.2.1.ebuild b/net-misc/curl/curl-8.2.1.ebuild
deleted file mode 100644
index 8208a9fdf639..000000000000
--- a/net-misc/curl/curl-8.2.1.ebuild
+++ /dev/null
@@ -1,361 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 ~ia64 ~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 +ftp gnutls gopher hsts +http2 idn +imap kerberos ldap mbedtls nss +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd"
-# These select the default SSL implementation
-IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_rustls"
-IUSE+=" nghttp3"
-RESTRICT="!test? ( test )"
-
-# Only one default ssl provider can be enabled
-# The default ssl provider needs its USE satisfied
-# nghttp3 = https://bugs.gentoo.org/912029
-REQUIRED_USE="
-	ssl? (
-		^^ (
-			curl_ssl_gnutls
-			curl_ssl_mbedtls
-			curl_ssl_nss
-			curl_ssl_openssl
-			curl_ssl_rustls
-		)
-	)
-	curl_ssl_gnutls? ( gnutls )
-	curl_ssl_mbedtls? ( mbedtls )
-	curl_ssl_nss? ( nss )
-	curl_ssl_openssl? ( openssl )
-	curl_ssl_rustls? ( rustls )
-	nghttp3? ( !openssl )
-"
-
-RDEPEND="
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] )
-	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
-	http2? ( >=net-libs/nghttp2-1.12.0:=[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	ldap? ( net-nds/openldap:=[static-libs?,${MULTILIB_USEDEP}] )
-	nghttp3? (
-		>=net-libs/nghttp3-0.13.0[${MULTILIB_USEDEP}]
-		>=net-libs/ngtcp2-0.17.0[gnutls,ssl,-openssl,${MULTILIB_USEDEP}]
-	)
-	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
-	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
-	ssl? (
-		gnutls? (
-			app-misc/ca-certificates
-			net-libs/gnutls:=[static-libs?,${MULTILIB_USEDEP}]
-			dev-libs/nettle:=[${MULTILIB_USEDEP}]
-		)
-		mbedtls? (
-			app-misc/ca-certificates
-			net-libs/mbedtls:=[${MULTILIB_USEDEP}]
-		)
-		nss? (
-			app-misc/ca-certificates
-			dev-libs/nss[${MULTILIB_USEDEP}]
-			dev-libs/nss-pem
-		)
-		openssl? (
-			dev-libs/openssl:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
-		)
-		rustls? (
-			net-libs/rustls-ffi:=[${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}] )
-		nghttp3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
-	)
-	verify-sig? ( sec-keys/openpgp-keys-danielstenberg )
-"
-
-DOCS=( CHANGES 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
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-prefix.patch
-	"${FILESDIR}"/${PN}-respect-cflags-3.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-nss --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 nss; then
-			multilib_is_native_abi && einfo "SSL provided by nss"
-			myconf+=( --with-nss --with-nss-deprecated )
-		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_nss; then
-			multilib_is_native_abi && einfo "Default SSL provided by nss"
-			myconf+=( --with-default-ssl-backend=nss )
-		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-crypto-auth
-		--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
-		--disable-ntlm-wb
-		$(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
-		--without-libpsl
-		--without-msh3
-		$(use_with nghttp3)
-		$(use_with nghttp3 ngtcp2)
-		--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 test && multilib_is_native_abi && ( use http2 || use nghttp3 ); 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
-
-	# Fix up the pkg-config file to be more robust.
-	# https://github.com/curl/curl/issues/864
-	local priv=() libs=()
-	# We always enable zlib.
-	libs+=( "-lz" )
-	priv+=( "zlib" )
-	if use http2; then
-		libs+=( "-lnghttp2" )
-		priv+=( "libnghttp2" )
-	fi
-	if use nghttp3; then
-		libs+=( "-lnghttp3" "-lngtcp2" )
-		priv+=( "libnghttp3" "libngtcp2" )
-	fi
-	if use ssl && use curl_ssl_openssl; then
-		libs+=( "-lssl" "-lcrypto" )
-		priv+=( "openssl" )
-	fi
-	grep -q Requires.private libcurl.pc && die "need to update ebuild"
-	libs=$(printf '|%s' "${libs[@]}")
-	sed -i -r \
-		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
-		libcurl.pc || die
-	echo "Requires.private: ${priv[*]}" >> libcurl.pc || die
-}
-
-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 which 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
-}
diff --git a/net-misc/curl/curl-8.3.0-r1.ebuild b/net-misc/curl/curl-8.3.0-r1.ebuild
deleted file mode 100644
index 53e6f7945937..000000000000
--- a/net-misc/curl/curl-8.3.0-r1.ebuild
+++ /dev/null
@@ -1,361 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 ~ia64 ~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 +ftp gnutls gopher hsts +http2 idn +imap kerberos ldap mbedtls +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd"
-# These select the default SSL implementation
-IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls"
-IUSE+=" nghttp3"
-RESTRICT="!test? ( test )"
-
-# Only one default ssl provider can be enabled
-# The default ssl provider needs its USE satisfied
-# nghttp3 = https://bugs.gentoo.org/912029
-REQUIRED_USE="
-	ssl? (
-		^^ (
-			curl_ssl_gnutls
-			curl_ssl_mbedtls
-			curl_ssl_openssl
-			curl_ssl_rustls
-		)
-	)
-	curl_ssl_gnutls? ( gnutls )
-	curl_ssl_mbedtls? ( mbedtls )
-	curl_ssl_openssl? ( openssl )
-	curl_ssl_rustls? ( rustls )
-	nghttp3? ( !openssl )
-"
-
-# 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/HTTP3.md
-# - https://github.com/curl/curl/blob/master/.github/workflows/quiche-linux.yml
-# However 'supported' vs 'works' are two entirely different things; be sane but
-# don't be afraid to require a later version.
-
-RDEPEND="
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] )
-	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
-	http2? ( >=net-libs/nghttp2-1.12.0:=[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	ldap? ( net-nds/openldap:=[static-libs?,${MULTILIB_USEDEP}] )
-	nghttp3? (
-		>=net-libs/nghttp3-0.15.0[${MULTILIB_USEDEP}]
-		>=net-libs/ngtcp2-0.19.1[gnutls,ssl,-openssl,${MULTILIB_USEDEP}]
-	)
-	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
-	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
-	ssl? (
-		gnutls? (
-			app-misc/ca-certificates
-			net-libs/gnutls:=[static-libs?,${MULTILIB_USEDEP}]
-			dev-libs/nettle:=[${MULTILIB_USEDEP}]
-		)
-		mbedtls? (
-			app-misc/ca-certificates
-			net-libs/mbedtls:=[${MULTILIB_USEDEP}]
-		)
-		openssl? (
-			dev-libs/openssl:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
-		)
-		rustls? (
-			net-libs/rustls-ffi:=[${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}] )
-		nghttp3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
-	)
-	verify-sig? ( sec-keys/openpgp-keys-danielstenberg )
-"
-
-DOCS=( CHANGES 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
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-prefix.patch
-	"${FILESDIR}"/${PN}-respect-cflags-3.patch
-	"${FILESDIR}"/${P}-tests-arm-musl.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
-		--disable-ntlm-wb
-		$(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
-		--without-libpsl
-		--without-msh3
-		$(use_with nghttp3)
-		$(use_with nghttp3 ngtcp2)
-		--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 test && multilib_is_native_abi && ( use http2 || use nghttp3 ); 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
-
-	# Fix up the pkg-config file to be more robust.
-	# https://github.com/curl/curl/issues/864
-	local priv=() libs=()
-	# We always enable zlib.
-	libs+=( "-lz" )
-	priv+=( "zlib" )
-	if use http2; then
-		libs+=( "-lnghttp2" )
-		priv+=( "libnghttp2" )
-	fi
-	if use nghttp3; then
-		libs+=( "-lnghttp3" "-lngtcp2" )
-		priv+=( "libnghttp3" "libngtcp2" )
-	fi
-	if use ssl && use curl_ssl_openssl; then
-		libs+=( "-lssl" "-lcrypto" )
-		priv+=( "openssl" )
-	fi
-	grep -q Requires.private libcurl.pc && die "need to update ebuild"
-	libs=$(printf '|%s' "${libs[@]}")
-	sed -i -r \
-		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
-		libcurl.pc || die
-	echo "Requires.private: ${priv[*]}" >> libcurl.pc || die
-}
-
-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 which 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
-}
diff --git a/net-misc/curl/curl-8.3.0.ebuild b/net-misc/curl/curl-8.3.0.ebuild
deleted file mode 100644
index 77aef67db1c5..000000000000
--- a/net-misc/curl/curl-8.3.0.ebuild
+++ /dev/null
@@ -1,360 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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 ~ia64 ~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 +ftp gnutls gopher hsts +http2 idn +imap kerberos ldap mbedtls +openssl +pop3 +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd"
-# These select the default SSL implementation
-IUSE+=" curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls"
-IUSE+=" nghttp3"
-RESTRICT="!test? ( test )"
-
-# Only one default ssl provider can be enabled
-# The default ssl provider needs its USE satisfied
-# nghttp3 = https://bugs.gentoo.org/912029
-REQUIRED_USE="
-	ssl? (
-		^^ (
-			curl_ssl_gnutls
-			curl_ssl_mbedtls
-			curl_ssl_openssl
-			curl_ssl_rustls
-		)
-	)
-	curl_ssl_gnutls? ( gnutls )
-	curl_ssl_mbedtls? ( mbedtls )
-	curl_ssl_openssl? ( openssl )
-	curl_ssl_rustls? ( rustls )
-	nghttp3? ( !openssl )
-"
-
-# 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/HTTP3.md
-# - https://github.com/curl/curl/blob/master/.github/workflows/quiche-linux.yml
-# However 'supported' vs 'works' are two entirely different things; be sane but
-# don't be afraid to require a later version.
-
-RDEPEND="
-	sys-libs/zlib[${MULTILIB_USEDEP}]
-	adns? ( net-dns/c-ares:=[${MULTILIB_USEDEP}] )
-	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
-	http2? ( >=net-libs/nghttp2-1.12.0:=[${MULTILIB_USEDEP}] )
-	idn? ( net-dns/libidn2:=[static-libs?,${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	ldap? ( net-nds/openldap:=[static-libs?,${MULTILIB_USEDEP}] )
-	nghttp3? (
-		>=net-libs/nghttp3-0.15.0[${MULTILIB_USEDEP}]
-		>=net-libs/ngtcp2-0.19.1[gnutls,ssl,-openssl,${MULTILIB_USEDEP}]
-	)
-	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
-	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
-	ssl? (
-		gnutls? (
-			app-misc/ca-certificates
-			net-libs/gnutls:=[static-libs?,${MULTILIB_USEDEP}]
-			dev-libs/nettle:=[${MULTILIB_USEDEP}]
-		)
-		mbedtls? (
-			app-misc/ca-certificates
-			net-libs/mbedtls:=[${MULTILIB_USEDEP}]
-		)
-		openssl? (
-			dev-libs/openssl:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
-		)
-		rustls? (
-			net-libs/rustls-ffi:=[${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}] )
-		nghttp3? ( net-libs/nghttp2:=[utils,${MULTILIB_USEDEP}] )
-	)
-	verify-sig? ( sec-keys/openpgp-keys-danielstenberg )
-"
-
-DOCS=( CHANGES 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
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-prefix.patch
-	"${FILESDIR}"/${PN}-respect-cflags-3.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
-		--disable-ntlm-wb
-		$(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
-		--without-libpsl
-		--without-msh3
-		$(use_with nghttp3)
-		$(use_with nghttp3 ngtcp2)
-		--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 test && multilib_is_native_abi && ( use http2 || use nghttp3 ); 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
-
-	# Fix up the pkg-config file to be more robust.
-	# https://github.com/curl/curl/issues/864
-	local priv=() libs=()
-	# We always enable zlib.
-	libs+=( "-lz" )
-	priv+=( "zlib" )
-	if use http2; then
-		libs+=( "-lnghttp2" )
-		priv+=( "libnghttp2" )
-	fi
-	if use nghttp3; then
-		libs+=( "-lnghttp3" "-lngtcp2" )
-		priv+=( "libnghttp3" "libngtcp2" )
-	fi
-	if use ssl && use curl_ssl_openssl; then
-		libs+=( "-lssl" "-lcrypto" )
-		priv+=( "openssl" )
-	fi
-	grep -q Requires.private libcurl.pc && die "need to update ebuild"
-	libs=$(printf '|%s' "${libs[@]}")
-	sed -i -r \
-		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
-		libcurl.pc || die
-	echo "Requires.private: ${priv[*]}" >> libcurl.pc || die
-}
-
-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 which 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
-}
diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml
index a182168944d8..7f3ef922ed92 100644
--- a/net-misc/curl/metadata.xml
+++ b/net-misc/curl/metadata.xml
@@ -19,7 +19,6 @@
 		<flag name="imap">Enable Internet Message Access Protocol support</flag>
 		<flag name="mbedtls">Enable mbedtls ssl backend</flag>
 		<flag name="nghttp3">Enable HTTP/3.0 support using <pkg>net-libs/nghttp3</pkg> and <pkg>net-libs/ngtcp2</pkg></flag>
-		<flag name="nss">Enable nss ssl backend</flag>
 		<flag name="openssl">Enable openssl ssl backend</flag>
 		<flag name="pop3">Enable Post Office Protocol 3 support</flag>
 		<flag name="progress-meter">Enable the progress meter</flag>
diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
index 393e05c63f55..64bb34286ba5 100644
--- a/net-misc/streamlink/Manifest
+++ b/net-misc/streamlink/Manifest
@@ -1,17 +1,6 @@
-AUX streamlink-6.4.0-libxml2-2.12.0.patch 7853 BLAKE2B ca0018216e921e6d7a20be200e9d7b6c900f9c8839c7cf05ccc3c2579dbe45767f424a352f89de8299e8deb53034afb89072cd986878b2c550ac24943996e2ae SHA512 c13fc361763da0f00e932250073711cb89acdd3dcc9b15d2c9ae03e177de357afeab02f19c14f6ef73e328bdccf3cd2b7028f31555396309ab63884c1e688033
-DIST streamlink-5.5.1.tar.gz 536064 BLAKE2B 0a651c5dcf9fe0a70ee93505ad0a0ea6aaf10739edc763a796633ce34b8235e4aa6a5a45bd1f6dd2591ced9cd87141d4b89d34e9e399d6166d74c9c3ee12f5ea SHA512 2d7fd75bbf356baaf91791930e74e361b37abf0ff1251fa3022ca216dc16a8610635089cb746506baec82c31f8bc569e3b8e538b17ba910389168e61dcdbbe0f
-DIST streamlink-6.0.1.tar.gz 682425 BLAKE2B a84c6c1594b78b62c1c20c021c3dde2eae06e86fad559de285800cb5f1cc2d97dadb5724053b320dafdbca3545e1d10171d1adc3b8a1c9c67d2e4d80940357dc SHA512 96081a23b616d85a0918583d951334f35843cb47d6d3d317c3903516b951db2a953db1ea2cb1fb3de95cb059a37dc605d40817e81819acf4e5c98f831bd39323
-DIST streamlink-6.1.0.tar.gz 686463 BLAKE2B cc2890db0181e47bcae9da38eddeaadfd34b29a3d4b8bc2bb4d296289cdb356f9614d4e1edd8b11e23d226115f645399296d5589e42832ad473d9cb96ebfde0f SHA512 24fb549be6088eb913348ae892f694b91a6d6c929a06b9ed0db050e203a020ea9780b217f96d7890b7309d304e9a547c47673b8b3f2588dfedbaa44bb5808e29
 DIST streamlink-6.2.0.tar.gz 690986 BLAKE2B 5f7cab73ea366580aeb837b8f8a27fa7cd5ca687afa53908900dc9f290a0da916778fda8351acda00f795688b156ca0f37302e67128ce30e9838a45111b88ecd SHA512 2747ebc584caa8ebb2fde5d4f309c911a52fd1a8d2d0e832487e589873c270534e0d0b18120a2db7a68e150e301e57db1e8d63f1d5bb6244f364e9cbd6606213
-DIST streamlink-6.2.1.tar.gz 692446 BLAKE2B c1b98ffca37051675a92afc86d12635b538c1b12c023b652a05516faffb289f50b479b38ae48813a4f83d6c881dc7f211e66c6d7f7dd08adcf1a354c9bd15427 SHA512 852610d97138cf0a8066f760f747cb32f1d51c8c55b84df5b6a798556343010c2e68ca5d9a8473e8d32f72bc2a5d89f9d90ee70ccced84b6c9408930ed49585a
-DIST streamlink-6.3.1.tar.gz 699073 BLAKE2B 9d1fc58bd0cf4539369fc9d49230c18ef3b9a783783a517c831089571424412841f9e8925202d32bc4218d7a08e4e53c823fc503199131edb59e8fd69e8d49fa SHA512 a1e50688acd3b99efd20c1ff1d3bda03cb6e6b5566484d29372bc6d08ee4115f8ad2edea2f0a90f5de105edb52689781892f413f4af3d836cdd9e9a364006610
-DIST streamlink-6.4.0.tar.gz 715287 BLAKE2B e2657a03bbc02e40207079a43dd2770dddb46b1b07db428bef4623a760bf37dc6853bbbc49a65462f5063e377ca45d2c540e6b879ba7852f76d49062c668f1af SHA512 94387a8d7861c2010319a57b57c430a9600ec3da17320293a13caa5769d19ab366522f36c24d96d481e123faddf6869b1126e3657a1c3b3164a8313daf9a3efb
-EBUILD streamlink-5.5.1.ebuild 1544 BLAKE2B 80f5cc0c5b84ee0baf644d3af104d796f104474df6bd1039e87394f3a26732754cad19d6ac10533b2618a97db3c745d1e7fd52e78c25ae321610eab27af51336 SHA512 e21839c90166932d66de3946280397363493a725aa01b796d9b758492cb3dc16ac838aae753de88adc84ec94c24a882780cb72dcdefaed7cded987704b857383
-EBUILD streamlink-6.0.1.ebuild 1692 BLAKE2B ed4cbf9845ad507c3b73b28443bf92361d5ace7c0e2f79d343b06ae1629b9c49775746beba2d140ce70eae0b89d585c90cca4d9784aec6facf86eac9f2debb9b SHA512 c982240eac7f913eb7f250d1f30a1152659a5153f8f4f1bc5f886c2b72971a5a9e5b318edd02729ae77b7a287bfc96a0aa4cb17325f11a1dbc9ab43b3a0c70e4
-EBUILD streamlink-6.1.0.ebuild 1659 BLAKE2B 5b732dbacc0bd36345fcc68581829d7ec463bf3493a5eb34f5188645cdc0b57f64326bf6010b7dd209009b59ebfb9e377eccffcaef369c875fe14bbc7af5314a SHA512 95ddf3426d727908239d6c5be7e0f2543f8c83d7d77e04e9f89f25a9ab64272b6d0610d2d9bef76e2fd6303139432b0e99fba8acf049abc8c21f74ec7ef28555
+DIST streamlink-6.4.1.tar.gz 715775 BLAKE2B 40b6c080a8fa2815b12562aafde9ce1dd2c8fabe405e21d90fc7767c9e6c085f60c3d0dc9f33c77b85015aa64e2d209464662908674638719581278d128b3f1c SHA512 8886b990637e9f4e87b4fcdc00c2d3e11203746e7256c0d85aee3128f65baaf37ea730c2626c3ec8f0f5ee0042bbd271c4a6290bd346d59915f2f554602f0db4
 EBUILD streamlink-6.2.0.ebuild 1659 BLAKE2B 5b732dbacc0bd36345fcc68581829d7ec463bf3493a5eb34f5188645cdc0b57f64326bf6010b7dd209009b59ebfb9e377eccffcaef369c875fe14bbc7af5314a SHA512 95ddf3426d727908239d6c5be7e0f2543f8c83d7d77e04e9f89f25a9ab64272b6d0610d2d9bef76e2fd6303139432b0e99fba8acf049abc8c21f74ec7ef28555
-EBUILD streamlink-6.2.1.ebuild 1872 BLAKE2B 0286827b0324f4d3f72b00b7b5fc3cb901d3be9bb7986e81d265fee05f7d19caf38f8244e6d004fd0ded695bbb9abddc8bc7ba0f46b7b348c73f1ad6a0ceb5cc SHA512 b27d6fa771a567ec6ac4a916bd103edf7c7149e253e384df6724aca8edd0c21980d04986492682ae547372b4b2923eea8a1c5a69aa231c4de703c16acd46089e
-EBUILD streamlink-6.3.1.ebuild 1964 BLAKE2B 1e49538c8f14ac85bd9bb2898d9676d73a245b331359848fc134cd0335a0d4b11f55b334fd26f682eda2a71b13a4477c94ee7e0185190663896a139fada09612 SHA512 5d8f80bcc7fd4ad85fc39997f33bd7953e396755a45cbde491df775b5be40a0f65c9f9cf7092393ebddc02e0294bea3b0f9a2cbfe8ca5e6875d91668dd52bfe0
-EBUILD streamlink-6.4.0.ebuild 2250 BLAKE2B d0bc79568dadf1405661ef8de3399912cf184cce3244d06fbeb1b094a4ccc02abbbaabeec811dc7e03594462b3090c5e783882bd75b2a8eb289f48ab6c57a513 SHA512 7aabc9e7c39aa803bd3b4665134387e99a0cbabfcd2b692bd659720a4d69ab27976a92dde58ed85a17b621bef57ae35b5ad8409a3fc1f0547b8b433d6f670895
+EBUILD streamlink-6.4.1.ebuild 2196 BLAKE2B baf9acc296269eb0ead0e12e0ee002398dc10d970fd9b32ab4159a10e7dad65ad9f047d40a5daa91b650d49ab4099526b79cfbd264d373b31f4ad05ce903b1c6 SHA512 3f5a6de5850f7880e723f5ac6f66e32c84878a8dfa7664d9303d942ff4ac80e56bf71eafdf3d8c1949c59720303623d9d58a64f2f8c58142c3add539aef87f83
 EBUILD streamlink-9999.ebuild 2196 BLAKE2B baf9acc296269eb0ead0e12e0ee002398dc10d970fd9b32ab4159a10e7dad65ad9f047d40a5daa91b650d49ab4099526b79cfbd264d373b31f4ad05ce903b1c6 SHA512 3f5a6de5850f7880e723f5ac6f66e32c84878a8dfa7664d9303d942ff4ac80e56bf71eafdf3d8c1949c59720303623d9d58a64f2f8c58142c3add539aef87f83
 MISC metadata.xml 374 BLAKE2B 8c5f72454d8d00a99c18328838cc9c3be82cd9d68405f6e702239b8475a9162f3ba945b142bf2f5762fcc4ac52cae95c8e2d5c0707b1028c11faba2341a2d8e9 SHA512 038e509b340b1cc31382b0a1edf0c273fe99ca7c8c40370039a01cf6a95101d1217db7fea64bc67f5c113c99d504ceb7256008c1539c4d7e13ad6ceb8b922a58
diff --git a/net-misc/streamlink/files/streamlink-6.4.0-libxml2-2.12.0.patch b/net-misc/streamlink/files/streamlink-6.4.0-libxml2-2.12.0.patch
deleted file mode 100644
index ed5fd30366d2..000000000000
--- a/net-misc/streamlink/files/streamlink-6.4.0-libxml2-2.12.0.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-https://github.com/streamlink/streamlink/commit/9d8156dd794ee0919297cd90d85bcc11b8a28358
-
-From 9d8156dd794ee0919297cd90d85bcc11b8a28358 Mon Sep 17 00:00:00 2001
-From: bastimeyer <mail@bastimeyer.de>
-Date: Tue, 21 Nov 2023 20:10:47 +0100
-Subject: [PATCH] utils.parse: fix libxml2 2.12.0 compatibility
-
----
- src/streamlink/compat.py      |  11 ++++
- src/streamlink/utils/parse.py |  17 +++++-
- tests/utils/test_parse.py     | 112 ++++++++++++++++++++++++++--------
- 3 files changed, 114 insertions(+), 26 deletions(-)
-
-diff --git a/src/streamlink/compat.py b/src/streamlink/compat.py
-index c75201544d3..993bce64cfd 100644
---- a/src/streamlink/compat.py
-+++ b/src/streamlink/compat.py
-@@ -2,11 +2,22 @@
- import sys
- 
- 
-+# compatibility import of charset_normalizer/chardet via requests<3.0
-+try:
-+    from requests.compat import chardet as charset_normalizer  # type: ignore
-+except ImportError:  # pragma: no cover
-+    import charset_normalizer
-+
-+
- is_darwin = sys.platform == "darwin"
- is_win32 = os.name == "nt"
- 
- 
-+detect_encoding = charset_normalizer.detect
-+
-+
- __all__ = [
-     "is_darwin",
-     "is_win32",
-+    "detect_encoding",
- ]
-diff --git a/src/streamlink/utils/parse.py b/src/streamlink/utils/parse.py
-index 8c9f79c8b51..17479b81f59 100644
---- a/src/streamlink/utils/parse.py
-+++ b/src/streamlink/utils/parse.py
-@@ -4,6 +4,7 @@
- 
- from lxml.etree import HTML, XML
- 
-+from streamlink.compat import detect_encoding
- from streamlink.plugin import PluginError
- 
- 
-@@ -51,7 +52,21 @@ def parse_html(
-      - Removes XML declarations of invalid XHTML5 documents
-      - Wraps errors in custom exception with a snippet of the data in the message
-     """
--    if isinstance(data, str) and data.lstrip().startswith("<?xml"):
-+    # strip XML text declarations from XHTML5 documents which were incorrectly defined as HTML5
-+    is_bytes = isinstance(data, bytes)
-+    if data and data.lstrip()[:5].lower() == (b"<?xml" if is_bytes else "<?xml"):
-+        if is_bytes:
-+            # get the document's encoding using the "encoding" attribute value of the XML text declaration
-+            match = re.match(rb"^\s*<\?xml\s.*?encoding=(?P<q>[\'\"])(?P<encoding>.+?)(?P=q).*?\?>", data, re.IGNORECASE)
-+            if match:
-+                encoding_value = detect_encoding(match["encoding"])["encoding"]
-+                encoding = match["encoding"].decode(encoding_value)
-+            else:
-+                # no "encoding" attribute: try to figure out encoding from the document's content
-+                encoding = detect_encoding(data)["encoding"]
-+
-+            data = data.decode(encoding)
-+
-         data = re.sub(r"^\s*<\?xml.+?\?>", "", data)
- 
-     return _parse(HTML, data, name, exception, schema, *args, **kwargs)
-diff --git a/tests/utils/test_parse.py b/tests/utils/test_parse.py
-index aedae7d4e8e..69c16f282b9 100644
---- a/tests/utils/test_parse.py
-+++ b/tests/utils/test_parse.py
-@@ -74,31 +74,93 @@ def test_parse_xml_entities(self):
-         assert actual.tag == expected.tag
-         assert actual.attrib == expected.attrib
- 
--    def test_parse_xml_encoding(self):
--        tree = parse_xml("""<?xml version="1.0" encoding="UTF-8"?><test>ä</test>""")
--        assert tree.xpath(".//text()") == ["ä"]
--        tree = parse_xml("""<test>ä</test>""")
--        assert tree.xpath(".//text()") == ["ä"]
--        tree = parse_xml(b"""<?xml version="1.0" encoding="UTF-8"?><test>\xC3\xA4</test>""")
--        assert tree.xpath(".//text()") == ["ä"]
--        tree = parse_xml(b"""<test>\xC3\xA4</test>""")
--        assert tree.xpath(".//text()") == ["ä"]
--
--    def test_parse_html_encoding(self):
--        tree = parse_html("""<!DOCTYPE html><html><head><meta charset="utf-8"/></head><body>ä</body></html>""")
--        assert tree.xpath(".//body/text()") == ["ä"]
--        tree = parse_html("""<!DOCTYPE html><html><body>ä</body></html>""")
--        assert tree.xpath(".//body/text()") == ["ä"]
--        tree = parse_html(b"""<!DOCTYPE html><html><meta charset="utf-8"/><body>\xC3\xA4</body></html>""")
--        assert tree.xpath(".//body/text()") == ["ä"]
--        tree = parse_html(b"""<!DOCTYPE html><html><body>\xC3\xA4</body></html>""")
--        assert tree.xpath(".//body/text()") == ["ä"]
--
--    def test_parse_html_xhtml5(self):
--        tree = parse_html("""<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html><html><body>ä?></body></html>""")
--        assert tree.xpath(".//body/text()") == ["ä?>"]
--        tree = parse_html(b"""<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html><html><body>\xC3\xA4?></body></html>""")
--        assert tree.xpath(".//body/text()") == ["ä?>"]
-+    @pytest.mark.parametrize(("content", "expected"), [
-+        pytest.param(
-+            """<?xml version="1.0" encoding="UTF-8"?><test>ä</test>""",
-+            "ä",
-+            id="string-utf-8",
-+        ),
-+        pytest.param(
-+            """<test>ä</test>""",
-+            "ä",
-+            id="string-unknown",
-+        ),
-+        pytest.param(
-+            b"""<?xml version="1.0" encoding="UTF-8"?><test>\xC3\xA4</test>""",
-+            "ä",
-+            id="bytes-utf-8",
-+        ),
-+        pytest.param(
-+            b"""<?xml version="1.0" encoding="ISO-8859-1"?><test>\xE4</test>""",
-+            "ä",
-+            id="bytes-iso-8859-1",
-+        ),
-+        pytest.param(
-+            b"""<test>\xC3\xA4</test>""",
-+            "ä",
-+            id="bytes-unknown",
-+        ),
-+    ])
-+    def test_parse_xml_encoding(self, content, expected):
-+        tree = parse_xml(content)
-+        assert tree.xpath(".//text()") == [expected]
-+
-+    @pytest.mark.parametrize(("content", "expected"), [
-+        pytest.param(
-+            """<!DOCTYPE html><html><head><meta charset="utf-8"/></head><body>ä</body></html>""",
-+            "ä",
-+            id="string-utf-8",
-+        ),
-+        pytest.param(
-+            """<!DOCTYPE html><html><body>ä</body></html>""",
-+            "ä",
-+            id="string-unknown",
-+        ),
-+        pytest.param(
-+            b"""<!DOCTYPE html><html><head><meta charset="utf-8"/></head><body>\xC3\xA4</body></html>""",
-+            "ä",
-+            id="bytes-utf-8",
-+        ),
-+        pytest.param(
-+            b"""<!DOCTYPE html><html><head><meta charset="ISO-8859-1"/></head><body>\xE4</body></html>""",
-+            "ä",
-+            id="bytes-iso-8859-1",
-+        ),
-+        pytest.param(
-+            b"""<!DOCTYPE html><html><body>\xC3\xA4</body></html>""",
-+            "ä",
-+            id="bytes-unknown",
-+        ),
-+    ])
-+    def test_parse_html_encoding(self, content, expected):
-+        tree = parse_html(content)
-+        assert tree.xpath(".//body/text()") == [expected]
-+
-+    @pytest.mark.parametrize(("content", "expected"), [
-+        pytest.param(
-+            """<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html><html><body>ä?></body></html>""",
-+            "ä?>",
-+            id="string",
-+        ),
-+        pytest.param(
-+            b"""<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html><html><body>\xC3\xA4?></body></html>""",
-+            "ä?>",
-+            id="bytes-utf-8",
-+        ),
-+        pytest.param(
-+            b"""<?xml version="1.0" encoding="ISO-8859-1"?><!DOCTYPE html><html><body>\xE4?></body></html>""",
-+            "ä?>",
-+            id="bytes-iso-8859-1",
-+        ),
-+        pytest.param(
-+            b"""<?xml version="1.0"?><!DOCTYPE html><html><body>\xC3\xA4?></body></html>""",
-+            "ä?>",
-+            id="bytes-unknown",
-+        ),
-+    ])
-+    def test_parse_html_xhtml5(self, content, expected):
-+        tree = parse_html(content)
-+        assert tree.xpath(".//body/text()") == [expected]
- 
-     def test_parse_qsd(self):
-         assert parse_qsd("test=1&foo=bar", schema=validate.Schema({"test": str, "foo": "bar"})) == {"test": "1", "foo": "bar"}
-
diff --git a/net-misc/streamlink/streamlink-5.5.1.ebuild b/net-misc/streamlink/streamlink-5.5.1.ebuild
deleted file mode 100644
index b7ef73d3b5e2..000000000000
--- a/net-misc/streamlink/streamlink-5.5.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/streamlink/${PN}.git"
-	inherit git-r3
-fi
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE='xml(+),threads(+)'
-inherit distutils-r1
-
-DESCRIPTION="CLI for extracting streams from websites to a video player of your choice"
-HOMEPAGE="https://streamlink.github.io/"
-
-if [[ ${PV} != 9999* ]]; then
-	SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="BSD-2 Apache-2.0"
-SLOT="0"
-
-DEPEND="
-	$(python_gen_cond_dep '
-		dev-python/certifi[${PYTHON_USEDEP}]
-		>dev-python/requests-2.21.0[${PYTHON_USEDEP}]
-		dev-python/isodate[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.6.4[${PYTHON_USEDEP}]
-		dev-python/websocket-client[${PYTHON_USEDEP}]
-		dev-python/pycountry[${PYTHON_USEDEP}]
-		>=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}]
-		>dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
-		>=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}]
-		>=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}]
-	')
-"
-RDEPEND="
-	${DEPEND}
-	media-video/ffmpeg
-"
-BDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}]
-		test? (
-			dev-python/mock[${PYTHON_USEDEP}]
-			>=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}]
-			dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-			dev-python/requests-mock[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-distutils_enable_tests pytest
diff --git a/net-misc/streamlink/streamlink-6.0.1.ebuild b/net-misc/streamlink/streamlink-6.0.1.ebuild
deleted file mode 100644
index 9208c85c22e7..000000000000
--- a/net-misc/streamlink/streamlink-6.0.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/streamlink/${PN}.git"
-	inherit git-r3
-fi
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE='xml(+),threads(+)'
-inherit distutils-r1
-
-DESCRIPTION="CLI for extracting streams from websites to a video player of your choice"
-HOMEPAGE="https://streamlink.github.io/"
-
-if [[ ${PV} != 9999* ]]; then
-	SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="BSD-2 Apache-2.0"
-SLOT="0"
-
-DEPEND="
-	$(python_gen_cond_dep '
-		dev-python/certifi[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
-		dev-python/isodate[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.6.4[${PYTHON_USEDEP}]
-		>=dev-python/websocket-client-1.2.1[${PYTHON_USEDEP}]
-		dev-python/pycountry[${PYTHON_USEDEP}]
-		>=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}]
-		>dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
-		>=dev-python/trio-0.22.0[${PYTHON_USEDEP}]
-		>=dev-python/trio-websocket-0.9.0[${PYTHON_USEDEP}]
-		>=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}]
-		>=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}]
-	')
-"
-RDEPEND="
-	${DEPEND}
-	media-video/ffmpeg
-"
-BDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}]
-		test? (
-			dev-python/mock[${PYTHON_USEDEP}]
-			>=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}]
-			dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-			dev-python/pytest-trio[${PYTHON_USEDEP}]
-			dev-python/requests-mock[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-distutils_enable_tests pytest
diff --git a/net-misc/streamlink/streamlink-6.1.0.ebuild b/net-misc/streamlink/streamlink-6.1.0.ebuild
deleted file mode 100644
index 01f6fa60c3bb..000000000000
--- a/net-misc/streamlink/streamlink-6.1.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/streamlink/${PN}.git"
-	inherit git-r3
-fi
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE='xml(+),threads(+)'
-inherit distutils-r1
-
-DESCRIPTION="CLI for extracting streams from websites to a video player of your choice"
-HOMEPAGE="https://streamlink.github.io/"
-
-if [[ ${PV} != 9999* ]]; then
-	SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="BSD-2 Apache-2.0"
-SLOT="0"
-
-DEPEND="
-	$(python_gen_cond_dep '
-		dev-python/certifi[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
-		dev-python/isodate[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.6.4[${PYTHON_USEDEP}]
-		>=dev-python/websocket-client-1.2.1[${PYTHON_USEDEP}]
-		dev-python/pycountry[${PYTHON_USEDEP}]
-		>=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}]
-		>dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
-		>=dev-python/trio-0.22.0[${PYTHON_USEDEP}]
-		>=dev-python/trio-websocket-0.9.0[${PYTHON_USEDEP}]
-		>=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}]
-		>=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}]
-	')
-"
-RDEPEND="
-	${DEPEND}
-	media-video/ffmpeg
-"
-BDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}]
-		test? (
-			>=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}]
-			dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-			dev-python/pytest-trio[${PYTHON_USEDEP}]
-			dev-python/requests-mock[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-distutils_enable_tests pytest
diff --git a/net-misc/streamlink/streamlink-6.2.1.ebuild b/net-misc/streamlink/streamlink-6.2.1.ebuild
deleted file mode 100644
index 5f7264547893..000000000000
--- a/net-misc/streamlink/streamlink-6.2.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/streamlink/${PN}.git"
-	inherit git-r3
-fi
-
-DISTUTILS_SINGLE_IMPL=1
-# >= 6.2.1 uses a bunch of setuptools hooks instead of vanilla setuptools
-# https://github.com/streamlink/streamlink/commit/194d9bc193f5285bc1ba33af5fd89209a96ad3a7
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE='xml(+),threads(+)'
-inherit distutils-r1
-
-DESCRIPTION="CLI for extracting streams from websites to a video player of your choice"
-HOMEPAGE="https://streamlink.github.io/"
-
-if [[ ${PV} != 9999* ]]; then
-	SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="BSD-2 Apache-2.0"
-SLOT="0"
-
-DEPEND="
-	$(python_gen_cond_dep '
-		dev-python/certifi[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
-		dev-python/isodate[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.6.4[${PYTHON_USEDEP}]
-		>=dev-python/websocket-client-1.2.1[${PYTHON_USEDEP}]
-		dev-python/pycountry[${PYTHON_USEDEP}]
-		>=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}]
-		>dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
-		>=dev-python/trio-0.22.0[${PYTHON_USEDEP}]
-		>=dev-python/trio-websocket-0.9.0[${PYTHON_USEDEP}]
-		>=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}]
-		>=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}]
-	')
-"
-RDEPEND="
-	${DEPEND}
-	media-video/ffmpeg
-"
-BDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/setuptools-64[${PYTHON_USEDEP}]
-		>=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}]
-		test? (
-			>=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}]
-			dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-			dev-python/pytest-trio[${PYTHON_USEDEP}]
-			dev-python/requests-mock[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-distutils_enable_tests pytest
diff --git a/net-misc/streamlink/streamlink-6.3.1.ebuild b/net-misc/streamlink/streamlink-6.3.1.ebuild
deleted file mode 100644
index 05ac7784a3e8..000000000000
--- a/net-misc/streamlink/streamlink-6.3.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/streamlink/${PN}.git"
-	inherit git-r3
-fi
-
-DISTUTILS_SINGLE_IMPL=1
-# >= 6.2.1 uses a bunch of setuptools hooks instead of vanilla setuptools
-# https://github.com/streamlink/streamlink/commit/194d9bc193f5285bc1ba33af5fd89209a96ad3a7
-DISTUTILS_USE_PEP517=standalone
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE='xml(+),threads(+)'
-inherit distutils-r1
-
-DESCRIPTION="CLI for extracting streams from websites to a video player of your choice"
-HOMEPAGE="https://streamlink.github.io/"
-
-if [[ ${PV} != 9999* ]]; then
-	SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz"
-fi
-
-LICENSE="BSD-2 Apache-2.0"
-SLOT="0"
-if [[ ${PV} != 9999* ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-RDEPEND="
-	media-video/ffmpeg
-	$(python_gen_cond_dep '
-		dev-python/certifi[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.26.0[${PYTHON_USEDEP}]
-		dev-python/isodate[${PYTHON_USEDEP}]
-		>=dev-python/lxml-4.6.4[${PYTHON_USEDEP}]
-		>=dev-python/websocket-client-1.2.1[${PYTHON_USEDEP}]
-		dev-python/pycountry[${PYTHON_USEDEP}]
-		>=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}]
-		>dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
-		>=dev-python/trio-0.22.0[${PYTHON_USEDEP}]
-		>=dev-python/trio-websocket-0.9.0[${PYTHON_USEDEP}]
-		>=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/setuptools-64[${PYTHON_USEDEP}]
-		>=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}]
-		test? (
-			>=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}]
-			dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-			dev-python/pytest-trio[${PYTHON_USEDEP}]
-			dev-python/requests-mock[${PYTHON_USEDEP}]
-		)
-	')
-"
-
-if [[ ${PV} == 9999* ]]; then
-	RDEPEND+="
-		$(python_gen_cond_dep '
-			>=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}]
-		')
-	"
-fi
-
-distutils_enable_tests pytest
diff --git a/net-misc/streamlink/streamlink-6.4.0.ebuild b/net-misc/streamlink/streamlink-6.4.1.ebuild
index 2c9ca567becc..d73952536218 100644
--- a/net-misc/streamlink/streamlink-6.4.0.ebuild
+++ b/net-misc/streamlink/streamlink-6.4.1.ebuild
@@ -71,8 +71,4 @@ if [[ ${PV} == 9999* ]]; then
 	"
 fi
 
-PATCHES=(
-	"${FILESDIR}"/${P}-libxml2-2.12.0.patch
-)
-
 distutils_enable_tests pytest
diff --git a/net-misc/trurl/Manifest b/net-misc/trurl/Manifest
index 2e9c49659970..660b4de804a5 100644
--- a/net-misc/trurl/Manifest
+++ b/net-misc/trurl/Manifest
@@ -1,8 +1,5 @@
-AUX trurl-0.5-fix-makefile.patch 589 BLAKE2B 2e243b7706cfa6c5d409b5e5f57e1dfe7e5b6e8af991a81ff109db46f75cf6bb1a5227198a31cc5f9abd27d0fa0d65e702b8768ef818e086ab7bd1c47498f2a6 SHA512 9d08aa9fbc93f442e057a958ee2c5d98d7582dbf9acef4b797c1e011521559e4c1ba0271036f6a95d5f331bb64c4ac84f0f2fa72dae819c30869d06e2ea6c5b6
 AUX trurl-0.7-fix-makefile.patch 601 BLAKE2B a773200bd930135da41eddfe64187f6a07449db45e072e9e0c375c9dca55175a885f224c7823dedb31aee7c2ea20bd983e86c7112804e3bdf163535b36f3f79d SHA512 2850448f989dce86cf22963772bb1f09ca557405c59e6716aa740b6fd7a0ef5ae23156d737bfb3900b9256124f823da57cfa43dfead921fadd65f67ee454c911
-DIST trurl-0.5.tar.gz 28792 BLAKE2B e552d04599628ea17e19627a1aa24871bf71fb100253f6eb945a9062ad0db98ea0a87125cc2c6a5f05f8c0296953c972b8fc9a6d5c01bdbc74d9ab9e28b9094c SHA512 1bf81030e8c904e551180b5c51f37ebe382345f397165695b47554e3c712c568351a53a7527891807f89127ea270b72632b24388db4c8efee3e9994cae1def47
 DIST trurl-0.7.tar.gz 36624 BLAKE2B a63e8ec7f0b57006b5fa7a1d2ade1284dc2076474ef0425574ecb9b452c49d9a6148461a97e760287340d67a924612c1eb1fe188b6597b8147f818c18681190f SHA512 9ecccd9b688d7bddba760bbd408a1b864d5818b2c538904662ab81b13bca6226d03a4d209c74841c83ee368e656243e92bc7f7be876dbd5c1736b7fc2c3f82d6
-EBUILD trurl-0.5.ebuild 1058 BLAKE2B d0377339add2be9d1795b006a15e7683a20ad131410f417085ebd199450ab04698cfba1a7e4eafa0fb6c1d48ed1279eef6428afe0a3481c0c50fe4aa0a42984b SHA512 b1bbbe4a1b05a5cf07146288e533fbdff7de95e4e9ba732e29206be6aecd0c8fd9a7fd891f808dc5184b3b6174fb392e76f402ed76a39e4b1532ba4a2cc79813
 EBUILD trurl-0.7.ebuild 1059 BLAKE2B fef8f31f9ef4d72960711eef4ac92d55466a8d8dea058a0ca165aeaa38448a063afc321bb9016967a5b4d42b8c9b5d52f130644821ece9e13b0d0d74c2c8e3de SHA512 eee32d0a1415d7de72a6fe6b6c0540abb42cb03440b2334d704eeff253de38c23fb319b4721a8e21921bff92e9c41db5b132d9da8b52a91ab754143cec0304a5
 EBUILD trurl-9999.ebuild 1059 BLAKE2B fef8f31f9ef4d72960711eef4ac92d55466a8d8dea058a0ca165aeaa38448a063afc321bb9016967a5b4d42b8c9b5d52f130644821ece9e13b0d0d74c2c8e3de SHA512 eee32d0a1415d7de72a6fe6b6c0540abb42cb03440b2334d704eeff253de38c23fb319b4721a8e21921bff92e9c41db5b132d9da8b52a91ab754143cec0304a5
 MISC metadata.xml 315 BLAKE2B 4ae563841f80987d7156bfa13ab36c79f42b60d598dd5425cd877489f874e09cf8d13fa858b1ddb476cebc6a9af1383865bef0d1f82f6ad51aab58e05a225201 SHA512 c0c5e3d8cef3912c447145a6a8131056c13e6865e40eccb1ba422ae3e8ffa0038f7938133e1d05c7686be0886f44f479db53746a6fc2656d7c2d7b0e7e057766
diff --git a/net-misc/trurl/files/trurl-0.5-fix-makefile.patch b/net-misc/trurl/files/trurl-0.5-fix-makefile.patch
deleted file mode 100644
index 66a152991ca4..000000000000
--- a/net-misc/trurl/files/trurl-0.5-fix-makefile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-See https://github.com/curl/trurl/pull/158#issuecomment-1512397801.
---- a/Makefile
-+++ b/Makefile
-@@ -1,8 +1,6 @@
- TARGET = trurl
- OBJS = trurl.o
--LDLIBS != curl-config --libs
--CFLAGS != curl-config --cflags
--CFLAGS += -W -Wall -pedantic -g
-+LDLIBS = $(shell curl-config --libs)
- MANUAL = trurl.1
- 
- PREFIX ?= /usr/local
-@@ -13,7 +11,7 @@ INSTALL ?= install
- PYTHON3 ?= python3
- 
- $(TARGET): $(OBJS)
--	$(CC) $(OBJS) -o $(TARGET) $(LDLIBS) $(LDFLAGS)
-+	$(CC) $(CPPFLAGS) $(CFLAGS) -Wall $(shell curl-config --cflags) $(LDFLAGS) $(OBJS) -o $(TARGET) $(LDLIBS)
- 
- trurl.o:trurl.c version.h
- 
diff --git a/net-misc/trurl/trurl-0.5.ebuild b/net-misc/trurl/trurl-0.5.ebuild
deleted file mode 100644
index 6a2113d8634b..000000000000
--- a/net-misc/trurl/trurl-0.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit toolchain-funcs python-any-r1
-
-DESCRIPTION="Command line tool for URL parsing and manipulation"
-HOMEPAGE="https://curl.se/trurl/ https://daniel.haxx.se/blog/2023/04/03/introducing-trurl/"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/curl/trurl"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/curl/trurl/archive/refs/tags/${P}.tar.gz"
-	S="${WORKDIR}"/${PN}-${P}
-
-	KEYWORDS="~amd64 ~arm ~arm64"
-fi
-
-LICENSE="curl"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Older curls may work but not all features will be present
-DEPEND=">=net-misc/curl-7.81.0"
-RDEPEND="${DEPEND}"
-BDEPEND="test? ( ${PYTHON_DEPS} )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.5-fix-makefile.patch
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_compile() {
-	tc-export CC
-
-	default
-}
-
-src_test() {
-	emake PYTHON3="${EPYTHON}" test
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
-}