diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index 9912caf25db95..18518db948939 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -1,2 +1,3 @@
 DIST xrootd-5.8.0.tar.gz 6885133 BLAKE2B 866b5aa8a7bf76c95e46d74bfbbaacf6e8371f48da81cc4d9d9e0bf45b73831fb2e91c09b72b245bb6ee04650e7fdf6348c14517ae2feb5beedcc2ef9e12af37 SHA512 235fccda0495970c6fb142a6baf368d3784a9a9fa1100a7750e4af00fc3b2340e563048d66bb92d80a70a1b9948f58cc81077e00e91fde27d2abd01d19c69d90
 DIST xrootd-5.8.1.tar.gz 6891041 BLAKE2B e97c57eea8425e49800b71722908c8883b3d560013233880a422eb714584055f088fb5e16e994af827e3a3a64cf8baec83fd562064515b0d4e0cecf5a86a472d SHA512 08f05dc381b22d55a49f89ab2b4bdea99631836df719fb7087a4a06ba37e34c81caa37c6b5c7b919253b13200cf8f416b4946dea4ed4488a682883c528052be3
+DIST xrootd-5.8.2.tar.gz 6892307 BLAKE2B a21fb62593131b2d76c94e8c85c7338e1c7dfc79a6a0e0fac8bbe0637e1a882c6607c0f8bb877d3043595a40615241fe05b3d6361d569ac73ce0e0dfcdfb42bd SHA512 f6396e3c5353ceb3eed2a05b13832cd2650a57847a276e6f0ecbefce512c2bccb49268d28ac14e1b142581a8dcfa3ad4d26f49f0ec06d25e1fa180ad6a545c61
diff --git a/net-libs/xrootd/xrootd-5.8.2.ebuild b/net-libs/xrootd/xrootd-5.8.2.ebuild
new file mode 100644
index 0000000000000..c6efb6c0f866a
--- /dev/null
+++ b/net-libs/xrootd/xrootd-5.8.2.ebuild
@@ -0,0 +1,222 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..13} python3_13t )
+DISTUTILS_EXT=1
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517="setuptools"
+DOCS_BUILDER="doxygen"
+DOCS_DEPEND="
+	media-gfx/graphviz
+	virtual/latex-base
+	python? ( dev-python/sphinx )
+"
+
+inherit cmake docs distutils-r1 systemd
+
+DESCRIPTION="Extended ROOT remote file server"
+HOMEPAGE="https://xrootd.slac.stanford.edu/"
+LICENSE="LGPL-3+"
+
+SLOT="0"
+IUSE="ceph examples fuse http kerberos +libxml2 macaroons python readline scitokens +server systemd test xrdec"
+
+if [[ ${PV} =~ "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/xrootd/xrootd.git"
+else
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	SRC_URI="https://xrootd.web.cern.ch/download/v${PV}/${P}.tar.gz"
+fi
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	http? ( kerberos )
+	macaroons? ( server http )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	scitokens? ( server )
+"
+
+CDEPEND="acct-group/xrootd
+	acct-user/xrootd
+	dev-libs/openssl:0=
+	sys-libs/zlib
+	virtual/libcrypt:=
+	ceph? ( sys-cluster/ceph )
+	fuse? ( sys-fs/fuse:0= )
+	http? (
+		net-misc/curl:=
+		net-libs/davix
+	)
+	kerberos? ( virtual/krb5 )
+	libxml2? ( dev-libs/libxml2:2= )
+	macaroons? ( dev-libs/libmacaroons )
+	python? ( ${PYTHON_DEPS} )
+	readline? ( sys-libs/readline:0= )
+	scitokens? ( dev-cpp/scitokens-cpp )
+	systemd? ( sys-apps/systemd:= )
+	xrdec? ( dev-libs/isa-l )
+"
+DEPEND="${CDEPEND}"
+BDEPEND="
+	python? (
+		${PYTHON_DEPS}
+		${DISTUTILS_DEPS}
+		test? ( >=dev-python/pytest-7.1.2[${PYTHON_USEDEP}] )
+	)
+	test? (
+		dev-cpp/gtest
+		dev-util/cppunit
+	)
+"
+RDEPEND="${CDEPEND}
+	dev-lang/perl
+"
+
+# XRootD plugins are not intended to be linked with,
+# they are loaded at runtime by the XRootD server.
+# See https://github.com/xrootd/xrootd/issues/447
+QA_SONAME="/usr/lib.*/libXrd.*-5\.so"
+
+pkg_setup() {
+	use python && python_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	if use python; then
+		pushd "${S}"/bindings/python > /dev/null || die
+		distutils-r1_src_prepare
+		popd > /dev/null || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(usex python "-DINSTALL_PYTHON_BINDINGS=FALSE" "")
+		-DXRDCEPH_SUBMODULE=$(usex ceph)
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex libxml2 "no" "yes")
+		-DCMAKE_DISABLE_FIND_PACKAGE_systemd=$(usex systemd "no" "yes")
+		-DENABLE_FUSE=$(usex fuse)
+		-DENABLE_HTTP=$(usex http)
+		-DENABLE_KRB5=$(usex kerberos)
+		-DENABLE_MACAROONS=$(usex macaroons)
+		-DENABLE_PYTHON=$(usex python)
+		-DENABLE_READLINE=$(usex readline)
+		-DENABLE_SCITOKENS=$(usex scitokens)
+		-DENABLE_SERVER_TESTS=$(usex server)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_VOMS=no
+		-DENABLE_XRDCL=yes
+		-DENABLE_XRDCLHTTP=$(usex http)
+		-DENABLE_XRDEC=$(usex xrdec)
+		-DFORCE_ENABLED=yes
+		-DXRDCL_ONLY=$(usex server "no" "yes")
+	)
+	cmake_src_configure
+
+	if use python; then
+		pushd "${BUILD_DIR}"/bindings/python > /dev/null || die
+		distutils-r1_src_configure
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+	if use python; then
+		pushd "${BUILD_DIR}"/bindings/python > /dev/null || die
+		distutils-r1_src_compile
+		popd > /dev/null || die
+	fi
+
+	docs_compile
+	# secondary documentation for python bindings
+	if use python && use doc; then
+		emake -C bindings/python/docs html
+	fi
+}
+
+python_test() {
+	epytest
+}
+
+src_test() {
+	export CTEST_OUTPUT_ON_FAILURE=1
+
+	local CMAKE_SKIP_TESTS=(
+		# bug 937090, these fail on tmpfs, as they require
+		# a filesystem with extended attributes
+		$(usev server '
+			XrdCl::LocalFileHandlerTest.XAttrTest
+			XrdCl::FileTest.XAttrTest
+			XrdCl::FileCopyTest.ThirdPartyCopyTest
+			XrdCl::FileCopyTest.NormalCopyTest
+			XrdCl::FileSystemTest.XAttrTest
+			XrdCl::WorkflowTest.XAttrWorkflowTest
+			XrdCl::WorkflowTest.CheckpointTest
+		')
+		# server fails to start due to long path to unix domain socket
+		$(usev scitokens '
+			XRootD::scitokens
+			XRootD::tpc
+		')
+	)
+	cmake_src_test
+	# Python tests currently require manual configuration and start-up of an xrootd server.
+	# TODO: get this to run properly.
+	#use python && distutils-r1_src_test
+}
+
+src_install() {
+	dodoc docs/ReleaseNotes.txt
+	cmake_src_install
+	find "${ED}" \( -iname '*.md5' -o -iname '*.map' \) -delete || die
+
+	if use server; then
+		local i
+		for i in cmsd frm_purged frm_xfrd xrootd; do
+			newinitd "${FILESDIR}"/${i}.initd ${i}
+		done
+		# all daemons MUST use single master config file
+		newconfd "${FILESDIR}"/xrootd.confd xrootd
+
+		if use systemd; then
+			systemd_dounit packaging/common/*.{service,socket}
+		fi
+	fi
+
+	# base configs
+	insinto /etc/xrootd
+	doins packaging/common/*.cfg
+
+	keepdir /etc/xrootd/config.d
+	keepdir /var/log/xrootd
+
+	fowners -R xrootd:xrootd /etc/xrootd
+	fowners -R xrootd:xrootd /var/log/xrootd
+
+	if use python; then
+		pushd "${BUILD_DIR}"/bindings/python > /dev/null || die
+		distutils-r1_src_install
+		popd > /dev/null || die
+
+		if use doc; then
+			docinto python
+			docompress -x "/usr/share/doc/${PF}/python/html"
+			dodoc -r bindings/python/docs/build/html
+		fi
+		if use examples; then
+			docinto python
+			dodoc -r bindings/python/examples
+		fi
+	fi
+
+	if use server && use test; then
+		rm "${ED}"/usr/bin/xrdshmap || die "Failed to remove test binary ${f} from installed tree"
+	fi
+}