gentoo resync : 22.12.2021

6 files changed, 29 insertions, 139 deletions

diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index c581eef448b7..aaf957729766 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -5,11 +5,9 @@ AUX xrootd-4.8.3-crc32.patch 1987 BLAKE2B be57f7be2a897a2399f923e4670d219be79053
 AUX xrootd.confd 651 BLAKE2B a35bf51b82334757dbd27bd48923e59f955361ab009c4b92eef83050d5d4e23904abc2b0b9577f8a5888c875c34bf736cf4072b6684a91ca6ad8cd90fe9a2ba9 SHA512 60ab5b6d77cf79437960044bf201127c8adf5134e7f61a18dcccd2e474a4e41eda971e3ada71dea987716080fb308af98a5237bab2a0b82f50f932ff59e3fdea
 AUX xrootd.initd 858 BLAKE2B 306970196c9f69db3f94c095c8518b837f5f4723a1cbae273273821e4d77d30a7fe65ac4fccbb640ad5e0b6f879e549dbbc4e799f87b5b5c813d66f2d270af2b SHA512 dcdb75341d904c9850c2bf97393ccbb68ad37b095e0a20ca4dab27b10dd7525874c8ad6e07e5b9c1f3c3566391a50c06dee70622d865fa51a7e73aa4096da955
 DIST xrootd-5.0.3.tar.gz 2766694 BLAKE2B 1fe7743de4d09c95257c3d761c2056024ba3ba59b7cd86b5926f2d32cc2f85dcd0af69e6e5969967591a2bba293902b757395e0f9375cbbbb39577eed9e450eb SHA512 e085af48e4196a44e9ebd63bf1234cf4401f158d23d03ffb38fcfe43284d025abe6c0b5e46b2808b28f300b933ff12523f64ac2d86d3f344aa2e0aea95e30cb0
-DIST xrootd-5.1.1.tar.gz 2869346 BLAKE2B daad5f4e1253dce7d83d144aabbbd24afca9affafc6643b8e7124c68ff8651a3a15ed1b40680a40b737411132ccd0b697d4cacfcdd2bd64d5b5640875684c464 SHA512 aee5373f2064eaa489abc7a560ca61b98f824e8f0b3665dbea82e0362a91a3b4f9e6457d0a304692ae58619ef7c16333a8c69a69d282bd48948a968dd4a06e4f
-DIST xrootd-5.2.0.tar.gz 2935040 BLAKE2B 1aa58ea188faef3e3691e77b08529d14e0bf04c18127b8b8ae6a7154700af67b1d900b64cf4f505b90963e2925e32935d4bcf9d1d913ba0973713b5c69301dd2 SHA512 cfd41d2e678ad339677abb62f329828de368ea5af9c9103722b75bcbb0812a2f1695986ca953651e2418fc839d7a50072635b806c9292aeaff702e269bbc11da
 DIST xrootd-5.3.1.tar.gz 2957788 BLAKE2B 6669ce4811e6c65ef17f06ae219e19e1f12027f4f9b620ad447df53ac437b30ce6425dc783a0ac7e4557d18ab562c266ac2497d93e93a2058fe5bd4aa7bc1d42 SHA512 a65436fe649233bb28123d9529d496c11b4ff40ba5490cbcbb32ff5379e555cfd684fad350c784c80e70056bb5d2e9701a80543c7f4a8ceb11e935aea01800b3
-EBUILD xrootd-5.0.3-r1.ebuild 2659 BLAKE2B ef00e762b9a87844071def65dc36e910ac6983f307e34d0c9d788e50f0d4a8ac62fb0b448298309f682073a467213a11e1eab3f918a7692b1e7f2715800add77 SHA512 c7dbe619f7d07d208bf0f7b13d6e56ec7b607e59a30f610cb00842ed7414661b945e2d978bd296af7317eb0259e92a16a1fc54b3e5e60bb9c6ffa7f4dabf1d5a
-EBUILD xrootd-5.1.1-r1.ebuild 2661 BLAKE2B 74ac0bb6b496b92b34c356531719bf8cf11ecd2b626fe54deb3236a5a53d76ee879f8ab9974546f8b4e4365aa7079a34705a3c4d794384fc9f802c71fd1517d4 SHA512 21a1ab43f2cd6c6fe55db4ab0bcfdbb82e837921cc20b6e34f99e5d785de41439df2bd396253bfbf4199e6d0c56b6a48411bb18a6cf1719c27f8e9aeff885b5a
-EBUILD xrootd-5.2.0-r1.ebuild 2662 BLAKE2B f334ec858c7d994f95681b8e3e11ff88aa5cfc5b188eb8813d201f249a9fb947087003543cc211b2effe3d5b6afe1c1d3d22b342a22251cee0e7adf87c09f1e3 SHA512 9d01f933228d78dc39234be3a40b6fa0991d73fe290e195bd58dd05e8f76557d636b2f3b3e845c86e4da506f6994509da071114710aa5648e9346b5f5d944bb1
-EBUILD xrootd-5.3.1.ebuild 2662 BLAKE2B 45c31e1c64310416a568c636a7ae6b01c59a252de9b22ec50644be593fd6f1a0ee318df13814b11a8ab6b6fd604081cc4550b6135ac9ecd30e51c54c77491106 SHA512 10e2c064d38c951cff50375c58222d5e231e0e64fe7785d9ef747420dbb43d0b50a357dc463e8146ec46968c3ba64443dc10cd029202e845b3fc953ce63a0aa6
-MISC metadata.xml 841 BLAKE2B 5d6a775f6e0b2b092b3d553cd400e936e7103b82cf97ca8c57e63cdaeecb4d9e36ad8bf2e82f21e6bc91a9748e13d78451f33dd9e3881790c3a3539b48912e99 SHA512 4e0e03c54deee1fce38ff239cba4ca934515023d590353c32ea47ca58f78699ecff01a35be0c33de30d5781ac37d3130c2a77d3aedd77798bae967eb126b28b5
+DIST xrootd-5.4.0.tar.gz 3225065 BLAKE2B cda6b14fae4c4c8d34367fa3ff448c02bf3ecda9c6bb4029d3a6b53370a57445ac25de77d5324dd4dab8c92cda77490efdbb862e4db6b926e19ad3363278f046 SHA512 59f93db433f0e88439d5edfffb75d7813bae253e50c390fe8c43ef924bc36f5f4a56db9b00a44013c60c4b4bd5a0accaff2a8ca793fe37e59dc77dd8ab8f6837
+EBUILD xrootd-5.0.3-r1.ebuild 2666 BLAKE2B 553cea29036e2bfc922ab6604f66d001acc838c800b478131f46a674406b3f6302a7c4439e162496507a13ff7b0ef7665abe37edfcf5eadeff96720a5a908592 SHA512 daa560edcd935fc8ae9c21013fc5c83257ffc1eace97f2bf9aa90666d615b5206c817462f5f5fef84573a6e86db23f71a66afb5443829bfa7495bca716a8b384
+EBUILD xrootd-5.3.1.ebuild 2669 BLAKE2B 8a2fb7476bad3e7c018572b25502f7764a894def158c1a242d1db43064010672d40922114bcfb5266ef3d04605265a409663bfdd6c7b7bd5a394df0a1fb3b5e3 SHA512 b9775cbd2d27aea34839255059023e5019f828c201953ce6d1bbd899c9eb35eaf0664d32ad3adc801682210eb4442186ce0ec0d240fdbb8686d6f631d4bc1602
+EBUILD xrootd-5.4.0.ebuild 2959 BLAKE2B 26f003fdf3caed2bdfa4308b9868f94b07c1352b2950324ee53c717274d20a761b8dbfff285b11743b4608e23c05778f5d332c4417bb859accda0d62e40a3c71 SHA512 1f73a0f22645206068ab8669108c6acff07475e5fdaae31bd741544889816a9de9c28a7764023a7e5733e05c278575e255dc0079edcb1435213abce6b0f169a7
+MISC metadata.xml 914 BLAKE2B fa0f01645c7e2fb128738a2439e1614e83c0a5fea40efa894ae3e9ba5ab302b419e03b2f10563e406caefcda6318661cd25aa3fbb8976039bf3d4e82fdd22141 SHA512 cd9046d8cb1f45f3c20a8ada0a85282f798dea1c431eafa516ae72351f27492757e59f623eb20b526569a415a31bf8749491681488f5db99622ce2f772b3dfef
diff --git a/net-libs/xrootd/metadata.xml b/net-libs/xrootd/metadata.xml
index 07427db64e20..a911c7c2e75c 100644
--- a/net-libs/xrootd/metadata.xml
+++ b/net-libs/xrootd/metadata.xml
@@ -9,12 +9,13 @@
   XROOTD software framework is a fully generic suite for fast, low latency
   and scalable data access, which can serve natively any kind of data,
   organized as a hierarchical filesystem-like namespace, based on the
-  concept of directory. 
+  concept of directory.
   It is usually used with <pkg>sci-physics/root</pkg> and its PROOF
   facilities for cluster computing in high energy physics.
 </longdescription>
   <use>
     <flag name="fuse">Enable the <pkg>sys-fs/fuse</pkg> filesystem driver</flag>
     <flag name="http">Enable http protocol support</flag>
+    <flag name="server">Install xrootd server and related plug-ins</flag>
   </use>
 </pkgmetadata>
diff --git a/net-libs/xrootd/xrootd-5.0.3-r1.ebuild b/net-libs/xrootd/xrootd-5.0.3-r1.ebuild
index 260b6f8047ba..63d03a9265a8 100644
--- a/net-libs/xrootd/xrootd-5.0.3-r1.ebuild
+++ b/net-libs/xrootd/xrootd-5.0.3-r1.ebuild
@@ -27,7 +27,7 @@ CDEPEND="acct-group/xrootd
 	kerberos? ( virtual/krb5 )
 	python? ( ${PYTHON_DEPS} )
 	readline? ( sys-libs/readline:0= )
-	ssl? ( dev-libs/openssl:0= )
+	ssl? ( <dev-libs/openssl-3.0.0:0= )
 "
 DEPEND="${CDEPEND}"
 BDEPEND="
diff --git a/net-libs/xrootd/xrootd-5.2.0-r1.ebuild b/net-libs/xrootd/xrootd-5.2.0-r1.ebuild
deleted file mode 100644
index 0b53eaf8ca75..000000000000
--- a/net-libs/xrootd/xrootd-5.2.0-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-# Upstream does not support the building of Python bindings
-# via CMake for more than one implementation at a time.
-inherit cmake python-single-r1
-
-DESCRIPTION="Extended ROOT remote file server"
-HOMEPAGE="http://xrootd.org/"
-SRC_URI="http://xrootd.org/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples fuse http kerberos python readline ssl test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="acct-group/xrootd
-	acct-user/xrootd
-	sys-libs/zlib
-	virtual/libcrypt:=
-	fuse? ( sys-fs/fuse:= )
-	kerberos? ( virtual/krb5 )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	ssl? ( dev-libs/openssl:0= )
-"
-DEPEND="${CDEPEND}"
-BDEPEND="
-	doc? (
-		app-doc/doxygen[dot]
-		python? ( dev-python/sphinx )
-	)
-	test? ( dev-util/cppunit )
-"
-RDEPEND="${CDEPEND}
-	dev-lang/perl
-"
-REQUIRED_USE="
-	http? ( kerberos ssl )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-PATCHES=( "${FILESDIR}"/xrootd-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
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_CRYPTO=$(usex ssl)
-		-DENABLE_FUSE=$(usex fuse)
-		-DENABLE_HTTP=$(usex http)
-		-DENABLE_KRB5=$(usex kerberos)
-		-DENABLE_PYTHON=$(usex python)
-		-DENABLE_READLINE=$(usex readline)
-		-DENABLE_TESTS=$(usex test)
-	)
-	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
-
-	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 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.3.1.ebuild b/net-libs/xrootd/xrootd-5.3.1.ebuild
index 7f1abe069f44..a33ccf3fde4d 100644
--- a/net-libs/xrootd/xrootd-5.3.1.ebuild
+++ b/net-libs/xrootd/xrootd-5.3.1.ebuild
@@ -27,7 +27,7 @@ CDEPEND="acct-group/xrootd
 	kerberos? ( virtual/krb5 )
 	python? ( ${PYTHON_DEPS} )
 	readline? ( sys-libs/readline:0= )
-	ssl? ( dev-libs/openssl:0= )
+	ssl? ( <dev-libs/openssl-3.0.0:0= )
 "
 DEPEND="${CDEPEND}"
 BDEPEND="
diff --git a/net-libs/xrootd/xrootd-5.1.1-r1.ebuild b/net-libs/xrootd/xrootd-5.4.0.ebuild
index dd384c7040ef..b13ed2e2e71d 100644
--- a/net-libs/xrootd/xrootd-5.1.1-r1.ebuild
+++ b/net-libs/xrootd/xrootd-5.4.0.ebuild
@@ -1,22 +1,22 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 # Upstream does not support the building of Python bindings
 # via CMake for more than one implementation at a time.
 inherit cmake python-single-r1
 
 DESCRIPTION="Extended ROOT remote file server"
-HOMEPAGE="http://xrootd.org/"
-SRC_URI="http://xrootd.org/download/v${PV}/${P}.tar.gz"
+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 python readline ssl test"
+IUSE="doc examples fuse http kerberos python readline +server ssl systemd test"
 RESTRICT="!test? ( test )"
 
 CDEPEND="acct-group/xrootd
@@ -27,12 +27,14 @@ CDEPEND="acct-group/xrootd
 	kerberos? ( virtual/krb5 )
 	python? ( ${PYTHON_DEPS} )
 	readline? ( sys-libs/readline:0= )
-	ssl? ( dev-libs/openssl:0= )
+	ssl? ( <dev-libs/openssl-3.0.0:0= )
+	systemd? ( sys-apps/systemd:= )
 "
 DEPEND="${CDEPEND}"
 BDEPEND="
 	doc? (
 		app-doc/doxygen[dot]
+		virtual/latex-base
 		python? ( dev-python/sphinx )
 	)
 	test? ( dev-util/cppunit )
@@ -43,6 +45,7 @@ RDEPEND="${CDEPEND}
 REQUIRED_USE="
 	http? ( kerberos ssl )
 	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( server )
 "
 
 PATCHES=( "${FILESDIR}"/xrootd-4.8.3-crc32.patch )
@@ -57,6 +60,8 @@ pkg_setup() {
 	use python && python_setup
 }
 
+# FIXME: no systemd automagic!
+# FIXME: support xrdec - currently only builds against bundled isa-l
 src_configure() {
 	local mycmakeargs=(
 		-DENABLE_CRYPTO=$(usex ssl)
@@ -66,6 +71,7 @@ src_configure() {
 		-DENABLE_PYTHON=$(usex python)
 		-DENABLE_READLINE=$(usex readline)
 		-DENABLE_TESTS=$(usex test)
+		-DXRDCL_ONLY=$(usex server "no" "yes")
 	)
 	cmake_src_configure
 }
@@ -94,12 +100,14 @@ src_install() {
 	keepdir /var/log/xrootd
 	fowners xrootd:xrootd /var/log/xrootd
 
-	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 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)"