gentoo auto-resync : 07:09:2022 - 16:36:21

9 files changed, 396 insertions, 14 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 752971561dee..f63313efc555 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index 11bdc3026f4c..375ca97fabc4 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -6,7 +6,7 @@ DIST libnftnl-1.2.2.tar.bz2.sig 566 BLAKE2B ffdb35811e57f55ba30dfdd3e6656166b5f5
 DIST libnftnl-1.2.3.tar.bz2 395208 BLAKE2B 893688a861bbb10609642bed912090b227d5d823cc1b94098b60ac85d137254ff3001971580e5059029a33c64e7226cc8473b0b9c1c79be77cbfb0c477254a1e SHA512 e2d16cbc062eb8900f0472abb8fe6b22910cc5a8efbb47445fe6ce6e2713a0637f74b46b2bf2031ba9ecb2e5eed932e3bbb49b015c7b7207591249de23d5149d
 DIST libnftnl-1.2.3.tar.bz2.sig 566 BLAKE2B 82b49ab1c7a9a588fea67b516d57afb455ceb5242bf774ff7ec92e240b5c2373fe7cc90dd60f302cb4e0615ec0036d995c1ddf25d9b26d6168eeaaa3c7027511 SHA512 73b8f75851dd30f5f54fe85d4c75d9ab18151c38e7c63961b52965e5e7478d240931a09a078fda1fe6b1a32a588e092c98e44b57fe1c9542874ac76bb04a29a1
 EBUILD libnftnl-1.2.1.ebuild 1596 BLAKE2B 4f0df58ffaba293aaee147690535e20e22a9f1e7bc6d115b0a5bac9039fd616b3d861786552c27661d3a7569f7ad8675bdabb818fd22a1bc57f5e00af1146e47 SHA512 bbf0ae2f34d3d3a9e102e11a3c466664989f37f145eb757587887bb3538c75b863073ebe8b61b9ad26dc8d8af071c66ae5680dea6ad98b4d82af13892f192cba
-EBUILD libnftnl-1.2.2-r1.ebuild 1963 BLAKE2B 329c5a51fb5bfaae4786f5026abf160619da328defe43faf08f9f4bb055595a1f227bbbef2d7ca3712ea234b280cab0b92766305916511449e55c615cdf1f893 SHA512 ce644a086b81d06859b252006352fed172d1ff2a2860c44cbae6cf1b3b71946e0d96eb7d5c26f98c1f2249c67712614cb79bc6864b9388dbb72f00ce8d2ddf65
+EBUILD libnftnl-1.2.2-r1.ebuild 1961 BLAKE2B b270ca2d2f3eb90a299fdc49664e960383566df1e7cccb6614e51887f8a18664e61a96d0aaced8b5726490c2d56b6e3c091695bbb0d3ecd3386224bbbe5f5906 SHA512 2c1b95438165618e6ec7e662e604022c96908fb5cd8e9665e10875ffb5c578c10009004c6285d1dc6a9445f08e5e9b8b586772ca3e0a3da1a22c87fd01c34766
 EBUILD libnftnl-1.2.3.ebuild 1616 BLAKE2B 33da1ea7acb7744a89396efd68da7b2bd4318d876e73fffbcf9734b810b3e37adb89b60e44b554d33a938f132a9264c0ea244c2b71798708da646817a8a59348 SHA512 ae5f73c91cf326c33900ed53a601b3550dcbbd07b0f65cf0823c5870eb55dddce4ed5e80d4edc822ffc20065f72c34613c0258fd8732361c39006482b4880ba4
 EBUILD libnftnl-9999.ebuild 1616 BLAKE2B 33da1ea7acb7744a89396efd68da7b2bd4318d876e73fffbcf9734b810b3e37adb89b60e44b554d33a938f132a9264c0ea244c2b71798708da646817a8a59348 SHA512 ae5f73c91cf326c33900ed53a601b3550dcbbd07b0f65cf0823c5870eb55dddce4ed5e80d4edc822ffc20065f72c34613c0258fd8732361c39006482b4880ba4
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/net-libs/libnftnl/libnftnl-1.2.2-r1.ebuild b/net-libs/libnftnl/libnftnl-1.2.2-r1.ebuild
index 1515dc6be1b4..f2b46729d3bc 100644
--- a/net-libs/libnftnl/libnftnl-1.2.2-r1.ebuild
+++ b/net-libs/libnftnl/libnftnl-1.2.2-r1.ebuild
@@ -18,7 +18,7 @@ else
 		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-clang-fortify-source.patch.xz
 		verify-sig? ( https://netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )
 	"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86"
 
 	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
 fi
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 7ef2f3cfceca..ab2ea67faeb4 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,10 +1,10 @@
 AUX libssh-0.10.1-disable-broken-test.patch 1182 BLAKE2B 2ae0c370077d0c8dc79b81f33b84949f26ced643788d414973b1cd56ab2ee0223fdabb1fcf4e311774a7d47018d8258e7b0f4d073c08f825eb0da62a5a45ed4b SHA512 923f18a7c125d1becb83aec6a743535588ca7b99e35a9a54f76189558892f56bbde55ef6f7b44141f7a8b30aed945fc6e7fc00625644b5621bdb82eaccdb05a0
 AUX libssh-0.8.0-tests.patch 503 BLAKE2B 22c3527e4b06ab9a00936e84c66ed14c7163a285aa5c88cfec5543e7c7aada8ffb716e20f3d3a0fef9425e244629f0d1c35250bdb9ce454b6cb247a3537cd411 SHA512 43145c2c202510ebe5cf64b47a6963b9335a844997f986938eacb0171a129863cdbd2676b8016941c85ec8c820d0543b8ab20f6aca5af86b3506e78aa29cf7e8
-DIST libssh-0.10.1.tar.xz 553808 BLAKE2B 1e0a648153122619e473481484af70b9c388e75a6586a7b5ea605fede4a592f2f1ae2978c19762ac396d3dff2a3dd03451ee293c9fbd4f861a1bb5668e2489b7 SHA512 d56b2809527d4f3c1d88881b8f7a7cd49321df8abe4fde011dfe7323e7552641b36a607f3b1b37c26703adae01d0176fc3d71c6c207598aaae5ebdf10237742e
 DIST libssh-0.10.2.tar.xz 554240 BLAKE2B 5732ed9709735ced62c6a1c0fc32f4c35d26bf26fd8a086ce145f7f6c679468c146a1c1a8f85035dc73971f60bd59b0a784e5fe0afc2575de947b386a4cef804 SHA512 8855ebb9ea97e6ad03dec800e0885381c5397a04f5578f0b79b82e49458766f7b6c394713c4fbdc8ff6bb8d3b4c3b8b4f7b797f39ddbc95caf205ee6d89d3278
+DIST libssh-0.10.3.tar.xz 554928 BLAKE2B 5bb1feecf77ec038b89cec1058d0c401d2f3ecca6975ee098dc9eb4d3b981b807d54291f915f8f7e236dc06ac864289f99d92ea1d6983afda1044a690c8207e6 SHA512 dfc992a4d16bf3de6ed01b1d0d73e061f61acf6785b2c81a722154219a286fc2b8952dec0e842bcbc14ce2734078161a820d44091f01851c8538f8f381655253
 DIST libssh-0.9.6.tar.xz 1053056 BLAKE2B e8565279a430786b8877386a26700a39386e908546a209815b135a2bf4ef42c37b9890dc29cda9ce6c8bfe3f3bae4942097dc794302aec767d106a45c44b811d SHA512 4040ec4af937e95be2e41313ef6d4db60b46b8d4dea10c09402398127c1d1ca8843392d207088aeee3c7ef631c6ae7b66861327dcebf78ed3af0723777619fd1
-EBUILD libssh-0.10.1.ebuild 3321 BLAKE2B 138549fbf62bb54e6f2568e76a0462d1d31a8383d014419e93d179c4c8a652c9ed1936cadcdf1a0fb57039a022792d12251b134d40ad9721c7c93c27ff9550a6 SHA512 08ab3d89a88bdc15e02078219cdd13731a6c42fa8289bc8e6e03bb534e073055ba60ce8dcac1ea78c4b375ac682c5c74703b5113ea552fe31d8a013cf224b585
 EBUILD libssh-0.10.2.ebuild 3502 BLAKE2B 610cc25ac1e65176f7480905017cfb1a945b49bd72903ce6f694f254d278173df285e4db5574eaf9c505ea9ae031cb6adbc7cf40918975719f250b2f6fa0f6fd SHA512 158df4438cfa23b01d76860fe185d01f20c9283ce18974cf98cabda01b5d1e7e00ec9170d8638770f6eac0e80dc2640be31ad472a5aeb93858b8d5bff6851317
+EBUILD libssh-0.10.3.ebuild 3502 BLAKE2B 610cc25ac1e65176f7480905017cfb1a945b49bd72903ce6f694f254d278173df285e4db5574eaf9c505ea9ae031cb6adbc7cf40918975719f250b2f6fa0f6fd SHA512 158df4438cfa23b01d76860fe185d01f20c9283ce18974cf98cabda01b5d1e7e00ec9170d8638770f6eac0e80dc2640be31ad472a5aeb93858b8d5bff6851317
 EBUILD libssh-0.9.6.ebuild 3249 BLAKE2B 262c8a347a8f2f22fbd8f64d592666b6f41272709ced4caa7f7b8642bfa0047e208494938073acc22c35251aa5742b4391ad863bd57438661368328c5635ea7b SHA512 f6cc5499261f82c457740bdfe2665f380d62a23447857d0ee9eb5c7c4dc28b064bb49ccb86265921eb9ff47d366f298f84caa9751cb175a9f7b963442833e513
 EBUILD libssh-9999.ebuild 3502 BLAKE2B 610cc25ac1e65176f7480905017cfb1a945b49bd72903ce6f694f254d278173df285e4db5574eaf9c505ea9ae031cb6adbc7cf40918975719f250b2f6fa0f6fd SHA512 158df4438cfa23b01d76860fe185d01f20c9283ce18974cf98cabda01b5d1e7e00ec9170d8638770f6eac0e80dc2640be31ad472a5aeb93858b8d5bff6851317
 MISC metadata.xml 726 BLAKE2B 351703a7c13b7f66c152121dac43d09b53f3d141d9a37e0dfcd8601f6f30943698c66cf6e51cb6053d1891313b1bc46fbf4071aca39bf3d07d218f8d47ed1e83 SHA512 8f639e4c5ee39a54778e9948e347551372b2f83ca30fe360a1281a52c681563c5dd2d2e053c2263b24440fc1a11c6d3cf866eaa46e39610cbd01c76c29fde7bc
diff --git a/net-libs/libssh/libssh-0.10.1.ebuild b/net-libs/libssh/libssh-0.10.3.ebuild
index 25b41a81f804..c8592e03bb83 100644
--- a/net-libs/libssh/libssh-0.10.1.ebuild
+++ b/net-libs/libssh/libssh-0.10.3.ebuild
@@ -45,10 +45,6 @@ BDEPEND="doc? ( app-doc/doxygen[dot] )"
 
 DOCS=( AUTHORS CHANGELOG README )
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.10.1-disable-broken-test.patch
-)
-
 src_prepare() {
 	cmake_src_prepare
 
@@ -59,14 +55,26 @@ src_prepare() {
 		-i ConfigureChecks.cmake || die
 
 	if use test; then
-		# keyfile torture test is currently broken
-		sed -e "/torture_keyfiles/d" \
-			-i tests/unittests/CMakeLists.txt || die
+		local skip_tests=(
+			# keyfile torture test is currently broken
+			-e "/torture_keyfiles/d"
+
+			# Tries to expand ~ which fails w/ portage homedir
+			# (torture_path_expand_tilde_unix and torture_config_make_absolute_no_sshdir)
+			-e "/torture_misc/d"
+			-e "/torture_config/d"
+		)
 
-		# disable tests that take too long (bug #677006)
+		# Disable tests that take too long (bug #677006)
 		if use sparc; then
-			sed -e "/torture_threads_pki_rsa/d" -e "/torture_pki_dsa/d" \
-				-i tests/unittests/CMakeLists.txt || die
+			skip_tests+=(
+				-e "/torture_threads_pki_rsa/d"
+				-e "/torture_pki_dsa/d"
+			)
+		fi
+
+		if (( ${#skip_tests[@]} )) ; then
+			sed -i "${skip_tests[@]}" tests/unittests/CMakeLists.txt || die
 		fi
 
 		if use elibc_musl; then
diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index 6026ad32b824..ee4733a4f3ba 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -2,10 +2,13 @@ AUX cmsd.initd 885 BLAKE2B 9198afa01850da74519a6869894ebd86313f87781e3e2401d429e
 AUX frm_purged.initd 895 BLAKE2B c192a3c69d3161a8342242789cfc1559f189c0748cd0bdd1ee6baf9b5ba98c80d8103fa55344e1c9b040a513045c7a473272da46c800ff2afa45a0665a93c3b2 SHA512 f9c09f8baae7ed391d5248f5dfb7a1d4d60f23605b2646e6f3c2ec33b05838918a4ba4874424e9b4e674f1ca127d57760364552f6f948dcd3ef84245730efc30
 AUX frm_xfrd.initd 899 BLAKE2B bdfc83f7bbad7e0d7aea91720798c10367c7ac27851414b99013c01d4f9681e010082bfef332ba2cc520afdbef67051ea80ee6922e515a30de32e735f0a6c6a7 SHA512 1c38b20c9b54cab17706c040a90b00df61c9b2f5e4e7a9cc26fa3b125e1d132097222921b5627a33f69b80c8ae5a64cfbaea0a4880588de9fa9d18f6aaa04768
 AUX xrootd-4.8.3-crc32.patch 1987 BLAKE2B be57f7be2a897a2399f923e4670d219be79053221cc62ca0f6cf9b7abe6fae4f99dde0ccc72f6617bb07a871a396072db59aa57265382dab7928cbffdac1706e SHA512 4c390ed4329f21839ca2b481408c0114e5d4839cf0b04e673677e175c2e7e92573c9f56ec69660d4f5256c824676f65f9fb6c683d0e77d3b1f97bee7e5f65bc9
+AUX xrootd-5.4.3-cmake_no_python.patch 403 BLAKE2B 8e13c64de9bb8504dae8c309fccfb52a13bf5c86be40493272002437c8b5838c75badbdfc8eef3d04e7f62d15509dda138fcecfd4299794c73bbb92f4665182c SHA512 0d082f52a4c6fd0e569d6df9653065d1438a55c047edefbdb882465a6c83d66bca1c358e64e724a656595a2d1e453adaaa662915d74382508338f3d98e98e44e
 AUX xrootd-5.4.3-no_automagic.patch 454 BLAKE2B 78fdb01301a342db1ea3685f5513f56449ed69af0e5ecf48545af7c8e2cb00f58b68660b812f64dcdc15df4d1bc303ef127fe85c0b9ea7ebc4a9518ab0d30c11 SHA512 7aa1e7d2f2a86e2222a4bf95ca344994d67bc25dbb3ffce27c36634dcecf8dd828a3072f04dd266014e7fd8cab8a06135959a8ee10f3003dcbaf43ac5658d3e5
+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.4.3.tar.gz 3182127 BLAKE2B ed3f6a943167eafb5f6d7f78ca34f44c9a18b5ed672a4e622acb1e6e6997bd21756a30bf24f0b799ab4f16e7e1fb3f61a042f4e5e00f965b898fc5a287bf995a SHA512 189ec8e20901fd07093494187502e031a60d4ade22af33067313fad7a1bf6a6feb5c5d9d59d3a86d13a6a767e5a93cf4836da02e9cae11c81ccac07199898d72
 EBUILD xrootd-5.4.3-r1.ebuild 3236 BLAKE2B 9e1aa0733247cbfde76a1a53b87e9c7e44f58a5465cdc6b5e741757ad8a1a6e8515879d27324f8ee994ccc5fea1433804f27ce7113126b8b0b34f605e54c5787 SHA512 60d917d1737b2053bf23150464590b97c231010d16bd535df2147a3b89b73c261750342f9c1133d7eff5abbd84b0b41232f360eb9928862518937fbb74200274
+EBUILD xrootd-5.4.3-r2.ebuild 4627 BLAKE2B ee921f4275109a9beebf596d13da360e9d9ea7302a3c30b3c585b32fd999c827ac43cf9cdc70d57ec967c47546032990d1bf490fdda9bfcf547ac704a36164ee SHA512 3e89e0f3d32bba82f96a590f32b2bdb65bf3d01acbdab2090b9dace9352fa5538eb77b2bbd2287803f34c8c6469ce7be131e02da23074723e2b44b0e5800a62e
 EBUILD xrootd-5.4.3.ebuild 3186 BLAKE2B de3810bbf345c8576b7bbc1835905e600d58edfe694eb631214d0c075f0acf11d8ae95e24252f65ede89b8f48d80bce740992fa65dc0fcc892c8c51b362fe91e SHA512 4c89f8a9d3a1dd61130fb63b5b1d8548d1f555e76ffe8dfe1ee9cac112c0a18a8fa07a61bbd758fc1743771f7b92c775d1f5bd73e1ff185eb0dbc0be0a82918a
 MISC metadata.xml 1124 BLAKE2B 28d63d184e1d3c53c1cc1ec05f9508e0cc99a0a6a14e405aa8cdeddcf20cff0e825d814531826544b58e51b4996948718407ba1269966037ad7f00ab8807b2c7 SHA512 3aac33a0c6eea3f0ea2e105a0c5b000a0d9d423ed1d2cfc10619142aa5de35fa4b27fba6aa224bd95020c5d9ec278a89bbd0468c38d674fb53e989bc738f001e
diff --git a/net-libs/xrootd/files/xrootd-5.4.3-cmake_no_python.patch b/net-libs/xrootd/files/xrootd-5.4.3-cmake_no_python.patch
new file mode 100644
index 000000000000..04607cdd7b04
--- /dev/null
+++ b/net-libs/xrootd/files/xrootd-5.4.3-cmake_no_python.patch
@@ -0,0 +1,15 @@
+--- a/bindings/python/CMakeLists.txt
++++ b/bindings/python/CMakeLists.txt
+@@ -32,6 +32,7 @@
+ 
+ configure_file(${SETUP_PY_IN} ${SETUP_PY})
+ 
++if (0)
+ string(FIND "${PIP_OPTIONS}" "--prefix" PIP_OPTIONS_PREFIX_POSITION)
+ if( "${PIP_OPTIONS_PREFIX_POSITION}" EQUAL "-1" )
+   string(APPEND PIP_OPTIONS " --prefix \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}")
+@@ -100,3 +101,4 @@
+       )"
+   )
+ endif()
++endif()
diff --git a/net-libs/xrootd/files/xrootd-5.4.3-python_tests_py3.patch b/net-libs/xrootd/files/xrootd-5.4.3-python_tests_py3.patch
new file mode 100644
index 000000000000..e20e45309e39
--- /dev/null
+++ b/net-libs/xrootd/files/xrootd-5.4.3-python_tests_py3.patch
@@ -0,0 +1,169 @@
+--- a/bindings/python/tests/test_copy.py
++++ b/bindings/python/tests/test_copy.py
+@@ -61,15 +61,15 @@
+ 
+ class TestProgressHandler(object):
+   def begin(self, id, total, source, target):
+-    print '+++ begin(): %d, total: %d' % (id, total)
+-    print '+++ source: %s' % source
+-    print '+++ target: %s' % target
++    print('+++ begin(): %d, total: %d' % (id, total))
++    print('+++ source: %s' % source)
++    print('+++ target: %s' % target)
+ 
+   def end(self, jobId, status):
+-    print '+++ end(): jobId: %s, status: %s'  % (jobId, status)
++    print('+++ end(): jobId: %s, status: %s'  % (jobId, status))
+ 
+   def update(self, jobId, processed, total):
+-    print '+++ update(): jobid: %s, processed: %d, total: %d' % (jobId, processed, total)
++    print('+++ update(): jobid: %s, processed: %d, total: %d' % (jobId, processed, total))
+ 
+ def test_copy_progress_handler():
+   c = client.CopyProcess()
+--- a/bindings/python/tests/test_file.py
++++ b/bindings/python/tests/test_file.py
+@@ -289,9 +289,9 @@
+   for i, l in enumerate(lines):
+     total += len(l)
+     if l != pylines[i]:
+-      print '!!!!!', total, i
+-      print '+++++ py: %r' % pylines[i]
+-      print '+++++ me: %r' % l
++      print('!!!!!', total, i)
++      print('+++++ py: %r' % pylines[i])
++      print('+++++ me: %r' % l)
+       break
+     if pylines[i].endswith('\n'):
+       assert l.endswith('\n')
+--- a/bindings/python/tests/test_filesystem.py
++++ b/bindings/python/tests/test_filesystem.py
+@@ -37,20 +37,20 @@
+   status, response = f.open(smallfile, OpenFlags.NEW)
+ 
+   for func, args, hasReturnObject in funcspecs:
+-      async(func, args, hasReturnObject)
++      run_async(func, args, hasReturnObject)
+ 
+ def sync(func, args, hasReturnObject):
+   status, response = func(*args)
+-  print status
++  print(status)
+   assert status.ok
+   if hasReturnObject:
+-      print response
++      print(response)
+       assert response
+ 
+-def async(func, args, hasReturnObject):
++def run_async(func, args, hasReturnObject):
+   handler = AsyncResponseHandler()
+   status = func(callback=handler, *args)
+-  print status
++  print(status)
+   assert status.ok
+   status, response, hostlist = handler.wait()
+ 
+@@ -60,7 +60,7 @@
+ 
+   for host in hostlist:
+     assert host.url
+-    print host.url
++    print(host.url)
+ 
+   if hasReturnObject:
+     assert response
+@@ -79,7 +79,7 @@
+ 
+   try:
+     os.remove('/tmp/eggs')
+-  except OSError, __:
++  except OSError as __:
+     pass
+ 
+ def test_locate_sync():
+@@ -127,7 +127,7 @@
+ 
+   for item in response:
+     assert item.name
+-    print item.statinfo
++    print(item.statinfo)
+     assert item.statinfo
+     assert item.hostaddr
+     
+@@ -143,11 +143,11 @@
+   assert status.ok
+ 
+   for h in hostlist:
+-    print h.url
++    print(h.url)
+ 
+   for item in response:
+     assert item.name
+-    print item.statinfo
++    print(item.statinfo)
+     assert item.statinfo
+     assert item.hostaddr
+ 
+@@ -158,7 +158,7 @@
+   status, response = c.query(QueryCode.STATS, 'a')
+   assert status.ok
+   assert response
+-  print response
++  print(response)
+ 
+ def test_query_async():
+   c = client.FileSystem(SERVER_URL)
+@@ -169,7 +169,7 @@
+   status, response, hostlist = handler.wait()
+   assert status.ok
+   assert response
+-  print response
++  print(response)
+   
+ def test_mkdir_flags():
+   c = client.FileSystem(SERVER_URL)
+--- a/bindings/python/tests/test_glob.py
++++ b/bindings/python/tests/test_glob.py
+@@ -2,7 +2,7 @@
+ import os
+ import glob as norm_glob
+ import XRootD.client.glob_funcs as glob
+-from pathlib2 import Path
++from pathlib import Path
+ 
+ 
+ @pytest.fixture
+@@ -13,7 +13,7 @@
+     subdir2.mkdir()
+     for i in range(3):
+         dummy = subdir1 / ("a_file_%d.txt" % i)
+-        dummy.write_text(u"This is file %d\n" % i, encoding="utf-8")
++        dummy.write_text("This is file %d\n" % i, encoding="utf-8")
+     return tmpdir
+ 
+ 
+--- a/bindings/python/tests/test_threads.py
++++ b/bindings/python/tests/test_threads.py
+@@ -15,10 +15,10 @@
+     s, _ = self.file.write(smallbuffer)
+     assert s.ok
+ 
+-    print '+++ thread %d says: %s' % (self.id, self.file.read())
++    print('+++ thread %d says: %s' % (self.id, self.file.read()))
+ 
+     for line in self.file:
+-      print '+++ thread %d says: %s' % (self.id, line)
++      print('+++ thread %d says: %s' % (self.id, line))
+ 
+     self.file.close()
+ 
+@@ -28,7 +28,7 @@
+ #   assert f.is_open()
+ #   f.write(smallbuffer)
+ 
+-  for i in xrange(3):
++  for i in range(3):
+     tt = TestThread(f, i)
+     tt.start()
+     tt.join()
diff --git a/net-libs/xrootd/xrootd-5.4.3-r2.ebuild b/net-libs/xrootd/xrootd-5.4.3-r2.ebuild
new file mode 100644
index 000000000000..835ba9ab3318
--- /dev/null
+++ b/net-libs/xrootd/xrootd-5.4.3-r2.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_PEP571="setuptools"
+
+inherit cmake distutils-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"
+
+RESTRICT="!test? ( 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:= )
+"
+DEPEND="${CDEPEND}"
+BDEPEND="
+	doc? (
+		app-doc/doxygen[dot]
+		virtual/latex-base
+		python? ( dev-python/sphinx )
+	)
+	python? (
+		${PYTHON_DEPS}
+		${DISTUTILS_DEPS}
+		test? ( >=dev-python/pytest-7.1.2[${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
+	"${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,
+# 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
+}
+
+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=(
+		-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
+		-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 doc; then
+		doxygen Doxyfile || die
+		if use python; then
+			emake -C bindings/python/docs html
+		fi
+	fi
+	if use python; then
+		pushd "${BUILD_DIR}"/bindings/python > /dev/null || die
+		distutils-r1_src_compile
+		popd > /dev/null || die
+	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() {
+	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
+		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)/libXrdClTest*.so || die "Failed to remove test libraries from installed tree"
+	fi
+}