gentoo resync : 25.11.2020

4 files changed, 129 insertions, 7 deletions

diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index f7ac2e291aa9..7d75eb5ffbb7 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -5,10 +5,12 @@ AUX xrootd-4.12.4-http_secret_leakage.patch 1339 BLAKE2B 47ff77bbc2c5a4d2ef0dafb
 AUX xrootd-4.8.3-crc32.patch 1987 BLAKE2B be57f7be2a897a2399f923e4670d219be79053221cc62ca0f6cf9b7abe6fae4f99dde0ccc72f6617bb07a871a396072db59aa57265382dab7928cbffdac1706e SHA512 4c390ed4329f21839ca2b481408c0114e5d4839cf0b04e673677e175c2e7e92573c9f56ec69660d4f5256c824676f65f9fb6c683d0e77d3b1f97bee7e5f65bc9
 AUX xrootd.confd 651 BLAKE2B a35bf51b82334757dbd27bd48923e59f955361ab009c4b92eef83050d5d4e23904abc2b0b9577f8a5888c875c34bf736cf4072b6684a91ca6ad8cd90fe9a2ba9 SHA512 60ab5b6d77cf79437960044bf201127c8adf5134e7f61a18dcccd2e474a4e41eda971e3ada71dea987716080fb308af98a5237bab2a0b82f50f932ff59e3fdea
 AUX xrootd.initd 858 BLAKE2B 306970196c9f69db3f94c095c8518b837f5f4723a1cbae273273821e4d77d30a7fe65ac4fccbb640ad5e0b6f879e549dbbc4e799f87b5b5c813d66f2d270af2b SHA512 dcdb75341d904c9850c2bf97393ccbb68ad37b095e0a20ca4dab27b10dd7525874c8ad6e07e5b9c1f3c3566391a50c06dee70622d865fa51a7e73aa4096da955
-DIST xrootd-4.12.0.tar.gz 2564041 BLAKE2B 6ea9c379aa482c81279168baa3e1381e880d34014fb3516c96961da64d54faf649295f024313ece445df9a62b6b5c818b7aa8a987025d3cd969188de072648c9 SHA512 5338c4fb5461918473dd4f41f4d29fae09a8fc6a9e2d8f00bb74d929dc5396fef73643462d1a4f1ba71ffe5cf92a1695a167ca3a766c674a9377dcf99aaa1778
 DIST xrootd-4.12.4.tar.gz 2577360 BLAKE2B f2e4413bcbf02dccb1ac7b0ceec8fbc2bb8b1de838cd9753c9d61f76fc2d68e845a41075b63a4afe56b1a434cf89ecf4f4b8571fa9ae866a19e6bcadcc5dcd9b SHA512 8cbc5e5f270f39c48b7c75a15e2721ebb793f13419608834777f39bc0ee7dd8c4fad481367f997172dae5029d9e5e4e9d7870843bd5c9957fa9fe439592c4364
+DIST xrootd-4.12.5.tar.gz 2580794 BLAKE2B 217abb8ad332b3eb0cbe2289f4fa7c31abce7c3122ef8d23f409a3a03b7691f0e8a1939a42c831774e6902bf0f3242a2583bbf010478a66f5a2e634008799c5b SHA512 c252866ccdc4465c9ffe3f5cb4bb83a2a70e775db5ff3a55bcd8ac70c72d280ea41fb31501f30550d8ac61b6d474ce602e0ee8a02485f1f2722617aeb25aff0d
 DIST xrootd-5.0.2.tar.gz 2764503 BLAKE2B 35bc642d3601738135ff24a77f9bc8795568553856284ebe80d90315039d04109353d2e00310f8b8168f6b1176ee295c9116a7e6adaff33ca23383da9deecf17 SHA512 e58b5484c0fa9f83643e252eb8228f2061130b4f97964283a6adb8a81560841f3d44814572136023d944be6bdd97cff551e75bbfb04e6c9aafaa779ecb051255
-EBUILD xrootd-4.12.0.ebuild 2517 BLAKE2B 80d5848ae7082e174e89e877d468929fb95ffd8663a74d1aec792ecbc533c7d3fbebd8405e78b2987aa055345dea02a4d6d60cd34657ed72b2eba0509adfd003 SHA512 56e62ed7a09bdd941a01bcac483e852cdb6fb12f241266af3e004361729bbda789299b32077bfe48116e69f9b87bebdec4ccea79bf4ae2f017f43c705d3c524d
-EBUILD xrootd-4.12.4.ebuild 2603 BLAKE2B d1a63f322e8b1ac35560cc8a0b4769fe10c83556171a2c434af40d6d70787b6a6356ce100fab44d5e202db11806737d7037357d2fb4db1395c34f7ba18afb4f0 SHA512 d18c1fbad414b4cf4f94f6123749880d4d3369a7479aef27554ce03b0ff0f61132f5c1ec79a169112cb7cf1d547ec515ba178ccff7d5de5c784b8613037c88bc
+DIST xrootd-5.0.3.tar.gz 2766694 BLAKE2B 1fe7743de4d09c95257c3d761c2056024ba3ba59b7cd86b5926f2d32cc2f85dcd0af69e6e5969967591a2bba293902b757395e0f9375cbbbb39577eed9e450eb SHA512 e085af48e4196a44e9ebd63bf1234cf4401f158d23d03ffb38fcfe43284d025abe6c0b5e46b2808b28f300b933ff12523f64ac2d86d3f344aa2e0aea95e30cb0
+EBUILD xrootd-4.12.4.ebuild 2601 BLAKE2B f611a35164556ebe4a73b94b5bdf1a95c0d7c2babb35f7db432a73772c4c0344e4e4296f159960157059ae78bc8b73c50caa545ef0c2aa429dbd044b0f732a3c SHA512 091c283618469e7f247d0ac83c37be8c231c13343159fba60a3f45f95a700f26a8c5ee3790d7cab18503d4c4704aa30a3a018e5ef05a60614d2e0da2e00f8bb5
+EBUILD xrootd-4.12.5.ebuild 2603 BLAKE2B d1a63f322e8b1ac35560cc8a0b4769fe10c83556171a2c434af40d6d70787b6a6356ce100fab44d5e202db11806737d7037357d2fb4db1395c34f7ba18afb4f0 SHA512 d18c1fbad414b4cf4f94f6123749880d4d3369a7479aef27554ce03b0ff0f61132f5c1ec79a169112cb7cf1d547ec515ba178ccff7d5de5c784b8613037c88bc
 EBUILD xrootd-5.0.2.ebuild 2641 BLAKE2B 677f3e6a2c92ea6ce412fa9218f3a2cabb8d69931e1b0baf6ac9d54b96e82dce377ea61ebade7d4c7c770e66c9fea5858488082c3357443fb4f958a46095e0da SHA512 b218ec45615c4d15fff2916d0c2b0fe1ba93879c4d3d1ce6e9f558ab9dd157ada66739efdf453144f6d078bcb832825635d9d5f1cefd986ba9a3ef78d04229b6
+EBUILD xrootd-5.0.3.ebuild 2641 BLAKE2B 677f3e6a2c92ea6ce412fa9218f3a2cabb8d69931e1b0baf6ac9d54b96e82dce377ea61ebade7d4c7c770e66c9fea5858488082c3357443fb4f958a46095e0da SHA512 b218ec45615c4d15fff2916d0c2b0fe1ba93879c4d3d1ce6e9f558ab9dd157ada66739efdf453144f6d078bcb832825635d9d5f1cefd986ba9a3ef78d04229b6
 MISC metadata.xml 840 BLAKE2B 47b6a6dc8459145124fbc5555f39ef7d3c4a77ef0c4377237a16b37e459f69250442a53ef078498d2b37648f93becd9f46080e71dcca7373a4061d6642bcca0d SHA512 d197a0dda77d491fd3b7a6eeff70d77bd28e7b1faef61b6ca3e523b974653e64448adfc4bbee1c11aa6bf746a85e7a5f1c6e76a76a8d8c3431c45d17ca46ec36
diff --git a/net-libs/xrootd/xrootd-4.12.4.ebuild b/net-libs/xrootd/xrootd-4.12.4.ebuild
index 105a4611edcc..89ccb0b92650 100644
--- a/net-libs/xrootd/xrootd-4.12.4.ebuild
+++ b/net-libs/xrootd/xrootd-4.12.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://xrootd.org/download/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples fuse http kerberos python readline ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/xrootd/xrootd-4.12.0.ebuild b/net-libs/xrootd/xrootd-4.12.5.ebuild
index 3974f5488b24..105a4611edcc 100644
--- a/net-libs/xrootd/xrootd-4.12.0.ebuild
+++ b/net-libs/xrootd/xrootd-4.12.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://xrootd.org/download/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples fuse http kerberos python readline ssl test"
 RESTRICT="!test? ( test )"
 
@@ -42,12 +42,16 @@ REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
 
-PATCHES=( "${FILESDIR}"/xrootd-4.8.3-crc32.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.8.3-crc32.patch
+	"${FILESDIR}"/${PN}-4.12.4-http_secret_leakage.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"
+QA_SONAME="/usr/lib.*/libXrd.*-$(ver_cut 1).so
+	/usr/lib.*/libXrdClTests\.so"
 
 pkg_setup() {
 	use python && python_setup
diff --git a/net-libs/xrootd/xrootd-5.0.3.ebuild b/net-libs/xrootd/xrootd-5.0.3.ebuild
new file mode 100644
index 000000000000..b96f560be940
--- /dev/null
+++ b/net-libs/xrootd/xrootd-5.0.3.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+# 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
+	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
+}