10 files changed, 11 insertions, 644 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index f6f4b88ba7c2..645052d2b93d 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index f85e2cf4b508..9a798b4daae6 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -25,5 +25,5 @@ EBUILD grpc-1.60.0.ebuild 2927 BLAKE2B 80ae3abc33b3d734d65e6691ac3cc21ed608fabc1
 EBUILD grpc-1.62.1.ebuild 6435 BLAKE2B a88a4f4c63a00114a1376dc895f2ba92e79eb8d0d914658513db3ffdf6e1cd7a78029d95458c77b6a855f66834c5777c4398ada623d65f718722e124ab4d960d SHA512 5e90f37e970c1c3cbb2d1bea2c8df5cf0cf627b48dbbcc89781b251bb8663a62b7e1af858fb754366bc21dc65ef32b11ff203e164b975d60eaa8c8df1c131ced
 EBUILD grpc-1.65.1.ebuild 9894 BLAKE2B 6628cc580ff6b6f34aeba3f28167469f64043cf8e68355592f4a042474becba0bbab1867a92610d9e2004687f9c29ac2edf2d514e14235570a0d05304ab35910 SHA512 b8f7b527eb7af4471885dc773ca6eea992502c63b314da7c63ea9994a48a9b12fb79469d96e92314d1b01e2c3f64bfe53d27bfefc9a6e61c7a949457079da0a7
 EBUILD grpc-1.66.0.ebuild 9856 BLAKE2B 00bae299ddbd55f6e412774beaedd53fd1f049cc39f8f10ed7a9b4cad8c8dc57e33bfa54211e1a5837b03f93cba8c7558feb71ed4eb3a0bd8770eac84d4552a1 SHA512 584ef61c36f624157ae40736f02e22035cb983742c937757a25c447907881295aa7ec10b8bc197bb2776150f0e3a34f659c70dea840a8d8aab581ac4119f7c0d
-EBUILD grpc-1.71.0.ebuild 8899 BLAKE2B f8f1ff185587934b7f2f0747282bea1f943ef7b5f26e8d3d56418f3301525787b97704b68f7ff07686d4c8001b3fb1be70875ed7160974e83da290da8624a5f6 SHA512 7d2da00b590920fccd4051c0b6f59d91676e0de02335d078ea5efb59cc8fbf34a5fcb95b915a4860be242efbeff68d5031dff61286846bd5cec920e3d31ab045
+EBUILD grpc-1.71.0.ebuild 8898 BLAKE2B 52caf33473c9f4019b190543b24455f28a6548f12ed8b4b7a351ff75af0224fc495b916446777fe383b7ca0241fa468ac7c17506827aa013e91791905eccc41e SHA512 04d3ad76452e0b7aa6d0edede525ee3189fd7906178d1fc8d5f7eeeff46649ed606ebf508405416a41efc55d68a712b7171b8ea7a588df1583835b5974d51933
 MISC metadata.xml 452 BLAKE2B 03fbf9312276176e8a4b61851a2b19a2e3b9bd07e64dd0ed8962c9f5bc11182c8ab125dcb8b1fdfbc09c5a5346ec5a23de9b4eb925b423a1db93117ff973a273 SHA512 0285f13b57c1f06a3c561d04ee876d3f161c39e5115858b83858973cb1e233a60b01289fd312c0034b3ec270b6cc42b6a5a97e64f45144b63c9d45b0dee55bb1
diff --git a/net-libs/grpc/grpc-1.71.0.ebuild b/net-libs/grpc/grpc-1.71.0.ebuild
index 7a8547ed98ce..e4da1b2fdf31 100644
--- a/net-libs/grpc/grpc-1.71.0.ebuild
+++ b/net-libs/grpc/grpc-1.71.0.ebuild
@@ -35,7 +35,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 LICENSE="Apache-2.0"
 # format is 0/${CORE_SOVERSION//./}.${CPP_SOVERSION//./} , check top level CMakeLists.txt
 SLOT="0/46.$(ver_rs 1-2 '' "$(ver_cut 1-2)")"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
 IUSE="doc examples test systemd"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index 012632c53f03..d5e0af0eecf0 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -4,15 +4,9 @@ AUX frm_xfrd.initd 899 BLAKE2B bdfc83f7bbad7e0d7aea91720798c10367c7ac27851414b99
 AUX xrootd-5.4.3-python_tests_py3.patch 4491 BLAKE2B 61e3eb0e10de6e746b1447c7a1df8d6345c9533e6285e21263f5e65f8d7c4a6e7d50eef56be48fb9ac88c4efaee488e6f90fe046cbd9b24ace322a8781a5ea5a SHA512 6b854907e1fa45b44492c5224eb977ac7b4682ad1a74319efdf3a9907b252a2bdfd9510fa942f253319b80fa25947b05e3ab2f92b23d7fc1be0282c248741c9d
 AUX xrootd.confd 651 BLAKE2B a35bf51b82334757dbd27bd48923e59f955361ab009c4b92eef83050d5d4e23904abc2b0b9577f8a5888c875c34bf736cf4072b6684a91ca6ad8cd90fe9a2ba9 SHA512 60ab5b6d77cf79437960044bf201127c8adf5134e7f61a18dcccd2e474a4e41eda971e3ada71dea987716080fb308af98a5237bab2a0b82f50f932ff59e3fdea
 AUX xrootd.initd 858 BLAKE2B 306970196c9f69db3f94c095c8518b837f5f4723a1cbae273273821e4d77d30a7fe65ac4fccbb640ad5e0b6f879e549dbbc4e799f87b5b5c813d66f2d270af2b SHA512 dcdb75341d904c9850c2bf97393ccbb68ad37b095e0a20ca4dab27b10dd7525874c8ad6e07e5b9c1f3c3566391a50c06dee70622d865fa51a7e73aa4096da955
-DIST xrootd-5.6.7.tar.gz 6698751 BLAKE2B cb702a450b81665b53cf15d5c8df239826148c3cd746db7778b48ae01244257ce4877402c3e07ef6aa5228f9ae97f1b39210ed46ea2c802c35b7c4d8ad6a7fcf SHA512 e7ec8b6eae684f27b5044890c45492f7d9b2b8812a9131ff45db63984869aa62cd85836d71b4100e89a6bb98ee3864062940d4dec0fdb340472df126d6de4d41
-DIST xrootd-5.6.9.tar.gz 6701277 BLAKE2B 0086455f251879acf2d635ed0ae533dfa2c3e006798df27111d35599f1833ce1342c9eec1f540f3a165376c91233181420635bae5e1cb4d552681d8cfe36d902 SHA512 9ba15524451ebe7ee12d689f9c56d85508996285d01885236d396b7742ff6cc03036a6b4bd1424b0e1553cbf382c0954c10cec76fa1a99a7dfff330686bad0cd
-DIST xrootd-5.7.2.tar.gz 6826940 BLAKE2B 4f2c6cc945c0c7706671a9bcfc9f2ffa5d28d82bdbbc4a865f9e57d3f7afa28b2fe7db74222587eb93c1028aa6644aa14d58acd9989384299d0f0a7a11d51b19 SHA512 a117b2e239695ac243ada3e1a0339d20057645b9e22753c32d44f3949e9ca0eab262397a8264e11293676e512b5cda921392f6ae52b935f93c60ea7247ac4f02
-DIST xrootd-5.7.3.tar.gz 6833395 BLAKE2B 88a30ee71cefc9b18a3d5ebb9268510a36024440cee97fff226a1873b335a191ca26e0c159ab92c150fa82d4609cf50f6bb82e142cf993750a1eaaf316cd6afb SHA512 3e9eb692d1836d5bebd64742fd145b5ffcd1e096f4bf007694dc1a1131118cb752316e291e626743c80af6a576791aa6cca31bd482a47c8774c4a01b2e599f4e
 DIST xrootd-5.8.0.tar.gz 6885133 BLAKE2B 866b5aa8a7bf76c95e46d74bfbbaacf6e8371f48da81cc4d9d9e0bf45b73831fb2e91c09b72b245bb6ee04650e7fdf6348c14517ae2feb5beedcc2ef9e12af37 SHA512 235fccda0495970c6fb142a6baf368d3784a9a9fa1100a7750e4af00fc3b2340e563048d66bb92d80a70a1b9948f58cc81077e00e91fde27d2abd01d19c69d90
-EBUILD xrootd-5.6.7.ebuild 4778 BLAKE2B bd32a51bfa26e3568ed49ecb1bff7ff8e4067aecb34025e17cd7cb71ec3e59a8474cebc837874873c584c474b422428929aaecb26c7f32359d23cbbaad7a3ef8 SHA512 ee2fb883150a7aca6315b3832512960d6bc72e3b007ab5a7896cfe29527f219c18bda66b215f8da4885015bd66259a813c92ddcd4b53fa007da37875788f0ee9
-EBUILD xrootd-5.6.9.ebuild 4780 BLAKE2B e7020a1334c0e4a97bf26c638da7b00473b80f61951b2717c889c69aa4ebb3ede92a8587255955d058abbbfa4d55da62cd1019989d459002db2a02d29af8514e SHA512 93a2c806fbfb1d3a0b73ec5b770c7130a7617a47a3d1f24530f593df60e2a1f0a71fc54b7d4d81bb67abf67387c10711270f468848208b5faf31be29e0c1c684
-EBUILD xrootd-5.7.2.ebuild 5007 BLAKE2B 6509c61420d7eb6f7df1c1c2a82b67f75e8fce29a74d600a1e13d4489439b0f740836a123aa66a1b78fb2dc08c7654f0a0fd8a52abc67531d65d4318053e6e8a SHA512 f95580be9c839e63ac3ec06fed5d26863a7a567d3c957e3369d7f0d3bfc3e3c3c981f5b3833289c310457770b177b2a79aa0afad98d82ab95ad57f7538ee1727
-EBUILD xrootd-5.7.3.ebuild 5310 BLAKE2B d971804d73a94938118da931f62cbe8a4776c77725bbd26fd7427e8710060164caa10348352733a5a9085699325ddf13e0ffc450d5c59acf7dd645028beea194 SHA512 9c73220ef02b5f145eb428af132e4b131af5195cc735ee474abba0d9fc1356604ab76467f02ac9b08714b1326ab6bd1d5bfc71ceb3ca2d36b1ba1a9f9f3af574
-EBUILD xrootd-5.8.0.ebuild 5285 BLAKE2B cfe849bc1280237b3acce50b086e0442a1f9ca152a3d4066091f89d1ee665e67865a575f0873839f2b260641b87184d0a96190e7d88ad85dd795d412d5824afa SHA512 85f6eff66e956f557be5ac5b94fe4f1a9773a1c855b838a91abe22a8a5168719459bffbb844d2bf2eb3ec7a6b308545f46bcb30b5210f35832bc65298748a7ab
-EBUILD xrootd-9999.ebuild 5310 BLAKE2B d971804d73a94938118da931f62cbe8a4776c77725bbd26fd7427e8710060164caa10348352733a5a9085699325ddf13e0ffc450d5c59acf7dd645028beea194 SHA512 9c73220ef02b5f145eb428af132e4b131af5195cc735ee474abba0d9fc1356604ab76467f02ac9b08714b1326ab6bd1d5bfc71ceb3ca2d36b1ba1a9f9f3af574
+DIST xrootd-5.8.1.tar.gz 6891041 BLAKE2B e97c57eea8425e49800b71722908c8883b3d560013233880a422eb714584055f088fb5e16e994af827e3a3a64cf8baec83fd562064515b0d4e0cecf5a86a472d SHA512 08f05dc381b22d55a49f89ab2b4bdea99631836df719fb7087a4a06ba37e34c81caa37c6b5c7b919253b13200cf8f416b4946dea4ed4488a682883c528052be3
+EBUILD xrootd-5.8.0.ebuild 5283 BLAKE2B c86fd70692d4845ffc28cda31dada99dc82fdec05228c590537ffaf3fa3766cb0801ddd5701062c5b34f9692b04421f3ad76979e0c5cd788566a01d9faaa4159 SHA512 6fef5a6f431fd99139f8235544f2bd202e957a102c55709623caf91398bd2b86784e87116b490a63166228147d8f0547def95df313753ada5c0c95c60a6e3b10
+EBUILD xrootd-5.8.1.ebuild 5235 BLAKE2B b458b1801dd3abbc3c6efd0064246e53c76b2df70c5d89c045c03dcde5e7b01412b79331da834e0adc538c8ff902a6d1ca5eb2a61ed9686fb83c0573f867fed0 SHA512 837623760ac9482747c09a4aed990f2919cb05475045fe58a9cec7180bee90c1eedcb90b15b0eefa241147640e3a20db84a13e244dabc2359f2f5f27f53561d7
+EBUILD xrootd-9999.ebuild 5235 BLAKE2B b458b1801dd3abbc3c6efd0064246e53c76b2df70c5d89c045c03dcde5e7b01412b79331da834e0adc538c8ff902a6d1ca5eb2a61ed9686fb83c0573f867fed0 SHA512 837623760ac9482747c09a4aed990f2919cb05475045fe58a9cec7180bee90c1eedcb90b15b0eefa241147640e3a20db84a13e244dabc2359f2f5f27f53561d7
 MISC metadata.xml 1517 BLAKE2B a41f7e485316d636e61611a248b720da1d7d4a66a7faf731d96a299c6dd2c53f20b3ac077c6fbea209b6ff862067d1e32f68a121f9e9edcfe2afdbb30320c733 SHA512 07eb7d082a7a0fd97898a89fa130433ba507d70921de1b700904707bebea566efaefbf2044db2a97a0f931dccc3486a049cdfbf4118ea488de6991918c422b1b
diff --git a/net-libs/xrootd/xrootd-5.6.7.ebuild b/net-libs/xrootd/xrootd-5.6.7.ebuild
deleted file mode 100644
index 811ec1eac3de..000000000000
--- a/net-libs/xrootd/xrootd-5.6.7.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..12} )
-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/"
-SRC_URI="https://xrootd.slac.stanford.edu/download/v${PV}/${P}.tar.gz"
-LICENSE="LGPL-3+"
-
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="ceph examples fuse http kerberos +libxml2 macaroons python readline scitokens +server systemd test xrdec"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	http? ( kerberos )
-	macaroons? ( server http )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	scitokens? ( server )
-	test? ( 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
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.4.3-python_tests_py3.patch
-)
-
-# xrootd plugins are not intended to be linked with,
-# they are to be loaded at runtime by xrootd,
-# see https://github.com/xrootd/xrootd/issues/447
-QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1)\.so
-	/usr/lib.*/libXrd.*Tests\.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=(
-		-DUSE_SYSTEM_ISAL=TRUE
-		$(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_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() {
-	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 test; then
-		for f in test-runner xrdshmap; do
-			rm "${ED}"/usr/bin/${f} || die "Failed to remove test helper ${f} from installed tree"
-		done
-		rm "${ED}"/usr/$(get_libdir)/libXrd*Test*.so || die "Failed to remove test libraries from installed tree"
-	fi
-}
diff --git a/net-libs/xrootd/xrootd-5.6.9.ebuild b/net-libs/xrootd/xrootd-5.6.9.ebuild
deleted file mode 100644
index e8e1fcff1f3d..000000000000
--- a/net-libs/xrootd/xrootd-5.6.9.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..12} )
-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/"
-SRC_URI="https://xrootd.slac.stanford.edu/download/v${PV}/${P}.tar.gz"
-LICENSE="LGPL-3+"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="ceph examples fuse http kerberos +libxml2 macaroons python readline scitokens +server systemd test xrdec"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	http? ( kerberos )
-	macaroons? ( server http )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	scitokens? ( server )
-	test? ( 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
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.4.3-python_tests_py3.patch
-)
-
-# xrootd plugins are not intended to be linked with,
-# they are to be loaded at runtime by xrootd,
-# see https://github.com/xrootd/xrootd/issues/447
-QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1)\.so
-	/usr/lib.*/libXrd.*Tests\.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=(
-		-DUSE_SYSTEM_ISAL=TRUE
-		$(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_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() {
-	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 test; then
-		for f in test-runner xrdshmap; do
-			rm "${ED}"/usr/bin/${f} || die "Failed to remove test helper ${f} from installed tree"
-		done
-		rm "${ED}"/usr/$(get_libdir)/libXrd*Test*.so || die "Failed to remove test libraries from installed tree"
-	fi
-}
diff --git a/net-libs/xrootd/xrootd-5.7.2.ebuild b/net-libs/xrootd/xrootd-5.7.2.ebuild
deleted file mode 100644
index 43dd5bf18fcd..000000000000
--- a/net-libs/xrootd/xrootd-5.7.2.ebuild
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..13} )
-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/"
-SRC_URI="https://xrootd.web.cern.ch/download/v${PV}/${P}.tar.gz"
-LICENSE="LGPL-3+"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="ceph examples fuse http kerberos +libxml2 macaroons python readline scitokens +server systemd test xrdec"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	http? ( kerberos )
-	macaroons? ( server http )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	scitokens? ( server )
-	test? ( 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 to be loaded at runtime by xrootd,
-# see https://github.com/xrootd/xrootd/issues/447
-QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1)\.so
-	/usr/lib.*/libXrd.*Tests\.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=(
-		-DUSE_SYSTEM_ISAL=TRUE
-		$(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_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
-		XrdCl::LocalFileHandlerTest.XAttrTest
-		XrdCl::FileTest.XAttrTest
-		XrdCl::FileCopyTest.ThirdPartyCopyTest
-		XrdCl::FileCopyTest.NormalCopyTest
-		XrdCl::FileSystemTest.XAttrTest
-		XrdCl::WorkflowTest.XAttrWorkflowTest
-		XrdCl::WorkflowTest.CheckpointTest
-	)
-	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 test; then
-		for f in xrdshmap; do
-			rm "${ED}"/usr/bin/${f} || die "Failed to remove test helper ${f} from installed tree"
-		done
-	fi
-}
diff --git a/net-libs/xrootd/xrootd-5.8.0.ebuild b/net-libs/xrootd/xrootd-5.8.0.ebuild
index a42a72f7bf4f..2e5b589591e8 100644
--- a/net-libs/xrootd/xrootd-5.8.0.ebuild
+++ b/net-libs/xrootd/xrootd-5.8.0.ebuild
@@ -27,7 +27,7 @@ if [[ ${PV} =~ "9999" ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/xrootd/xrootd.git"
 else
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 	SRC_URI="https://xrootd.web.cern.ch/download/v${PV}/${P}.tar.gz"
 fi
 
diff --git a/net-libs/xrootd/xrootd-5.7.3.ebuild b/net-libs/xrootd/xrootd-5.8.1.ebuild
index 3c19284b1087..c6efb6c0f866 100644
--- a/net-libs/xrootd/xrootd-5.7.3.ebuild
+++ b/net-libs/xrootd/xrootd-5.8.1.ebuild
@@ -97,7 +97,6 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DUSE_SYSTEM_ISAL=TRUE
 		$(usex python "-DINSTALL_PYTHON_BINDINGS=FALSE" "")
 		-DXRDCEPH_SUBMODULE=$(usex ceph)
 		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex libxml2 "no" "yes")
@@ -163,9 +162,8 @@ src_test() {
 		')
 		# server fails to start due to long path to unix domain socket
 		$(usev scitokens '
-			XRootD::scitokens::setup
-			XRootD::scitokens::test
-			XRootD::scitokens::teardown
+			XRootD::scitokens
+			XRootD::tpc
 		')
 	)
 	cmake_src_test
diff --git a/net-libs/xrootd/xrootd-9999.ebuild b/net-libs/xrootd/xrootd-9999.ebuild
index 3c19284b1087..c6efb6c0f866 100644
--- a/net-libs/xrootd/xrootd-9999.ebuild
+++ b/net-libs/xrootd/xrootd-9999.ebuild
@@ -97,7 +97,6 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DUSE_SYSTEM_ISAL=TRUE
 		$(usex python "-DINSTALL_PYTHON_BINDINGS=FALSE" "")
 		-DXRDCEPH_SUBMODULE=$(usex ceph)
 		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex libxml2 "no" "yes")
@@ -163,9 +162,8 @@ src_test() {
 		')
 		# server fails to start due to long path to unix domain socket
 		$(usev scitokens '
-			XRootD::scitokens::setup
-			XRootD::scitokens::test
-			XRootD::scitokens::teardown
+			XRootD::scitokens
+			XRootD::tpc
 		')
 	)
 	cmake_src_test