From d5599da3055bf9b900513a61c3c6e4bdbb524503 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 8 Jun 2023 15:45:39 +0100 Subject: gentoo auto-resync : 08:06:2023 - 15:45:39 --- net-libs/xrootd/Manifest | 4 +- net-libs/xrootd/metadata.xml | 2 + net-libs/xrootd/xrootd-5.5.5-r1.ebuild | 212 +++++++++++++++++++++++++++++++++ net-libs/xrootd/xrootd-5.5.5.ebuild | 205 ------------------------------- 4 files changed, 216 insertions(+), 207 deletions(-) create mode 100644 net-libs/xrootd/xrootd-5.5.5-r1.ebuild delete mode 100644 net-libs/xrootd/xrootd-5.5.5.ebuild (limited to 'net-libs/xrootd') diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest index 1bfca84ec954..5a56027db322 100644 --- a/net-libs/xrootd/Manifest +++ b/net-libs/xrootd/Manifest @@ -14,5 +14,5 @@ DIST xrootd-5.5.5.tar.gz 3243062 BLAKE2B 697dbd9d42e3fd9c6d2cf86a1c120e3752e74ab EBUILD xrootd-5.4.3-r2.ebuild 4627 BLAKE2B c3820362346a32f41c9a9afe447854211af4a2015e3e0950b98e18e6346ec9ec7528ae3ec7cef8be29dbaf069a9188dce4fad2a31023c87cb82cef709dc03c03 SHA512 705bd4e6189c67a0b7f31dc96241b086145268a13113826292ab6b00fdf739c497c67cb00033f5f42181f51dcc0476bf816fc5daf2dbace16d14c989fecd8589 EBUILD xrootd-5.4.3.ebuild 3186 BLAKE2B 39211730f3cf2da1f616c3cb88e0fbe5449b534fdb9612c47f919537162fb1cb14e4a225feeeed6b51428ae51c7550d31a875b71a0c1b5b3ee3b12e2cd474f26 SHA512 3ab16277df556260c833c1a60cb47c964ffefa7cef623aba61038d73be6959f2dbae41f2ccef28e95274472d0995a840347128fb38d4e5d8f171af709d8267f2 EBUILD xrootd-5.5.4-r1.ebuild 4747 BLAKE2B b998c253caf6335c65a071d9ad58b3481e24c697ba53506d38751284561f3fdd89f89f9b42d30789b168d8bc83ed6d96b0d12fed781cb6ee61c1751f142f2ac9 SHA512 064dad4eb4c39910149ad0a9a98519ae44e93038a000f9df4d5f8e4981267d681994bf033a75dfb711ae504368ac76c3852dcfeae3b3aae04874eafa203e724c -EBUILD xrootd-5.5.5.ebuild 5131 BLAKE2B 1db4765c9c86cdebb0737961e69c8dd388343ed578fdaf0aa64d77e2199d86d949d9a0e8e4b737605854597f31d8dc65b8cde3702ab73174a607ad31c4f0bc37 SHA512 9714cf15a9d19f2c449bb019052f5b03e0cf5400191e07ec967c3a6c3c43e863ecf924b9edabee7b871a0b2e3d0069a1d2b1f0378bdf7b13ffbd2a26853c7f0f -MISC metadata.xml 1223 BLAKE2B 91d347d56ce4e60e13a50f8331a9f6ae5d8030c71d0ce42273637b305b83334e5b5e1652f96396faf4d5ce669dc8d970d4eafaaa32ce21ed7b6e7378013347ba SHA512 9dbcae7cd57b4b1ad3809b7adf02d6053d5d476bdf6ce4b20a41897e550281e68c8a58fe9a8fd6a08fccc61adc384c7123c8a5a02b226522c32a52a26f8ce5a3 +EBUILD xrootd-5.5.5-r1.ebuild 5323 BLAKE2B 7f447697571190745567e5e6225e4694d399e62d2e18b5a13a27af2859a9e87d899264bb8592d955410deef91c511879b8d84cebd8446afab4e537898564e3da SHA512 fd2ce0e94e4be67261d519ecf1c3aef653d1965f4a664f563a7554f51f56ecd4a84946abcabdf5bf50363ab29ccdcd305ec21aadb51b96ae5b062f99c4069a9e +MISC metadata.xml 1425 BLAKE2B 6bd0a688dd2a671d6e8086896d10b2aa05b2e033b21c60bb7c622ad1f07d982777a9848317d2ba43dad5ac0e0973419c2df5ed30948ec1441c7ee1cd0d8959da SHA512 f1e8720586dbceb895562a3ecfdc059aa840b4a9fbc49f0e51dd1e886e7f1fa13b79db4d1cb487f66e06232e9f4ade043e967ec387d315ad8a05e28244640d65 diff --git a/net-libs/xrootd/metadata.xml b/net-libs/xrootd/metadata.xml index 16c259164057..3b614243b413 100644 --- a/net-libs/xrootd/metadata.xml +++ b/net-libs/xrootd/metadata.xml @@ -20,6 +20,8 @@ Enable the sys-fs/fuse filesystem driver Enable http protocol support Use dev-libs/libxml2 for XML parsing (preferred) instead of bundled tinyxml + Enable support for macaroons with dev-libs/libmacaroons + Enable support for scitokens with dev-cpp/scitokens-cpp Install xrootd server and related plug-ins Enable erasure coding support (XrdEc plugin) with dev-libs/isa-l diff --git a/net-libs/xrootd/xrootd-5.5.5-r1.ebuild b/net-libs/xrootd/xrootd-5.5.5-r1.ebuild new file mode 100644 index 000000000000..7b7be06008c8 --- /dev/null +++ b/net-libs/xrootd/xrootd-5.5.5-r1.ebuild @@ -0,0 +1,212 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_EXT=1 +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 systemd + +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 macaroons python readline scitokens +server systemd test xrdec" + +REQUIRED_USE=" + macaroons? ( server ) + scitokens? ( server ) +" + +RESTRICT="!test? ( test )" + +CDEPEND="acct-group/xrootd + acct-user/xrootd + dev-libs/openssl:0= + sys-libs/zlib + virtual/libcrypt:= + fuse? ( sys-fs/fuse:0= ) + http? ( + net-misc/curl:= + net-libs/davix + ) + kerberos? ( virtual/krb5 ) + libxml2? ( dev-libs/libxml2:2= ) + macaroons? ( dev-libs/libmacaroons ) + python? ( ${PYTHON_DEPS} ) + readline? ( sys-libs/readline:0= ) + scitokens? ( dev-cpp/scitokens-cpp ) + systemd? ( sys-apps/systemd:= ) + xrdec? ( dev-libs/isa-l ) +" +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 + "${FILESDIR}"/${PN}-5.5-system-isa-l.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=( + -DUSE_SYSTEM_ISAL=TRUE + -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=$(usex macaroons) + -DENABLE_PYTHON=$(usex python) + -DENABLE_READLINE=$(usex readline) + -DENABLE_SCITOKENS=$(usex scitokens) + -DENABLE_TESTS=$(usex test) + -DENABLE_VOMS=no + -DENABLE_XRDCL=yes + -DENABLE_XRDCLHTTP=$(usex http) + -DENABLE_XRDEC=$(usex xrdec) + -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, they require a docker environment with various containers. + # The tests below are the ones which do not require a server to be running. + ./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 + + 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 + + if use systemd; then + systemd_dounit packaging/common/*.{service,socket} + fi + fi + + # base configs + insinto /etc/xrootd + doins packaging/common/*.cfg + + keepdir /etc/xrootd/config.d + keepdir /var/log/xrootd + + fowners -R xrootd:xrootd /etc/xrootd + fowners -R xrootd:xrootd /var/log/xrootd + + 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)/libXrd*Test*.so || die "Failed to remove test libraries from installed tree" + fi +} diff --git a/net-libs/xrootd/xrootd-5.5.5.ebuild b/net-libs/xrootd/xrootd-5.5.5.ebuild deleted file mode 100644 index 9137e1925da2..000000000000 --- a/net-libs/xrootd/xrootd-5.5.5.ebuild +++ /dev/null @@ -1,205 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -DISTUTILS_EXT=1 -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 systemd - -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 xrdec" - -RESTRICT="!test? ( test )" - -CDEPEND="acct-group/xrootd - acct-user/xrootd - dev-libs/openssl:0= - sys-libs/zlib - virtual/libcrypt:= - fuse? ( sys-fs/fuse:0= ) - http? ( - net-misc/curl:= - net-libs/davix - ) - kerberos? ( virtual/krb5 ) - libxml2? ( dev-libs/libxml2:2= ) - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:0= ) - systemd? ( sys-apps/systemd:= ) - xrdec? ( dev-libs/isa-l ) -" -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 - "${FILESDIR}"/${PN}-5.5-system-isa-l.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=( - -DUSE_SYSTEM_ISAL=TRUE - -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 - -DENABLE_XRDCL=yes - -DENABLE_XRDCLHTTP=$(usex http) - -DENABLE_XRDEC=$(usex xrdec) - -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, they require a docker environment with various containers. - # The tests below are the ones which do not require a server to be running. - ./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 - - 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 - - if use systemd; then - systemd_dounit packaging/common/*.{service,socket} - fi - fi - - # base configs - insinto /etc/xrootd - doins packaging/common/*.cfg - - keepdir /etc/xrootd/config.d - keepdir /var/log/xrootd - - fowners -R xrootd:xrootd /etc/xrootd - fowners -R xrootd:xrootd /var/log/xrootd - - 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)/libXrd*Test*.so || die "Failed to remove test libraries from installed tree" - fi -} -- cgit v1.2.3