Сравнение xrootd-5.5.4-r1 с xrootd-5.5.5-r1

/usr/portage/net-libs/xrootd/xrootd-5.5.5-r1.ebuild 2023-10-09 14:52:34.604368479 +0300
4 4
EAPI=8
5 5

  
6 6
PYTHON_COMPAT=( python3_{9..11} )
7
DISTUTILS_EXT=1
7 8
DISTUTILS_OPTIONAL=1
8 9
DISTUTILS_USE_PEP517="setuptools"
9 10
DOCS_BUILDER="doxygen"
......
13 14
	python? ( dev-python/sphinx )
14 15
"
15 16

  
16
inherit cmake docs distutils-r1
17
inherit cmake docs distutils-r1 systemd
17 18

  
18 19
DESCRIPTION="Extended ROOT remote file server"
19 20
HOMEPAGE="https://xrootd.slac.stanford.edu/"
......
21 22

  
22 23
LICENSE="LGPL-3"
23 24
SLOT="0"
24
KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
25
IUSE="examples fuse http kerberos +libxml2 python readline +server systemd test"
25
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
26
IUSE="examples fuse http kerberos +libxml2 macaroons python readline scitokens +server systemd test xrdec"
27

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

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

  
29 38
CDEPEND="acct-group/xrootd
30 39
	acct-user/xrootd
31 40
	dev-libs/openssl:0=
32
	net-libs/davix
33 41
	sys-libs/zlib
34 42
	virtual/libcrypt:=
35 43
	fuse? ( sys-fs/fuse:0= )
36
	http? ( net-misc/curl:= )
44
	http? (
45
		net-misc/curl:=
46
		net-libs/davix
47
	)
37 48
	kerberos? ( virtual/krb5 )
38 49
	libxml2? ( dev-libs/libxml2:2= )
50
	macaroons? ( dev-libs/libmacaroons )
39 51
	python? ( ${PYTHON_DEPS} )
40 52
	readline? ( sys-libs/readline:0= )
53
	scitokens? ( dev-cpp/scitokens-cpp )
41 54
	systemd? ( sys-apps/systemd:= )
55
	xrdec? ( dev-libs/isa-l )
42 56
"
43 57
DEPEND="${CDEPEND}"
44 58
BDEPEND="
......
52 66
RDEPEND="${CDEPEND}
53 67
	dev-lang/perl
54 68
"
55
REQUIRED_USE="
56
	http? ( kerberos )
57
	python? ( ${PYTHON_REQUIRED_USE} )
58
	test? ( server )
59
"
60 69

  
61 70
PATCHES=(
62 71
	"${FILESDIR}"/${PN}-4.8.3-crc32.patch
63 72
	"${FILESDIR}"/${PN}-5.4.3-cmake_no_python.patch
64 73
	"${FILESDIR}"/${PN}-5.4.3-python_tests_py3.patch
74
	"${FILESDIR}"/${PN}-5.5-system-isa-l.patch
65 75
)
66 76

  
67 77
# xrootd plugins are not intended to be linked with,
......
87 97
# FIXME: support xrdec - currently only builds against bundled isa-l
88 98
src_configure() {
89 99
	local mycmakeargs=(
100
		-DUSE_SYSTEM_ISAL=TRUE
90 101
		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex libxml2 "no" "yes")
91 102
		-DCMAKE_DISABLE_FIND_PACKAGE_systemd=$(usex systemd "no" "yes")
92 103
		-DENABLE_FUSE=$(usex fuse)
93 104
		-DENABLE_HTTP=$(usex http)
94 105
		-DENABLE_KRB5=$(usex kerberos)
95
		-DENABLE_MACAROONS=no
106
		-DENABLE_MACAROONS=$(usex macaroons)
96 107
		-DENABLE_PYTHON=$(usex python)
97 108
		-DENABLE_READLINE=$(usex readline)
98
		-DENABLE_SCITOKENS=no
109
		-DENABLE_SCITOKENS=$(usex scitokens)
99 110
		-DENABLE_TESTS=$(usex test)
100 111
		-DENABLE_VOMS=no
112
		-DENABLE_XRDCL=yes
113
		-DENABLE_XRDCLHTTP=$(usex http)
114
		-DENABLE_XRDEC=$(usex xrdec)
101 115
		-DFORCE_ENABLED=yes
102 116
		-DXRDCL_ONLY=$(usex server "no" "yes")
103 117
	)
......
131 145

  
132 146
src_test() {
133 147
	pushd "${BUILD_DIR}/tests" > /dev/null || die
134
	# There are more tests but since these are ones currently run by upstream in their CI,
135
	# let's follow their example.
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.
136 150
	./common/test-runner ./XrdClTests/libXrdClTests.so "All Tests/UtilsTest/" || die
137 151
	./common/test-runner ./XrdClTests/libXrdClTests.so "All Tests/SocketTest/" || die
138 152
	./common/test-runner ./XrdClTests/libXrdClTests.so "All Tests/PollerTest/" || die
......
148 162
	cmake_src_install
149 163
	find "${ED}" \( -iname '*.md5' -o -iname '*.map' \) -delete || die
150 164

  
151
	# base configs
152
	insinto /etc/xrootd
153
	doins packaging/common/*.cfg
154

  
155
	fowners root:xrootd /etc/xrootd
156
	keepdir /var/log/xrootd
157
	fowners xrootd:xrootd /var/log/xrootd
158

  
159 165
	if use server; then
160 166
		local i
161 167
		for i in cmsd frm_purged frm_xfrd xrootd; do
......
163 169
		done
164 170
		# all daemons MUST use single master config file
165 171
		newconfd "${FILESDIR}"/xrootd.confd xrootd
172

  
173
		if use systemd; then
174
			systemd_dounit packaging/common/*.{service,socket}
175
		fi
166 176
	fi
167 177

  
178
	# base configs
179
	insinto /etc/xrootd
180
	doins packaging/common/*.cfg
181

  
182
	keepdir /etc/xrootd/config.d
183
	keepdir /var/log/xrootd
184

  
185
	fowners -R xrootd:xrootd /etc/xrootd
186
	fowners -R xrootd:xrootd /var/log/xrootd
187

  
168 188
	if use python; then
169 189
		pushd "${BUILD_DIR}"/bindings/python > /dev/null || die
170 190
		distutils-r1_src_install
......
185 205
		for f in test-runner xrdshmap; do
186 206
			rm "${ED}"/usr/bin/${f} || die "Failed to remove test helper ${f} from installed tree"
187 207
		done
188
		rm "${ED}"/usr/$(get_libdir)/libXrdClTest*.so || die "Failed to remove test libraries from installed tree"
208
		rm "${ED}"/usr/$(get_libdir)/libXrd*Test*.so || die "Failed to remove test libraries from installed tree"
189 209
	fi
190 210
}
Спасибо!