diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
index c1933dcaf7623..5ba8b89402225 100644
--- a/net-misc/streamlink/Manifest
+++ b/net-misc/streamlink/Manifest
@@ -1,2 +1,4 @@
 DIST streamlink-8.4.0.tar.gz 842447 BLAKE2B 80130c695bd55e0640c95632c3849f175cbaf56917aa028dc2a754ae84677f06290f948e2838429da352ba2e6559bde56447bb3f7e78fae00f5bdeaaf173f4e9 SHA512 12061b16b80efec7de1d92fb83b556fa14aac34c6dccab077f133656576ee9b20c8c497b8f03cc4aeae51b8c90a610c26694e56256d88ac8925b157f1f717115
 DIST streamlink-8.4.0.tar.gz.asc 228 BLAKE2B 5fea41a7c5f780c617f5fb7f6ea0ade9a1933b4612b75326b540c093dcf48d14d046ac316d63820cedaa4ca64103e4309fbb352753a04178c71334f64247b61e SHA512 b7d7d42cbf148670638d7039385371ee6ea26f5df23f68aab7e8b796fbe68270683701a3d5f74e3574f68cbe4d844230e2ab4f97d08db74f2e39d630f327d64b
+DIST streamlink-8.5.0.tar.gz 863239 BLAKE2B ffe05127476e388a0a7248d461097f935d572bd9a2ccbe056ac504dcab2aa1d4baf6277c0878708207f037f69b56b5bf5392af68c3d0ab99649b937a40aad41b SHA512 0dd12322bbb036136624a835e2165349095210b173970983970788846fd1bbeb92511820b66d03efb9059e64965b96269e88940ec41a756a0fc3f7764ccb7b5e
+DIST streamlink-8.5.0.tar.gz.asc 228 BLAKE2B 453dc928fd85de8511039c9908b5794e3a0c2fea317aa255b6e3d98641d8dc06718d048d057a874c19008ffa24c97805a1a7f6c1d2047d9ceeeff8dfc23e0db8 SHA512 d5c39357e6504bcc6fcff11b4fe74046a3a553b49b88bef1a018913577ca6a3e5c04d6a0d93dd811cce840f406a9f5475b09af42d0b0f89887ecf4725b093684
diff --git a/net-misc/streamlink/streamlink-8.5.0.ebuild b/net-misc/streamlink/streamlink-8.5.0.ebuild
new file mode 100644
index 0000000000000..59480ebaac817
--- /dev/null
+++ b/net-misc/streamlink/streamlink-8.5.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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_{12..15} )
+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
+	EGIT_REPO_URI="https://github.com/streamlink/${PN}.git"
+	inherit git-r3
+
+	BDEPEND+="
+		$(python_gen_cond_dep '
+			>=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}]
+		')
+	"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/streamlink.asc
+	inherit verify-sig
+
+	SRC_URI="
+		https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz
+		verify-sig? ( https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz.asc )
+	"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-streamlink )"
+fi
+
+LICENSE="BSD-2 Apache-2.0"
+SLOT="0"
+
+# See https://github.com/streamlink/streamlink/commit/9d8156dd794ee0919297cd90d85bcc11b8a28358 for chardet/charset-normalizer dep
+RDEPEND="
+	media-video/ffmpeg
+	$(python_gen_cond_dep '
+		dev-python/certifi[${PYTHON_USEDEP}]
+		|| (
+			dev-python/chardet[${PYTHON_USEDEP}]
+			dev-python/charset-normalizer[${PYTHON_USEDEP}]
+		)
+		>=dev-python/requests-2.30.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-r9999[${PYTHON_USEDEP}]
+		>=dev-python/trio-0.22.0[${PYTHON_USEDEP}]
+		>=dev-python/trio-websocket-0.9.0[${PYTHON_USEDEP}]
+		>=dev-python/urllib3-2.0.0[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND+="
+	$(python_gen_cond_dep '
+		>=dev-python/setuptools-77[${PYTHON_USEDEP}]
+		test? (
+			>=dev-python/freezegun-1.5.0[${PYTHON_USEDEP}]
+			dev-python/pytest-trio[${PYTHON_USEDEP}]
+			dev-python/requests-mock[${PYTHON_USEDEP}]
+		)
+	')
+"
+
+EPYTEST_PLUGINS=( pytest-trio freezegun requests-mock )
+
+distutils_enable_tests pytest
diff --git a/net-misc/streamlink/streamlink-9999.ebuild b/net-misc/streamlink/streamlink-9999.ebuild
index 0ec06c1db5bc5..59480ebaac817 100644
--- a/net-misc/streamlink/streamlink-9999.ebuild
+++ b/net-misc/streamlink/streamlink-9999.ebuild
@@ -7,7 +7,7 @@ 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_{11..14} )
+PYTHON_COMPAT=( python3_{12..15} )
 PYTHON_REQ_USE='xml(+),threads(+)'
 inherit distutils-r1