From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 484A015801B for ; Sat, 8 Apr 2023 20:56:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5B19FE0874; Sat, 8 Apr 2023 20:56:46 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0F1CEE0874 for ; Sat, 8 Apr 2023 20:56:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 17EBE33BEA3 for ; Sat, 8 Apr 2023 20:56:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C8B4C9FA for ; Sat, 8 Apr 2023 20:56:42 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1680987380.222a063bb53094f1da370667f3b48bdc2d59ef2a.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/xrootd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/xrootd/xrootd-5.5.4-r1.ebuild X-VCS-Directories: net-libs/xrootd/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 222a063bb53094f1da370667f3b48bdc2d59ef2a X-VCS-Branch: master Date: Sat, 8 Apr 2023 20:56:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 95ca08c3-6f79-48e5-9199-0dacd0aacfdd X-Archives-Hash: 245afe5aec13ff0ecfa807ee8168b03c commit: 222a063bb53094f1da370667f3b48bdc2d59ef2a Author: Marek Szuba gentoo org> AuthorDate: Sat Apr 8 20:07:49 2023 +0000 Commit: Marek Szuba gentoo org> CommitDate: Sat Apr 8 20:56:20 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=222a063b net-libs/xrootd: fix regressions introduced between 5.4.3-r2 and 5.5.0 Signed-off-by: Marek Szuba gentoo.org> net-libs/xrootd/xrootd-5.5.4-r1.ebuild | 190 +++++++++++++++++++++++++++++++++ 1 file changed, 190 insertions(+) diff --git a/net-libs/xrootd/xrootd-5.5.4-r1.ebuild b/net-libs/xrootd/xrootd-5.5.4-r1.ebuild new file mode 100644 index 000000000000..ea3bc8cea605 --- /dev/null +++ b/net-libs/xrootd/xrootd-5.5.4-r1.ebuild @@ -0,0 +1,190 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_OPTIONAL=1 +DISTUTILS_USE_PEP517="setuptools" +DOCS_BUILDER="doxygen" +DOCS_DEPEND=" + media-gfx/graphviz + virtual/latex-base + python? ( dev-python/sphinx ) +" + +inherit cmake docs 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="examples fuse http kerberos +libxml2 python readline +server systemd test" + +RESTRICT="!test? ( test )" + +CDEPEND="acct-group/xrootd + acct-user/xrootd + dev-libs/openssl:0= + net-libs/davix + 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=" + 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-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=( + -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex libxml2 "no" "yes") + -DCMAKE_DISABLE_FIND_PACKAGE_systemd=$(usex systemd "no" "yes") + -DENABLE_FUSE=$(usex fuse) + -DENABLE_HTTP=$(usex http) + -DENABLE_KRB5=$(usex kerberos) + -DENABLE_MACAROONS=no + -DENABLE_PYTHON=$(usex python) + -DENABLE_READLINE=$(usex readline) + -DENABLE_SCITOKENS=no + -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 python; then + pushd "${BUILD_DIR}"/bindings/python > /dev/null || die + distutils-r1_src_compile + popd > /dev/null || die + fi + + docs_compile + # secondary documentation for python bindings + if use python && use doc; then + emake -C bindings/python/docs html + 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() { + dodoc docs/ReleaseNotes.txt + cmake_src_install + find "${ED}" \( -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 +}