gentoo resync : 22.12.2021

4 files changed, 19 insertions, 41 deletions

diff --git a/net-libs/xrootd-ceph/Manifest b/net-libs/xrootd-ceph/Manifest
index 3ac12ad5206e..2e381068f425 100644
--- a/net-libs/xrootd-ceph/Manifest
+++ b/net-libs/xrootd-ceph/Manifest
@@ -1,9 +1,8 @@
+AUX xrootd-ceph-5.4.0_no-werror.patch 537 BLAKE2B c07404d729e6b8328c849125b543d2d31df51c05d97dd7481c39762c5b32a20b6e9715afdd9db448d90b06be15b6207021bf1c213593c8c2046304c4c284e312 SHA512 1418e185a6c799ebf9d4eb97044055cba3afdfd8f742f08e34f6cea8a01f795cf538a7a3ec1b387e9cbdba01776bbad27d83f8c58898c3f128d369c342830ce9
 DIST xrootd-ceph-5.0.3.tar.gz 81835 BLAKE2B 1be45c78dd0ec4b20451cfa4a8a579e076e718509a47fa04027207c12e433338decefb9f82749cc15cae3cad75d97485fe0a7d6582cdcc0739bd222bc1d97b6b SHA512 3338a0ab0446e4c7ee3d232f5cce8f93c49e040b4792aa52f9dcf6f27f6767e6ffbaff17eb30a87c5b3ff713e1b0c4edb24d8d116c91351c4ed0c13963f80fc9
-DIST xrootd-ceph-5.1.1.tar.gz 81981 BLAKE2B 6f0ddfd2e20c0127223d3d41e614fbefefb8e1ce20ae9a805fc0d01d7c442f0b9b9323ba1761a9b5a160f63bfe1c823384f84c160eb98d316bddc3c1affe2b6c SHA512 fede94cbe614b6c7dced07d1bbe8661706c0e0c98c77cab0a777b62cb7b1a0790ce597bb6764b36b6d2cba9884f23f6d37d54adb5b11cb6d20e32b95a2877ef3
-DIST xrootd-ceph-5.2.0.tar.gz 82017 BLAKE2B 604c2c9eae857f05160b3cd853591283c5aebdec2345a810d2454f34bc22768db15f973ca9f672e6522297f939586ca8e996222487e2c1733205159521bf4996 SHA512 fdfe71c9bd087d216c2c4536b130cf90a392032ac8d0ad294b8ee7358449cbdf779f0f5d5aca02062cc04f510678bc6171f3dd29ad1f7aa207617aa3dfbd6f54
 DIST xrootd-ceph-5.3.1.tar.gz 82029 BLAKE2B 1946da121e620c68ddafe448f049d4495ec5326cfc0286944cea41cb940ac8982ced939989efddb3879baa694c34f93f75f6e58c00b75c5d385da863daa15154 SHA512 bcf4fc341644e6c4d2c83b4bc913203187385964da3d00d019d69de0e0abd19915a5194713574bb1b8562e80edd3eeefb6fee1762e7c8595b14d13657c237861
+DIST xrootd-ceph-5.4.0.tar.gz 82031 BLAKE2B 5c964597d7b8de3a217c7df58e214d58e1bfdc980f74cfbc571343e7325d61804060e6374912f02a3f73e4df721c87e38860a023de4422b58878915a52aa04b1 SHA512 7b33fc194fe5245de78daa7829dd978c96b1eccd979610e26d60ed0c284e192413192b2b581e5a18de25d6f7f93737598d180b6d5419307156a6abdea44c4b27
 EBUILD xrootd-ceph-5.0.3.ebuild 953 BLAKE2B 3be28efa893f4d0a7b9a37229e460acea95e45f3714901e499ed05010199722a7e8000faa75b12b55a79fcd1e101a51c9e427604891cae7f71cb95736b188539 SHA512 e0d229329f66f98099a15968b2965a9136c59d6eda74857531cfc56a29e304488ddfd2c37e618983f95fe37d0f0596419f98b1aee429a45a63fe82d29e7625cd
-EBUILD xrootd-ceph-5.1.1.ebuild 954 BLAKE2B 5a3a42d548a67994e6a20fcd5747c7f3e28ad5e67dd65f1b29c5b9f06fa39bca44101283791011a2f3fb2ea8c1577a188deb1cb0ab7db97f522fb23bf9925123 SHA512 d172a7eac4a2f2a23241257cba29df211fdba7bd136dcb7f0960c7f2c1fd19a3f043ad24be1fbf14a312435b16608592d7f303dd86fd2e5de04e9794002706b3
-EBUILD xrootd-ceph-5.2.0.ebuild 866 BLAKE2B 4940f24e57982d9e0c1f19f3e7d9a9a5ef31e57b7a76f4a6d4830b5028dd018617c0296566781c490839994d5ef51d9c4eca627199051322f78e240f507d0368 SHA512 224ca2782fc5776fad99d4bfcd657e919dcf2f7b8edbcb1acca6d7fe02d5f592daa62c67ef0e7ad5e0fdd9aeb0f9b259e37442fd7b93ae7e70236e77ec91426b
 EBUILD xrootd-ceph-5.3.1.ebuild 866 BLAKE2B a36c00db48baef5e8c6c3ae3fa6ae0d18b9e7bfe1fe4147043ed119b5c58cc644759d4e4efbcfa7f83afef6f3418c51414dc99973937b1e43181de73eb3af762 SHA512 00c2ea7a0891f71c9dd78ca4772f7bf473fce35ba89852ec3907e51985279acb459c191fee26532da0edde0e2e54880f969cdc96d01a7e72fa21c37904b7a840
+EBUILD xrootd-ceph-5.4.0.ebuild 922 BLAKE2B 48d47fbb6ec16ddd0fe68007cb086d9ae2511179e59af7d4e31305eab1079be36cfbd44c5ab11aa8ff064d9a1b504cf805dc24aed36cc69f1c5d83c8eaf551a3 SHA512 db5d1e4e5ef59181077dad5f649f3a0fcb35fb90f6a4e6f2c31daa409d102261f25a9ce69c6c18cf262d35839e8dc83ac6e3880251981646e369fb512945461c
 MISC metadata.xml 497 BLAKE2B 00adeee3406c60c439ddc3855a8e470837ef34c5e29b26641255df7833fb59f1f68e62316fdb359012683415291f8af9ea21d6be59547bae4d3aa02fa8179fb4 SHA512 81179966535b582a62bd4e758dd55839b8c3063f6a7666eb8720dabd78ce4a77c143c2afd0367031ba483088d4e5769e3e35e9b04fcd4f9f1844aac03f7c53c3
diff --git a/net-libs/xrootd-ceph/files/xrootd-ceph-5.4.0_no-werror.patch b/net-libs/xrootd-ceph/files/xrootd-ceph-5.4.0_no-werror.patch
new file mode 100644
index 000000000000..f67fb513b455
--- /dev/null
+++ b/net-libs/xrootd-ceph/files/xrootd-ceph-5.4.0_no-werror.patch
@@ -0,0 +1,11 @@
+--- a/cmake/XRootDOSDefs.cmake
++++ b/cmake/XRootDOSDefs.cmake
+@@ -12,7 +12,7 @@
+ #-------------------------------------------------------------------------------
+ if( CMAKE_COMPILER_IS_GNUCXX )
+   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" )
+-  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror" )
++  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra" )
+   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-ceph/xrootd-ceph-5.1.1.ebuild b/net-libs/xrootd-ceph/xrootd-ceph-5.1.1.ebuild
deleted file mode 100644
index bdacb70cc802..000000000000
--- a/net-libs/xrootd-ceph/xrootd-ceph-5.1.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="xrootd OSS plug-in for interfacing with Ceph storage platform"
-HOMEPAGE="https://xrootd.slac.stanford.edu/"
-SRC_URI="https://github.com/xrootd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=net-libs/xrootd-5.0.0
-	sys-cluster/ceph"
-RDEPEND="${DEPEND}"
-BDEPEND="test? ( dev-util/cppunit )"
-
-# 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.*/libXrdCeph.*-$(ver_cut 1)\.so
-	/usr/lib.*/libXrdCephTests\.so"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_TESTS=$(usex test)
-		# As of 5.0.3 the default plug-in version is still 4.
-		-DPLUGIN_VERSION=$(ver_cut 1)
-	)
-	cmake_src_configure
-}
diff --git a/net-libs/xrootd-ceph/xrootd-ceph-5.2.0.ebuild b/net-libs/xrootd-ceph/xrootd-ceph-5.4.0.ebuild
index a9f500fa3351..9267d0cbd7b8 100644
--- a/net-libs/xrootd-ceph/xrootd-ceph-5.2.0.ebuild
+++ b/net-libs/xrootd-ceph/xrootd-ceph-5.4.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake
 
@@ -20,6 +20,10 @@ DEPEND=">=net-libs/xrootd-5.0.0
 RDEPEND="${DEPEND}"
 BDEPEND="test? ( dev-util/cppunit )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.4.0_no-werror.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