gentoo auto-resync : 08:04:2023 - 23:33:13

7 files changed, 67 insertions, 422 deletions

diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index 9943d98c23d8..05a5bf38f208 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -8,13 +8,8 @@ AUX xrootd-5.4.3-python_tests_py3.patch 4491 BLAKE2B 61e3eb0e10de6e746b1447c7a1d
 AUX xrootd.confd 651 BLAKE2B a35bf51b82334757dbd27bd48923e59f955361ab009c4b92eef83050d5d4e23904abc2b0b9577f8a5888c875c34bf736cf4072b6684a91ca6ad8cd90fe9a2ba9 SHA512 60ab5b6d77cf79437960044bf201127c8adf5134e7f61a18dcccd2e474a4e41eda971e3ada71dea987716080fb308af98a5237bab2a0b82f50f932ff59e3fdea
 AUX xrootd.initd 858 BLAKE2B 306970196c9f69db3f94c095c8518b837f5f4723a1cbae273273821e4d77d30a7fe65ac4fccbb640ad5e0b6f879e549dbbc4e799f87b5b5c813d66f2d270af2b SHA512 dcdb75341d904c9850c2bf97393ccbb68ad37b095e0a20ca4dab27b10dd7525874c8ad6e07e5b9c1f3c3566391a50c06dee70622d865fa51a7e73aa4096da955
 DIST xrootd-5.4.3.tar.gz 3182127 BLAKE2B ed3f6a943167eafb5f6d7f78ca34f44c9a18b5ed672a4e622acb1e6e6997bd21756a30bf24f0b799ab4f16e7e1fb3f61a042f4e5e00f965b898fc5a287bf995a SHA512 189ec8e20901fd07093494187502e031a60d4ade22af33067313fad7a1bf6a6feb5c5d9d59d3a86d13a6a767e5a93cf4836da02e9cae11c81ccac07199898d72
-DIST xrootd-5.5.0.tar.gz 3227490 BLAKE2B 3d9c0ab859f95d6e651ae98dc132ade389f9981a20c738798bc2079a5470d766cd882df326359ccd4777389e15bf064537e6d4f7f653fbb5fe251b019b4ca5fd SHA512 d13d76be54eacc097363cd1c06448f87bffdd32c81eaad12b4c3321be31c7b221ef34b1bf5da50ee5128d9682e13dc670554317c29c13607c246c781a1fefffe
-DIST xrootd-5.5.2.tar.gz 3236018 BLAKE2B 033a9698b60d839fb683aab22172d3cbd6e0d8041b64270a8c3045f0504d3ef7941ad439dcaf85fa16303cb1e2dfcecbbf7d2de1145ef3f1ae96c5099b08fe2b SHA512 7e8691d8df5dd0047702d9a4785b1fc3c5487210044de7f448e555cf89d170feee16899419fbc45d09d95751129b04c262600ab81f33703f5a28bef789071f3d
 DIST xrootd-5.5.4.tar.gz 3241021 BLAKE2B 505890ab7dbd0530d3c42390c9a6858cf0c8b53d42631b3bed615cb9b7c4d738bb791d26e625b010fef79f57291eb8bcd653ec629d240df92d37c12c973210f8 SHA512 1bf8fec3e20950e1dfbb5a7914c2f2b1d7d1fc1ce6b419dda129bb6cfb083ae674a14732b7b7330dee2287635749d91f8ee7e16badd71c723d189a1a44c309dd
-EBUILD xrootd-5.4.3-r1.ebuild 3236 BLAKE2B 9dc93e947832d1126f1690bab7630778fb37d737d188d204b44596da97b5a7b1baf4a8bbe16b6ffbdcda3d54cd37c60f8712de2a63416a1a8fadc4e9a581e370 SHA512 5d672ed76e470c57e16f09f475a9b6b675ccf8f2ca6b6659ac5bea6ba98553c72fc04b27e1c8539915a567e9fbc62a2a4b0602c64d7e23cd84235007b213e3df
-EBUILD xrootd-5.4.3-r2.ebuild 4627 BLAKE2B b91619cb8bd8d0b7e4f6a23f918df462b04a93182bd42ddca33ca312e2f2ff50f2976d9f3d2da95162c7430436653754a112c545df6e640632fa8625ba2ecb58 SHA512 056567b9a7d14374721ce563bc1221f65eb8eaf199dcc5fdda6c07f93f6680ff39b116b6753d3c2a4c8112c0e90992eec86e6699190bea8ff854a2dd5b11f78f
+EBUILD xrootd-5.4.3-r2.ebuild 4627 BLAKE2B c3820362346a32f41c9a9afe447854211af4a2015e3e0950b98e18e6346ec9ec7528ae3ec7cef8be29dbaf069a9188dce4fad2a31023c87cb82cef709dc03c03 SHA512 705bd4e6189c67a0b7f31dc96241b086145268a13113826292ab6b00fdf739c497c67cb00033f5f42181f51dcc0476bf816fc5daf2dbace16d14c989fecd8589
 EBUILD xrootd-5.4.3.ebuild 3186 BLAKE2B 39211730f3cf2da1f616c3cb88e0fbe5449b534fdb9612c47f919537162fb1cb14e4a225feeeed6b51428ae51c7550d31a875b71a0c1b5b3ee3b12e2cd474f26 SHA512 3ab16277df556260c833c1a60cb47c964ffefa7cef623aba61038d73be6959f2dbae41f2ccef28e95274472d0995a840347128fb38d4e5d8f171af709d8267f2
-EBUILD xrootd-5.5.0.ebuild 3210 BLAKE2B 890177297f6618994a88de72f4c20678db458822e7ec596d1c07b2a263b6c58e3b6f5134a268e4fba2b07802a20e77ec772515379423bb4b5b85619be078ad6c SHA512 91c87c4304b2bc47f98f53d9483cd427d28667726ddf93f97a0955d0c88f152f19d911b440a69aa53b7eec2223cb387062db8411acad0760847c3f53e7ccf075
-EBUILD xrootd-5.5.2.ebuild 3243 BLAKE2B 6f7846e62497051dbe5ce3bde4f8cdaf2e8a3171ba572f6d9529eaa4e00c444d147456dd4954b9fdc4080f51dbbdc53d862b5c1d963bac07c525dfa984582915 SHA512 8b274457af21ab750e49256c9115c470c023a1486002e3e4ecaeb9a1a5713bac7d9fc8fca6283db0c0a60aca0e8ea300a4b47ad3401b57e1385b9d762190391a
-EBUILD xrootd-5.5.4.ebuild 3243 BLAKE2B 6f7846e62497051dbe5ce3bde4f8cdaf2e8a3171ba572f6d9529eaa4e00c444d147456dd4954b9fdc4080f51dbbdc53d862b5c1d963bac07c525dfa984582915 SHA512 8b274457af21ab750e49256c9115c470c023a1486002e3e4ecaeb9a1a5713bac7d9fc8fca6283db0c0a60aca0e8ea300a4b47ad3401b57e1385b9d762190391a
-MISC metadata.xml 1126 BLAKE2B 9bacae6f9c9e281863060fc5cad1f6e882c7c017bb35b5c87bdfeaa85b5aafcae6c5e9babc04f869be29a6e1d9707871118e8b922eb36ab3d5a67f8849fb9ce7 SHA512 c542a70cee2b7cd8b5ecaee7e25d6c1d37f24918daf039f0e9d4519d08719eb54103096d356d3fa8a7a6b4cefee86ad4ad1cfc4ab11c26d9df66de73170cf8bf
+EBUILD xrootd-5.5.4-r1.ebuild 4748 BLAKE2B 8f79e55faa53023dafe99665fde9df7c2001bc6802182dc7368ac21938c4324d75f916776c0ab74ba35ae917467159850ab22c47d316ec25c8f0de2e86fc8f9e SHA512 6201c640e26cd23d94388381ccb4b4d3a58d9265bbe999190c5a3dba7e0c9091260f792cabe78f2cbece1c8c28f308a9e45038a71afc1f879090167bab372e49
+MISC metadata.xml 1035 BLAKE2B c81c606529973beb7936c49a35eff0a91bde2c604b4d0cea3a91cdb7aff0aeeba15ae6e9c6913897272e6f76c811427b920514d73280b2c0f13e4d035f4c5b3c SHA512 df74f8ac010f34a63e16979a5c3a222119f9c9b201f0a83b8b8f20bf3b5d102ad1ccdedfdd557a599701fbe234c42b1bb5ec34384445f428a40716ba2c1a6ae2
diff --git a/net-libs/xrootd/metadata.xml b/net-libs/xrootd/metadata.xml
index 9305cd64fd69..dae43a78f13c 100644
--- a/net-libs/xrootd/metadata.xml
+++ b/net-libs/xrootd/metadata.xml
@@ -18,6 +18,5 @@
     <flag name="http">Enable http protocol support</flag>
     <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for XML parsing (preferred) instead of bundled tinyxml</flag>
     <flag name="server">Install xrootd server and related plug-ins</flag>
-    <flag name="test-suite">Install additional components useful for testing xrootd</flag>
   </use>
 </pkgmetadata>
diff --git a/net-libs/xrootd/xrootd-5.4.3-r1.ebuild b/net-libs/xrootd/xrootd-5.4.3-r1.ebuild
deleted file mode 100644
index 744c2fed9672..000000000000
--- a/net-libs/xrootd/xrootd-5.4.3-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Upstream does not support the building of Python bindings
-# via CMake for more than one implementation at a time.
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit cmake python-single-r1
-
-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="doc examples fuse http kerberos +libxml2 python readline +server systemd test-suite"
-
-# No actual build-time test suite
-RESTRICT="test"
-
-CDEPEND="acct-group/xrootd
-	acct-user/xrootd
-	dev-libs/openssl:0=
-	sys-libs/zlib
-	virtual/libcrypt:=
-	fuse? ( sys-fs/fuse:0= )
-	http? ( net-misc/curl:= )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( dev-libs/libxml2:2= )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	systemd? ( sys-apps/systemd:= )
-	test-suite? ( dev-util/cppunit )
-"
-DEPEND="${CDEPEND}"
-BDEPEND="
-	doc? (
-		app-doc/doxygen[dot]
-		virtual/latex-base
-		python? ( dev-python/sphinx )
-	)
-	python? ( $(python_gen_cond_dep 'dev-python/pip[${PYTHON_USEDEP}]') )
-"
-RDEPEND="${CDEPEND}
-	dev-lang/perl
-"
-REQUIRED_USE="
-	http? ( kerberos )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test-suite? ( server )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.8.3-crc32.patch
-	"${FILESDIR}"/${PN}-5.4.3-no_automagic.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.*/libXrdClTests\.so"
-
-pkg_setup() {
-	use python && python_setup
-}
-
-# FIXME: support xrdec - currently only builds against bundled isa-l
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_FUSE=$(usex fuse)
-		-DENABLE_HTTP=$(usex http)
-		-DENABLE_KRB5=$(usex kerberos)
-		-DENABLE_LIBXML2=$(usex libxml2)
-		-DENABLE_PYTHON=$(usex python)
-		-DENABLE_READLINE=$(usex readline)
-		-DENABLE_TESTS=$(usex test-suite)
-		-DENABLE_VOMS=no
-		-DFORCE_ENABLED=yes
-		-DPIP_OPTIONS="--ignore-installed" # bug 861452
-		-DXRDCL_ONLY=$(usex server "no" "yes")
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		doxygen Doxyfile || die
-		if use python; then
-			emake -C bindings/python/docs html
-		fi
-	fi
-}
-
-src_install() {
-	use doc && HTML_DOCS=( doxydoc/html/. )
-	dodoc docs/ReleaseNotes.txt
-	cmake_src_install
-	find "${D}" \( -iname '*.md5' -o -iname '*.map' \) -delete || die
-
-	# base configs
-	insinto /etc/xrootd
-	doins packaging/common/*.cfg
-
-	fowners root:xrootd /etc/xrootd
-	keepdir /var/log/xrootd
-	fowners xrootd:xrootd /var/log/xrootd
-
-	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
-	fi
-
-	if use python; then
-		python_optimize "${D}/$(python_get_sitedir)"
-
-		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
-}
diff --git a/net-libs/xrootd/xrootd-5.4.3-r2.ebuild b/net-libs/xrootd/xrootd-5.4.3-r2.ebuild
index 5b19756c4d84..fd1b2bdf0993 100644
--- a/net-libs/xrootd/xrootd-5.4.3-r2.ebuild
+++ b/net-libs/xrootd/xrootd-5.4.3-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_PEP571="setuptools"
+DISTUTILS_USE_PEP517="setuptools"
 
 inherit cmake distutils-r1
 
diff --git a/net-libs/xrootd/xrootd-5.5.0.ebuild b/net-libs/xrootd/xrootd-5.5.0.ebuild
deleted file mode 100644
index 8d3b8f9f1431..000000000000
--- a/net-libs/xrootd/xrootd-5.5.0.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Upstream does not support the building of Python bindings
-# via CMake for more than one implementation at a time.
-PYTHON_COMPAT=( python3_{9..11} )
-DOCS_BUILDER="doxygen"
-DOCS_DEPEND="
-	media-gfx/graphviz
-	virtual/latex-base
-	python? ( dev-python/sphinx )
-"
-
-inherit cmake docs python-single-r1
-
-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="examples fuse http kerberos +libxml2 python readline +server systemd test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="acct-group/xrootd
-	acct-user/xrootd
-	dev-libs/openssl:0=
-	net-libs/davix
-	sys-libs/zlib
-	virtual/libcrypt:=
-	fuse? ( sys-fs/fuse:0= )
-	http? ( net-misc/curl:= )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( dev-libs/libxml2:2= )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${CDEPEND}"
-BDEPEND="
-	python? ( $(python_gen_cond_dep 'dev-python/pip[${PYTHON_USEDEP}]') )
-	test? ( dev-util/cppunit )
-"
-RDEPEND="${CDEPEND}
-	dev-lang/perl
-"
-REQUIRED_USE="
-	http? ( kerberos )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( server )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.8.3-crc32.patch
-	"${FILESDIR}"/${PN}-5.4.3-no_automagic.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.*/libXrdClTests\.so"
-
-pkg_setup() {
-	use python && python_setup
-}
-
-# FIXME: support xrdec - currently only builds against bundled isa-l
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_FUSE=$(usex fuse)
-		-DENABLE_HTTP=$(usex http)
-		-DENABLE_KRB5=$(usex kerberos)
-		-DENABLE_LIBXML2=$(usex libxml2)
-		-DENABLE_PYTHON=$(usex python)
-		-DENABLE_READLINE=$(usex readline)
-		-DENABLE_TESTS=$(usex test)
-		-DENABLE_VOMS=no
-		-DFORCE_ENABLED=yes
-		-DPIP_OPTIONS="--ignore-installed" # bug 861452
-		-DXRDCL_ONLY=$(usex server "no" "yes")
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	docs_compile
-
-	# secondary documentation for python bindings
-	if use python && use doc; then
-		emake -C bindings/python/docs html
-	fi
-}
-
-src_install() {
-	dodoc docs/ReleaseNotes.txt
-	cmake_src_install
-	find "${ED}" \( -iname '*.md5' -o -iname '*.map' \) -delete || die
-
-	# base configs
-	insinto /etc/xrootd
-	doins packaging/common/*.cfg
-
-	fowners root:xrootd /etc/xrootd
-	keepdir /var/log/xrootd
-	fowners xrootd:xrootd /var/log/xrootd
-
-	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
-	fi
-
-	if use python; then
-		python_optimize "${D}/$(python_get_sitedir)"
-
-		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
-}
diff --git a/net-libs/xrootd/xrootd-5.5.2.ebuild b/net-libs/xrootd/xrootd-5.5.4-r1.ebuild
index aabea613b0cf..ea3bc8cea605 100644
--- a/net-libs/xrootd/xrootd-5.5.2.ebuild
+++ b/net-libs/xrootd/xrootd-5.5.4-r1.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=8
 
-# Upstream does not support the building of Python bindings
-# via CMake for more than one implementation at a time.
 PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP517="setuptools"
 DOCS_BUILDER="doxygen"
 DOCS_DEPEND="
 	media-gfx/graphviz
@@ -13,7 +13,7 @@ DOCS_DEPEND="
 	python? ( dev-python/sphinx )
 "
 
-inherit cmake docs python-single-r1
+inherit cmake docs distutils-r1
 
 DESCRIPTION="Extended ROOT remote file server"
 HOMEPAGE="https://xrootd.slac.stanford.edu/"
@@ -23,6 +23,7 @@ LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples fuse http kerberos +libxml2 python readline +server systemd test"
+
 RESTRICT="!test? ( test )"
 
 CDEPEND="acct-group/xrootd
@@ -41,7 +42,11 @@ CDEPEND="acct-group/xrootd
 "
 DEPEND="${CDEPEND}"
 BDEPEND="
-	python? ( $(python_gen_cond_dep 'dev-python/pip[${PYTHON_USEDEP}]') )
+	python? (
+		${PYTHON_DEPS}
+		${DISTUTILS_DEPS}
+		test? ( >=dev-python/pytest-7.1.2[${PYTHON_USEDEP}] )
+	)
 	test? ( dev-util/cppunit )
 "
 RDEPEND="${CDEPEND}
@@ -55,6 +60,8 @@ REQUIRED_USE="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.8.3-crc32.patch
+	"${FILESDIR}"/${PN}-5.4.3-cmake_no_python.patch
+	"${FILESDIR}"/${PN}-5.4.3-python_tests_py3.patch
 )
 
 # xrootd plugins are not intended to be linked with,
@@ -67,36 +74,75 @@ 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
+}
+
 # FIXME: support xrdec - currently only builds against bundled isa-l
 src_configure() {
 	local mycmakeargs=(
 		-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=no
 		-DENABLE_PYTHON=$(usex python)
 		-DENABLE_READLINE=$(usex readline)
-		-DENABLE_MACAROONS=no
 		-DENABLE_SCITOKENS=no
 		-DENABLE_TESTS=$(usex test)
 		-DENABLE_VOMS=no
 		-DFORCE_ENABLED=yes
-		-DPIP_OPTIONS="--ignore-installed" # bug 861452
 		-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
-	docs_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() {
+	pushd "${BUILD_DIR}/tests" > /dev/null || die
+	# There are more tests but since these are ones currently run by upstream in their CI,
+	# let's follow their example.
+	./common/test-runner ./XrdClTests/libXrdClTests.so "All Tests/UtilsTest/" || die
+	./common/test-runner ./XrdClTests/libXrdClTests.so "All Tests/SocketTest/" || die
+	./common/test-runner ./XrdClTests/libXrdClTests.so "All Tests/PollerTest/" || die
+	popd > /dev/null || die
+
+	# 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
@@ -120,7 +166,9 @@ src_install() {
 	fi
 
 	if use python; then
-		python_optimize "${D}/$(python_get_sitedir)"
+		pushd "${BUILD_DIR}"/bindings/python > /dev/null || die
+		distutils-r1_src_install
+		popd > /dev/null || die
 
 		if use doc; then
 			docinto python
@@ -132,4 +180,11 @@ src_install() {
 			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)/libXrdClTest*.so || die "Failed to remove test libraries from installed tree"
+	fi
 }
diff --git a/net-libs/xrootd/xrootd-5.5.4.ebuild b/net-libs/xrootd/xrootd-5.5.4.ebuild
deleted file mode 100644
index aabea613b0cf..000000000000
--- a/net-libs/xrootd/xrootd-5.5.4.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Upstream does not support the building of Python bindings
-# via CMake for more than one implementation at a time.
-PYTHON_COMPAT=( python3_{9..11} )
-DOCS_BUILDER="doxygen"
-DOCS_DEPEND="
-	media-gfx/graphviz
-	virtual/latex-base
-	python? ( dev-python/sphinx )
-"
-
-inherit cmake docs python-single-r1
-
-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="examples fuse http kerberos +libxml2 python readline +server systemd test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="acct-group/xrootd
-	acct-user/xrootd
-	dev-libs/openssl:0=
-	net-libs/davix
-	sys-libs/zlib
-	virtual/libcrypt:=
-	fuse? ( sys-fs/fuse:0= )
-	http? ( net-misc/curl:= )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( dev-libs/libxml2:2= )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${CDEPEND}"
-BDEPEND="
-	python? ( $(python_gen_cond_dep 'dev-python/pip[${PYTHON_USEDEP}]') )
-	test? ( dev-util/cppunit )
-"
-RDEPEND="${CDEPEND}
-	dev-lang/perl
-"
-REQUIRED_USE="
-	http? ( kerberos )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( server )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.8.3-crc32.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.*/libXrdClTests\.so"
-
-pkg_setup() {
-	use python && python_setup
-}
-
-# FIXME: support xrdec - currently only builds against bundled isa-l
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex libxml2 "no" "yes")
-		-DENABLE_FUSE=$(usex fuse)
-		-DENABLE_HTTP=$(usex http)
-		-DENABLE_KRB5=$(usex kerberos)
-		-DENABLE_PYTHON=$(usex python)
-		-DENABLE_READLINE=$(usex readline)
-		-DENABLE_MACAROONS=no
-		-DENABLE_SCITOKENS=no
-		-DENABLE_TESTS=$(usex test)
-		-DENABLE_VOMS=no
-		-DFORCE_ENABLED=yes
-		-DPIP_OPTIONS="--ignore-installed" # bug 861452
-		-DXRDCL_ONLY=$(usex server "no" "yes")
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	docs_compile
-
-	# secondary documentation for python bindings
-	if use python && use doc; then
-		emake -C bindings/python/docs html
-	fi
-}
-
-src_install() {
-	dodoc docs/ReleaseNotes.txt
-	cmake_src_install
-	find "${ED}" \( -iname '*.md5' -o -iname '*.map' \) -delete || die
-
-	# base configs
-	insinto /etc/xrootd
-	doins packaging/common/*.cfg
-
-	fowners root:xrootd /etc/xrootd
-	keepdir /var/log/xrootd
-	fowners xrootd:xrootd /var/log/xrootd
-
-	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
-	fi
-
-	if use python; then
-		python_optimize "${D}/$(python_get_sitedir)"
-
-		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
-}