From fea4a05eed382195ccf0fd9536eb165d60bd2c5f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 4 Jul 2023 10:08:01 +0100 Subject: gentoo auto-resync : 04:07:2023 - 10:08:01 --- net-libs/xrootd/Manifest | 9 +- net-libs/xrootd/xrootd-5.4.3-r2.ebuild | 187 --------------------------------- net-libs/xrootd/xrootd-5.4.3.ebuild | 133 ----------------------- net-libs/xrootd/xrootd-5.5.4-r1.ebuild | 2 +- net-libs/xrootd/xrootd-5.5.5-r1.ebuild | 12 +-- net-libs/xrootd/xrootd-5.6.0.ebuild | 16 ++- 6 files changed, 16 insertions(+), 343 deletions(-) delete mode 100644 net-libs/xrootd/xrootd-5.4.3-r2.ebuild delete mode 100644 net-libs/xrootd/xrootd-5.4.3.ebuild (limited to 'net-libs/xrootd') diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest index e1cdc148dd9f..d18f9e585a6f 100644 --- a/net-libs/xrootd/Manifest +++ b/net-libs/xrootd/Manifest @@ -8,13 +8,10 @@ AUX xrootd-5.4.3-python_tests_py3.patch 4491 BLAKE2B 61e3eb0e10de6e746b1447c7a1d AUX xrootd-5.5-system-isa-l.patch 9637 BLAKE2B f46dfec0b4abcc0ddb01575b823d74c2345b02d5c951359baf64bf3a3d41bbe622014b82d11a4e8a642e7b5b95d6bfa7cdf896f1a02842a8065199a91c12c3a2 SHA512 33591ef5416276e5708d0adc3cf1f79d9eb19e80299e99b10ffd1a024f14c87ba83687b29df6f1bd251d0ec850ff8eec1b40a9384dbe26ea7e2f9018fed79878 AUX xrootd.confd 651 BLAKE2B a35bf51b82334757dbd27bd48923e59f955361ab009c4b92eef83050d5d4e23904abc2b0b9577f8a5888c875c34bf736cf4072b6684a91ca6ad8cd90fe9a2ba9 SHA512 60ab5b6d77cf79437960044bf201127c8adf5134e7f61a18dcccd2e474a4e41eda971e3ada71dea987716080fb308af98a5237bab2a0b82f50f932ff59e3fdea AUX xrootd.initd 858 BLAKE2B 306970196c9f69db3f94c095c8518b837f5f4723a1cbae273273821e4d77d30a7fe65ac4fccbb640ad5e0b6f879e549dbbc4e799f87b5b5c813d66f2d270af2b SHA512 dcdb75341d904c9850c2bf97393ccbb68ad37b095e0a20ca4dab27b10dd7525874c8ad6e07e5b9c1f3c3566391a50c06dee70622d865fa51a7e73aa4096da955 -DIST xrootd-5.4.3.tar.gz 3182127 BLAKE2B ed3f6a943167eafb5f6d7f78ca34f44c9a18b5ed672a4e622acb1e6e6997bd21756a30bf24f0b799ab4f16e7e1fb3f61a042f4e5e00f965b898fc5a287bf995a SHA512 189ec8e20901fd07093494187502e031a60d4ade22af33067313fad7a1bf6a6feb5c5d9d59d3a86d13a6a767e5a93cf4836da02e9cae11c81ccac07199898d72 DIST xrootd-5.5.4.tar.gz 3241021 BLAKE2B 505890ab7dbd0530d3c42390c9a6858cf0c8b53d42631b3bed615cb9b7c4d738bb791d26e625b010fef79f57291eb8bcd653ec629d240df92d37c12c973210f8 SHA512 1bf8fec3e20950e1dfbb5a7914c2f2b1d7d1fc1ce6b419dda129bb6cfb083ae674a14732b7b7330dee2287635749d91f8ee7e16badd71c723d189a1a44c309dd DIST xrootd-5.5.5.tar.gz 3243062 BLAKE2B 697dbd9d42e3fd9c6d2cf86a1c120e3752e74abbae2cf69be4c20292c568ad2f20fbea9320a2e22c04b53232d32915f9f7ea08c0e93117e8e72f181d5b642044 SHA512 864b4fe686c0a618a2672b624b7c5a00a4e87b4bd97842f8e25666b48a23f01e7d91d926013e9f435fb439a9c464ebbca8818720ec6c067c04d0603d1381cdba DIST xrootd-5.6.0.tar.gz 3277803 BLAKE2B afdad0bd311d670610e230899477364f7be322a87804b4fc21a914d0e4fb7b7b1917d5d00445d2b7568c11e6a80e2a75620979a8031cbd62daf78c525b9da2fb SHA512 98119f51eecc16551c7f69147dd736df2632d77983bb6090c5452cb08faf6413bd1c3a54a8bd158af2ccff404b95e7e0b1ef1b2f65651b9d4a64b2dc5895dd12 -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-r1.ebuild 5323 BLAKE2B 7f447697571190745567e5e6225e4694d399e62d2e18b5a13a27af2859a9e87d899264bb8592d955410deef91c511879b8d84cebd8446afab4e537898564e3da SHA512 fd2ce0e94e4be67261d519ecf1c3aef653d1965f4a664f563a7554f51f56ecd4a84946abcabdf5bf50363ab29ccdcd305ec21aadb51b96ae5b062f99c4069a9e -EBUILD xrootd-5.6.0.ebuild 4854 BLAKE2B ee28e0c0726c871f96f22169858afbae4d517a24fa0727e5acbbea5010cfc0e0f6e02e0d5206e975fc53061ef0b23a210563baf1e03878af938efe35eb88848e SHA512 aa45bb21389728c4670e3f6775778bff967732561e7b1f659976b59ad4cd13695460fbf5fef1fb6fe5e450e9fe726a19d5825e94754e1e8d31ab004abd682ee5 +EBUILD xrootd-5.5.4-r1.ebuild 4746 BLAKE2B 5cfbe7356851b74425a46ab3d1c591c850c7f2da41ba81c8986da8c7bc9d6c847d28711e6c20137b6d71f84b02cf3d12753c8d25fec76723aea001e9232fd4bd SHA512 dafc868aa612174b9fe080ed7897afe030c72b5f2dd40467812db64667d5473740a61fb095e6d70764245f54ff9ba9787c8fd5bb7505eb46915ce6fb01f518eb +EBUILD xrootd-5.5.5-r1.ebuild 5304 BLAKE2B 73260c8b04723a4b9703158b5ae4c7bddd5c993cb37edde61403a93dc455c794696c655d9ece0ddb80b50f960a7eff1ebc37d7e225c3a3067418b1270c597197 SHA512 3e5e7bbdaea81ad0d114856e4288c1a97519e7c88358ccbbae78f15d2a724f016b54a0706d51ddadac966fb3a8b5e44f973d6178dfacad5f10a134d16d1070cc +EBUILD xrootd-5.6.0.ebuild 4835 BLAKE2B cfc4f7ed78f91ca989eea89f2cec924c6efac364cccf2f975be3f4929328775a620aee628f5bf7678e4a5edd6cde3bcb685f3c70797ceee7a21932bb49bcd52a SHA512 acd36b10ddea57b0eb8c6672e9026c7a6b0afe815f955e75dee3d419598bfa8f4ad1f6fe1784b7a9c6818ce3a617a13e36437624ca8c768db9cb51028dad1132 MISC metadata.xml 1517 BLAKE2B a41f7e485316d636e61611a248b720da1d7d4a66a7faf731d96a299c6dd2c53f20b3ac077c6fbea209b6ff862067d1e32f68a121f9e9edcfe2afdbb30320c733 SHA512 07eb7d082a7a0fd97898a89fa130433ba507d70921de1b700904707bebea566efaefbf2044db2a97a0f931dccc3486a049cdfbf4118ea488de6991918c422b1b diff --git a/net-libs/xrootd/xrootd-5.4.3-r2.ebuild b/net-libs/xrootd/xrootd-5.4.3-r2.ebuild deleted file mode 100644 index fd1b2bdf0993..000000000000 --- a/net-libs/xrootd/xrootd-5.4.3-r2.ebuild +++ /dev/null @@ -1,187 +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_OPTIONAL=1 -DISTUTILS_USE_PEP517="setuptools" - -inherit cmake 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="doc examples fuse http kerberos +libxml2 python readline +server systemd test" - -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:= ) - kerberos? ( virtual/krb5 ) - libxml2? ( dev-libs/libxml2:2= ) - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:0= ) - systemd? ( sys-apps/systemd:= ) -" -DEPEND="${CDEPEND}" -BDEPEND=" - doc? ( - app-doc/doxygen[dot] - virtual/latex-base - python? ( dev-python/sphinx ) - ) - 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-no_automagic.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=( - -DENABLE_FUSE=$(usex fuse) - -DENABLE_HTTP=$(usex http) - -DENABLE_KRB5=$(usex kerberos) - -DENABLE_LIBXML2=$(usex libxml2) - -DENABLE_PYTHON=$(usex python) - -DENABLE_READLINE=$(usex readline) - -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 doc; then - doxygen Doxyfile || die - if use python; then - emake -C bindings/python/docs html - fi - fi - if use python; then - pushd "${BUILD_DIR}"/bindings/python > /dev/null || die - distutils-r1_src_compile - popd > /dev/null || die - 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() { - 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 - - 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 -} diff --git a/net-libs/xrootd/xrootd-5.4.3.ebuild b/net-libs/xrootd/xrootd-5.4.3.ebuild deleted file mode 100644 index 6f4cd2316201..000000000000 --- a/net-libs/xrootd/xrootd-5.4.3.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Upstream does not support the building of Python bindings -# via CMake for more than one implementation at a time. -PYTHON_COMPAT=( python3_{9..11} ) - -inherit cmake python-single-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="doc examples fuse http kerberos +libxml2 python readline +server systemd test" -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:= ) - kerberos? ( virtual/krb5 ) - libxml2? ( dev-libs/libxml2:2= ) - python? ( ${PYTHON_DEPS} ) - readline? ( sys-libs/readline:0= ) - systemd? ( sys-apps/systemd:= ) -" -DEPEND="${CDEPEND}" -BDEPEND=" - doc? ( - app-doc/doxygen[dot] - virtual/latex-base - python? ( dev-python/sphinx ) - ) - python? ( $(python_gen_cond_dep 'dev-python/pip[${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-no_automagic.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 -} - -# FIXME: support xrdec - currently only builds against bundled isa-l -src_configure() { - local mycmakeargs=( - -DENABLE_FUSE=$(usex fuse) - -DENABLE_HTTP=$(usex http) - -DENABLE_KRB5=$(usex kerberos) - -DENABLE_LIBXML2=$(usex libxml2) - -DENABLE_PYTHON=$(usex python) - -DENABLE_READLINE=$(usex readline) - -DENABLE_TESTS=$(usex test) - -DENABLE_VOMS=no - -DFORCE_ENABLED=yes - -DPIP_OPTIONS="--ignore-installed" # bug 861452 - -DXRDCL_ONLY=$(usex server "no" "yes") - ) - 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 - - 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)" - - 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.5.4-r1.ebuild b/net-libs/xrootd/xrootd-5.5.4-r1.ebuild index 543ccf619b46..4857db5da8b7 100644 --- a/net-libs/xrootd/xrootd-5.5.4-r1.ebuild +++ b/net-libs/xrootd/xrootd-5.5.4-r1.ebuild @@ -21,7 +21,7 @@ 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" +KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux" IUSE="examples fuse http kerberos +libxml2 python readline +server systemd test" RESTRICT="!test? ( test )" diff --git a/net-libs/xrootd/xrootd-5.5.5-r1.ebuild b/net-libs/xrootd/xrootd-5.5.5-r1.ebuild index 7b7be06008c8..b80cac774a68 100644 --- a/net-libs/xrootd/xrootd-5.5.5-r1.ebuild +++ b/net-libs/xrootd/xrootd-5.5.5-r1.ebuild @@ -26,8 +26,11 @@ 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 ) + http? ( kerberos ) + macaroons? ( server ) + python? ( ${PYTHON_REQUIRED_USE} ) + scitokens? ( server ) + test? ( server ) " RESTRICT="!test? ( test )" @@ -63,11 +66,6 @@ BDEPEND=" RDEPEND="${CDEPEND} dev-lang/perl " -REQUIRED_USE=" - http? ( kerberos ) - python? ( ${PYTHON_REQUIRED_USE} ) - test? ( server ) -" PATCHES=( "${FILESDIR}"/${PN}-4.8.3-crc32.patch diff --git a/net-libs/xrootd/xrootd-5.6.0.ebuild b/net-libs/xrootd/xrootd-5.6.0.ebuild index eb7a9c37b3a2..dd92b0da08dc 100644 --- a/net-libs/xrootd/xrootd-5.6.0.ebuild +++ b/net-libs/xrootd/xrootd-5.6.0.ebuild @@ -26,13 +26,16 @@ SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" SRC_URI="https://xrootd.slac.stanford.edu/download/v${PV}/${P}.tar.gz" +RESTRICT="!test? ( test )" + REQUIRED_USE=" - macaroons? ( server http ) - scitokens? ( server ) + http? ( kerberos ) + macaroons? ( server http ) + python? ( ${PYTHON_REQUIRED_USE} ) + scitokens? ( server ) + test? ( server ) " -RESTRICT="!test? ( test )" - CDEPEND="acct-group/xrootd acct-user/xrootd dev-libs/openssl:0= @@ -68,11 +71,6 @@ BDEPEND=" RDEPEND="${CDEPEND} dev-lang/perl " -REQUIRED_USE=" - http? ( kerberos ) - python? ( ${PYTHON_REQUIRED_USE} ) - test? ( server ) -" PATCHES=( "${FILESDIR}"/${PN}-4.8.3-crc32.patch -- cgit v1.2.3