Diff xrootd-5.5.5-r1 with a xrootd-5.6.1

/usr/portage/net-libs/xrootd/xrootd-5.6.1.ebuild 2023-10-09 14:52:34.604368479 +0300
3 3

  
4 4
EAPI=8
5 5

  
6
PYTHON_COMPAT=( python3_{9..11} )
6
PYTHON_COMPAT=( python3_{9..12} )
7 7
DISTUTILS_EXT=1
8 8
DISTUTILS_OPTIONAL=1
9 9
DISTUTILS_USE_PEP517="setuptools"
......
18 18

  
19 19
DESCRIPTION="Extended ROOT remote file server"
20 20
HOMEPAGE="https://xrootd.slac.stanford.edu/"
21
SRC_URI="https://xrootd.slac.stanford.edu/download/v${PV}/${P}.tar.gz"
21
LICENSE="LGPL-3+"
22 22

  
23
LICENSE="LGPL-3"
23
IUSE="ceph examples fuse http kerberos +libxml2 macaroons python readline scitokens +server systemd test xrdec"
24 24
SLOT="0"
25

  
25 26
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
26
IUSE="examples fuse http kerberos +libxml2 macaroons python readline scitokens +server systemd test xrdec"
27
SRC_URI="https://xrootd.slac.stanford.edu/download/v${PV}/${P}.tar.gz"
28

  
29
RESTRICT="!test? ( test )"
27 30

  
28 31
REQUIRED_USE="
29 32
	http? ( kerberos )
30
	macaroons? ( server )
33
	macaroons? ( server http )
31 34
	python? ( ${PYTHON_REQUIRED_USE} )
32 35
	scitokens? ( server )
33 36
	test? ( server )
34 37
"
35 38

  
36
RESTRICT="!test? ( test )"
37

  
38 39
CDEPEND="acct-group/xrootd
39 40
	acct-user/xrootd
40 41
	dev-libs/openssl:0=
41 42
	sys-libs/zlib
42 43
	virtual/libcrypt:=
44
	ceph? ( sys-cluster/ceph )
43 45
	fuse? ( sys-fs/fuse:0= )
44 46
	http? (
45 47
		net-misc/curl:=
......
61 63
		${DISTUTILS_DEPS}
62 64
		test? ( >=dev-python/pytest-7.1.2[${PYTHON_USEDEP}] )
63 65
	)
64
	test? ( dev-util/cppunit )
66
	test? (
67
		dev-cpp/gtest
68
		dev-util/cppunit
69
	)
65 70
"
66 71
RDEPEND="${CDEPEND}
67 72
	dev-lang/perl
......
69 74

  
70 75
PATCHES=(
71 76
	"${FILESDIR}"/${PN}-4.8.3-crc32.patch
72
	"${FILESDIR}"/${PN}-5.4.3-cmake_no_python.patch
73 77
	"${FILESDIR}"/${PN}-5.4.3-python_tests_py3.patch
74
	"${FILESDIR}"/${PN}-5.5-system-isa-l.patch
75 78
)
76 79

  
77 80
# xrootd plugins are not intended to be linked with,
78 81
# they are to be loaded at runtime by xrootd,
79 82
# see https://github.com/xrootd/xrootd/issues/447
80 83
QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1)\.so
81
	/usr/lib.*/libXrdClTests\.so"
84
	/usr/lib.*/libXrd.*Tests\.so"
82 85

  
83 86
pkg_setup() {
84 87
	use python && python_setup
......
98 101
src_configure() {
99 102
	local mycmakeargs=(
100 103
		-DUSE_SYSTEM_ISAL=TRUE
104
		$(usex python "-DINSTALL_PYTHON_BINDINGS=FALSE" "")
105
		-DXRDCEPH_SUBMODULE=$(usex ceph)
101 106
		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex libxml2 "no" "yes")
102 107
		-DCMAKE_DISABLE_FIND_PACKAGE_systemd=$(usex systemd "no" "yes")
103 108
		-DENABLE_FUSE=$(usex fuse)
......
144 149
}
145 150

  
146 151
src_test() {
147
	pushd "${BUILD_DIR}/tests" > /dev/null || die
148
	# There are more tests but, they require a docker environment with various containers.
149
	# The tests below are the ones which do not require a server to be running.
150
	./common/test-runner ./XrdClTests/libXrdClTests.so "All Tests/UtilsTest/" || die
151
	./common/test-runner ./XrdClTests/libXrdClTests.so "All Tests/SocketTest/" || die
152
	./common/test-runner ./XrdClTests/libXrdClTests.so "All Tests/PollerTest/" || die
153
	popd > /dev/null || die
154

  
152
	cmake_src_test
155 153
	# Python tests currently require manual configuration and start-up of an xrootd server.
156 154
	# TODO: get this to run properly.
157 155
	#use python && distutils-r1_src_test
Thank you!