From 90c88731bd036e5698b281fbc0a5f3aa4c9983ac Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 29 Jun 2020 11:38:31 +0100 Subject: gentoo resync : 29.06.2020 --- net-libs/xrootd/Manifest | 13 +-- .../files/xrootd-4.8.3-Werror_only_Debug.patch | 22 ---- net-libs/xrootd/metadata.xml | 1 - net-libs/xrootd/xrootd-4.11.1.ebuild | 113 ------------------- net-libs/xrootd/xrootd-4.12.0.ebuild | 2 +- net-libs/xrootd/xrootd-4.12.1.ebuild | 113 ------------------- net-libs/xrootd/xrootd-4.12.3.ebuild | 2 +- net-libs/xrootd/xrootd-4.8.3.ebuild | 119 --------------------- 8 files changed, 5 insertions(+), 380 deletions(-) delete mode 100644 net-libs/xrootd/files/xrootd-4.8.3-Werror_only_Debug.patch delete mode 100644 net-libs/xrootd/xrootd-4.11.1.ebuild delete mode 100644 net-libs/xrootd/xrootd-4.12.1.ebuild delete mode 100644 net-libs/xrootd/xrootd-4.8.3.ebuild (limited to 'net-libs/xrootd') diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest index 353b0aeb5a7c..dcedf026979d 100644 --- a/net-libs/xrootd/Manifest +++ b/net-libs/xrootd/Manifest @@ -1,18 +1,11 @@ AUX cmsd.initd 885 BLAKE2B 9198afa01850da74519a6869894ebd86313f87781e3e2401d429e5e05a938a19a583feca808f78c4b497fd459a8adaece01d0482b132646033575cd50ad5b1b7 SHA512 7f666e98634b205964d69fd540fb79c7ff3b6f1b423ed416a966d1e0d6a18d950908e1dc463e3cc8029fc062b2ff7d29693af8e5af2fb13a36500d40b16345e9 AUX frm_purged.initd 895 BLAKE2B c192a3c69d3161a8342242789cfc1559f189c0748cd0bdd1ee6baf9b5ba98c80d8103fa55344e1c9b040a513045c7a473272da46c800ff2afa45a0665a93c3b2 SHA512 f9c09f8baae7ed391d5248f5dfb7a1d4d60f23605b2646e6f3c2ec33b05838918a4ba4874424e9b4e674f1ca127d57760364552f6f948dcd3ef84245730efc30 AUX frm_xfrd.initd 899 BLAKE2B bdfc83f7bbad7e0d7aea91720798c10367c7ac27851414b99013c01d4f9681e010082bfef332ba2cc520afdbef67051ea80ee6922e515a30de32e735f0a6c6a7 SHA512 1c38b20c9b54cab17706c040a90b00df61c9b2f5e4e7a9cc26fa3b125e1d132097222921b5627a33f69b80c8ae5a64cfbaea0a4880588de9fa9d18f6aaa04768 -AUX xrootd-4.8.3-Werror_only_Debug.patch 1183 BLAKE2B 482ea67f3138600b3e3a2de22986526366cac6e854ffc09ff613601a7ec7d71de796129137eb2df47feccb232c5c2160286ef3328834da76960819a914a6475a SHA512 48cb86f5e5ea4fa1c238048aebc775db3d6611c6b3f61adcf692715dcdd0dba4d0c4fafbef3beeaa4690723c9684ccf899e236cd1a4e772f55ac31bb4b597839 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.11.1.tar.gz 2549971 BLAKE2B e131769291d33d2198c4afdedd0d9f9a0eac9459654277763554d2dfba211b7123f3d0dfc90fe365c7f4da2590d9bec6daf994ee7ae241897aa10b4500362c3c SHA512 7853de40d40f28177f70a18f17ee99f83c8b6c6ddf0b5e7ef64df83c5457bad11e6249c75f985c207c3292fab73a2181730ce9c8bf11979535a566c5364de8a1 DIST xrootd-4.12.0.tar.gz 2564041 BLAKE2B 6ea9c379aa482c81279168baa3e1381e880d34014fb3516c96961da64d54faf649295f024313ece445df9a62b6b5c818b7aa8a987025d3cd969188de072648c9 SHA512 5338c4fb5461918473dd4f41f4d29fae09a8fc6a9e2d8f00bb74d929dc5396fef73643462d1a4f1ba71ffe5cf92a1695a167ca3a766c674a9377dcf99aaa1778 -DIST xrootd-4.12.1.tar.gz 2564202 BLAKE2B df6334884d12ea68d98f5e8d1c83bb44d9a7d9232f1350323beff8de3815fd24711a90b5180824c9a9fd3f9e4f45ad3448bb32cde57efd646343bf2fd202237e SHA512 8d5c7029ccad8cb898ff41671e6f360154549df926b1fb5e7747503bed477f7bf1daec7addbc5a832b76f0f5c40ef8fdcda708907389fa790c3b87a944af4d93 DIST xrootd-4.12.3.tar.gz 2574996 BLAKE2B 1ba6ecdee473fbe1f6367459dfe8324f38e2d72aa64ed349ccdcaa7616a3d70f0b647d2eac6babbcc0e1b673ff44a050c05f23e80fb89161f121fa6dd3484311 SHA512 e4f4ad744a71a7fc69a16f2114b6d5962ddf0b22bd86f7eb19703313d55242813f13be1a1f23c541b966674bdb4854f955843322525f37bc83647e8f2fbe076d -DIST xrootd-4.8.3.tar.gz 2390520 BLAKE2B 1b97225c41f6a3a751f55a4d357f53fac2e4cc24f2456962a6d6282b78faaeb844db5d69bff34437acd2c015dbff4a2a5047d6295770abd200d3e5bedd89d4fe SHA512 6f605131be18f35115bf7cf5d829dfd5a36e004ac69aa77dd0cb34ab70f2b89ff07e7b3e3259fe672d81b6241596c78a537de02e5abad4537dc92ae745ae8911 -EBUILD xrootd-4.11.1.ebuild 2516 BLAKE2B fda9ae309307fbdc7c6b2996ecc305d310e1750e47f044744e9fc1f15b45b452c0c7b4b1e49f33c15346cc6458462a9b3a19e3af6a72b3e55cb61cf467c3ac8e SHA512 8d386d956d6c323bf54f07d7c02065cb477ff3b2f77fa40f3d894e6a8aa767133c5fec7ee879de530ec6478e8f9bd3ce45b47fb8d13db3c267333f088a8b19dc -EBUILD xrootd-4.12.0.ebuild 2529 BLAKE2B 0106134cbcaa6578797f4a1f9ab36bc6897ecdf8c6769a8abe2883167f2c06cc659715961159f450c352e7dacbcfdba5e707665e5975414c6601fda53242be1a SHA512 58ccd291ebef8ce57ed499d00e22a463c430e884f5e18b36f671918924e4ceee38267c8e3d3b87f70fd420f5135941e29508289051e20dd3dd9b87eaa141c29e -EBUILD xrootd-4.12.1.ebuild 2529 BLAKE2B 0106134cbcaa6578797f4a1f9ab36bc6897ecdf8c6769a8abe2883167f2c06cc659715961159f450c352e7dacbcfdba5e707665e5975414c6601fda53242be1a SHA512 58ccd291ebef8ce57ed499d00e22a463c430e884f5e18b36f671918924e4ceee38267c8e3d3b87f70fd420f5135941e29508289051e20dd3dd9b87eaa141c29e -EBUILD xrootd-4.12.3.ebuild 2529 BLAKE2B 0106134cbcaa6578797f4a1f9ab36bc6897ecdf8c6769a8abe2883167f2c06cc659715961159f450c352e7dacbcfdba5e707665e5975414c6601fda53242be1a SHA512 58ccd291ebef8ce57ed499d00e22a463c430e884f5e18b36f671918924e4ceee38267c8e3d3b87f70fd420f5135941e29508289051e20dd3dd9b87eaa141c29e -EBUILD xrootd-4.8.3.ebuild 2672 BLAKE2B 6d7ca5ca0dde690749a3f704935c2ea93ab7323fc2bb55a63fd5b4b595f11f2829440e690b2b5decb2fa576926e05901c6b42144914cb4fa369007bd25e3c603 SHA512 7f368cc50498ac135739a2b51dfa13a2501cfc9421dc9f7d92f09fdce1e3868a87b4ac1c68459dfb467bfb2f9f4798ee4eafc2f9b6c19e0609c1a4a0ef7252af -MISC metadata.xml 934 BLAKE2B f490ed604e1135f4440e805a5c7e6ee239326ea716074f1952361efc95d1763ab1ed7e3d9ed883f801430986181104313560092a329994b4a5caf478efec72e9 SHA512 44828821d0307904163a2a818855efc7c68029be18aa0e11ea07bd99d794c433888bcf74a19632a7e3b68494192e6d8c2b9d30b9c33aea748e8b03ebd44efb25 +EBUILD xrootd-4.12.0.ebuild 2527 BLAKE2B a48f6d68fa7926aee485c8f56a4a33d7d661e633c2875271acc35e7fbac66132ce8fcb999d8ba58dc561ba59da3bad5d08e9ff0284dec4f5c58a5b675ec6caf6 SHA512 e401d9e3a10f2c28be18243cd64132de5f079ca5c9db9f18df5c179560b47b9ea3e0bf471a7257f3f15956e4d552a5442b2ad02f969808c1643721fb0e7f2c2c +EBUILD xrootd-4.12.3.ebuild 2519 BLAKE2B 395695d7458e091905988112f84008e6b6ec67cd5ebd5ea76cdf04ff7f2ffdbcf3ae35b7a94aec178fdecddbb8eb2e9db984a017cc73eaad59cd42fa3e006e4c SHA512 4fea5f8371f05507a25c20472600b0b4fe085442e81b0acec0dea3fbe65483836da1ffca4fa70f639f81aba336aaf83b7e0467b7a7dd879bdd98da2ac99907e0 +MISC metadata.xml 840 BLAKE2B 47b6a6dc8459145124fbc5555f39ef7d3c4a77ef0c4377237a16b37e459f69250442a53ef078498d2b37648f93becd9f46080e71dcca7373a4061d6642bcca0d SHA512 d197a0dda77d491fd3b7a6eeff70d77bd28e7b1faef61b6ca3e523b974653e64448adfc4bbee1c11aa6bf746a85e7a5f1c6e76a76a8d8c3431c45d17ca46ec36 diff --git a/net-libs/xrootd/files/xrootd-4.8.3-Werror_only_Debug.patch b/net-libs/xrootd/files/xrootd-4.8.3-Werror_only_Debug.patch deleted file mode 100644 index 2f0a64b13fd8..000000000000 --- a/net-libs/xrootd/files/xrootd-4.8.3-Werror_only_Debug.patch +++ /dev/null @@ -1,22 +0,0 @@ -Only set -Werror - which among other things prevents xrootd-4.8.3 from being -compiled with gcc-9 - either in debug mode or when explicitly requested. -Backport of the change made upstream in 4.10. ---- a/cmake/XRootDOSDefs.cmake -+++ b/cmake/XRootDOSDefs.cmake -@@ -26,7 +26,15 @@ - #------------------------------------------------------------------------------- - if( CMAKE_COMPILER_IS_GNUCXX ) - set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x" ) -- set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror" ) -+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra" ) -+ #----------------------------------------------------------------------------- -+ # Set -Werror only for Debug (or undefined) build type or if we have been -+ # explicitly asked to do so -+ #----------------------------------------------------------------------------- -+ if( ( CMAKE_BUILD_TYPE STREQUAL "Debug" OR "${CMAKE_BUILD_TYPE}" STREQUAL "" -+ OR FORCE_WERROR ) ) -+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror" ) -+ endif() - set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter" ) - # gcc 4.1 is retarded - execute_process( COMMAND ${CMAKE_C_COMPILER} -dumpversion diff --git a/net-libs/xrootd/metadata.xml b/net-libs/xrootd/metadata.xml index ecd16e038b97..b961d03874b4 100644 --- a/net-libs/xrootd/metadata.xml +++ b/net-libs/xrootd/metadata.xml @@ -16,6 +16,5 @@ Enable the sys-fs/fuse filesystem driver Enable http protocol support - Enable rados block device support via sys-cluster/ceph diff --git a/net-libs/xrootd/xrootd-4.11.1.ebuild b/net-libs/xrootd/xrootd-4.11.1.ebuild deleted file mode 100644 index 735dfba08105..000000000000 --- a/net-libs/xrootd/xrootd-4.11.1.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 python3_{6,7,8} ) - -inherit cmake-utils 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*-4.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-utils_src_configure -} - -src_compile() { - cmake-utils_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-utils_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-4.12.0.ebuild b/net-libs/xrootd/xrootd-4.12.0.ebuild index 6acdc5a472ee..414f5edd4dc1 100644 --- a/net-libs/xrootd/xrootd-4.12.0.ebuild +++ b/net-libs/xrootd/xrootd-4.12.0.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.1.ebuild b/net-libs/xrootd/xrootd-4.12.1.ebuild deleted file mode 100644 index 6acdc5a472ee..000000000000 --- a/net-libs/xrootd/xrootd-4.12.1.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 python3_{6,7,8} ) - -inherit cmake-utils 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" - -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-utils_src_configure -} - -src_compile() { - cmake-utils_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-utils_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-4.12.3.ebuild b/net-libs/xrootd/xrootd-4.12.3.ebuild index 6acdc5a472ee..17545ef3217e 100644 --- a/net-libs/xrootd/xrootd-4.12.3.ebuild +++ b/net-libs/xrootd/xrootd-4.12.3.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6,7,8} ) inherit cmake-utils python-single-r1 diff --git a/net-libs/xrootd/xrootd-4.8.3.ebuild b/net-libs/xrootd/xrootd-4.8.3.ebuild deleted file mode 100644 index df36a3d62137..000000000000 --- a/net-libs/xrootd/xrootd-4.8.3.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit cmake-utils python-single-r1 user - -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 rbd ssl test" -RESTRICT="!test? ( test )" - -CDEPEND=" - !