diff --git a/app-shells/powerline/Manifest b/app-shells/powerline/Manifest
index 9a7609785670b..0987e129805b5 100644
--- a/app-shells/powerline/Manifest
+++ b/app-shells/powerline/Manifest
@@ -1 +1,2 @@
+DIST powerline-2.8.4.tar.gz 369057 BLAKE2B 1e43bd30e5efef99c0658fd4388fef198db1fd637c3fe368c4f64dcc477b81ea4c38a90c7dad99762050400a79d169de7966f64e00349e787d92fe50de2d9613 SHA512 758356725b24545adc2680871eaf79147ea6c79746bcbd6eaba731b2e86542275854ba6de970e47a2938fbe29dbd933f5208d8bb6b1586ee1f383249a963f7c8
 DIST powerline-status-2.7.tar.gz 233726 BLAKE2B fc7b7d6aa5d8e050af07aeee0aa0b7f6f01b7483ea910b87a7027cd55f726d42e41a008feb07429b21ebbd890b12eb56581b8e47fc30a58de6b902bf14d999cb SHA512 053ab74d250b7d835a5f8ec9cb7da4e890f0f50d31be9bab4b393a85e087a6fc010e58d6b3fa530cf39c10671345d032ca1fa9c0f7887a89fea8a4e69b7f1517
diff --git a/app-shells/powerline/powerline-2.8.4.ebuild b/app-shells/powerline/powerline-2.8.4.ebuild
new file mode 100644
index 0000000000000..0d967459eb7a4
--- /dev/null
+++ b/app-shells/powerline/powerline-2.8.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..13} )
+PYPI_NO_NORMALIZE=1
+PYPI_PN="powerline-status"
+DISTUTILS_USE_PEP517=setuptools
+# tests restricted due to https://github.com/powerline/powerline/issues/2128
+RESTRICT="test"
+inherit distutils-r1
+
+DESCRIPTION="The ultimate statusline/prompt utility"
+HOMEPAGE="https://github.com/powerline/powerline"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/powerline/powerline"
+	EGIT_BRANCH="develop"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
diff --git a/app-shells/powerline/powerline-9999.ebuild b/app-shells/powerline/powerline-9999.ebuild
index 25428eb6c66a9..0d967459eb7a4 100644
--- a/app-shells/powerline/powerline-9999.ebuild
+++ b/app-shells/powerline/powerline-9999.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{9..13} )
 PYPI_NO_NORMALIZE=1
 PYPI_PN="powerline-status"
 DISTUTILS_USE_PEP517=setuptools
+# tests restricted due to https://github.com/powerline/powerline/issues/2128
+RESTRICT="test"
 inherit distutils-r1
 
 DESCRIPTION="The ultimate statusline/prompt utility"
@@ -16,7 +18,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/powerline/powerline"
 	EGIT_BRANCH="develop"
 else
-	inherit pypi
+	SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 fi