gentoo resync : 19.05.2018

5 files changed, 182 insertions, 6 deletions

diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest
index 760ccc28df7c..2f203dae8bd5 100644
--- a/net-libs/xrootd/Manifest
+++ b/net-libs/xrootd/Manifest
@@ -1,11 +1,14 @@
 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-crc32.patch 1987 BLAKE2B be57f7be2a897a2399f923e4670d219be79053221cc62ca0f6cf9b7abe6fae4f99dde0ccc72f6617bb07a871a396072db59aa57265382dab7928cbffdac1706e SHA512 4c390ed4329f21839ca2b481408c0114e5d4839cf0b04e673677e175c2e7e92573c9f56ec69660d4f5256c824676f65f9fb6c683d0e77d3b1f97bee7e5f65bc9
 AUX xrootd-no-werror.patch 486 BLAKE2B 031cf2f55d47c0cd65ca7caa1fc2ef787b74cee315f43039710ba44b311d1e850ceaf7a97e9a6ad760b4cb413b03dfbabff652fde1a1b6a6c01c7b0ce734ede2 SHA512 9a866518836d61416ca4e40587dc9fb81121c7b2c245b9d26053058cef6d2ec75b94c687929378e1ed7287432a99f91888f4a138536447dd934ac03e484f5a4f
 AUX xrootd.confd 651 BLAKE2B a35bf51b82334757dbd27bd48923e59f955361ab009c4b92eef83050d5d4e23904abc2b0b9577f8a5888c875c34bf736cf4072b6684a91ca6ad8cd90fe9a2ba9 SHA512 60ab5b6d77cf79437960044bf201127c8adf5134e7f61a18dcccd2e474a4e41eda971e3ada71dea987716080fb308af98a5237bab2a0b82f50f932ff59e3fdea
 AUX xrootd.initd 858 BLAKE2B 306970196c9f69db3f94c095c8518b837f5f4723a1cbae273273821e4d77d30a7fe65ac4fccbb640ad5e0b6f879e549dbbc4e799f87b5b5c813d66f2d270af2b SHA512 dcdb75341d904c9850c2bf97393ccbb68ad37b095e0a20ca4dab27b10dd7525874c8ad6e07e5b9c1f3c3566391a50c06dee70622d865fa51a7e73aa4096da955
 DIST xrootd-4.4.0.tar.gz 2146909 BLAKE2B 4ea84a0c395984cf3ca0f072d3dab080a128e8554f20f7347f9622430b1adc8bda279fa3c8cd587260affe432700332ce7cbb6f512bc29d7d7921b2c6a349bdc SHA512 3e81285b97b928830538f358daf358538609d1678d5beb23b8c0f8fdda7ad22895cc96ba0aaadf55892b7cba08a60182fee19e27af3225b638cb209a4146bbfa
 DIST xrootd-4.5.0.tar.gz 2172752 BLAKE2B 0e1251f9b064e5bf5e0bf9df0575a9605c4437eddecca312bbfad5ce91b9e3e83ff14a00b7ba1b3e3305f1bd00b5dce151241293441852da95f439788671c4f7 SHA512 0ffa982b872ac94eae1e26d1ebbb94db46f607fb4b0f1d4a2261a7d34dc7715b67cb7c7beecea300f82578bf4773d18e9b86c55b32dfd65ab2e48f3cbb03f173
-EBUILD xrootd-4.4.0.ebuild 1998 BLAKE2B 6b6d3536ec242d178eb1f339396ad1f61505ef6bec53cedefb2db34439e9f516ea35c7b6322110e0dfd2d4e5cd990edc8068f3356c51325f240fbcb41de1a431 SHA512 16394e1339dd97893c89063a14e78476cee973317e3f24adc6563dc0de4689a4b524afe7a7395beb06cc62f4d5149c1ee0d69bc5d03298ba21a97ca0cac46b6d
-EBUILD xrootd-4.5.0.ebuild 2600 BLAKE2B 0fa8301766d6baf2ee12ce55719d2bd7cc8eb8afa64bb1714a557b922d9fdb4654991e26d9eacd5f41e54343e9ea7fd26827641b284bee1e75fc52484a617d30 SHA512 9700666b53a38fe5d24965823a71e73ee0dcf90dade960a9af16153f8f266e7cb24daeb327a10a2ff7a867e603c162eaf6df13393880784da6e470233d1dafc9
+DIST xrootd-4.8.3.tar.gz 2390520 BLAKE2B 1b97225c41f6a3a751f55a4d357f53fac2e4cc24f2456962a6d6282b78faaeb844db5d69bff34437acd2c015dbff4a2a5047d6295770abd200d3e5bedd89d4fe SHA512 6f605131be18f35115bf7cf5d829dfd5a36e004ac69aa77dd0cb34ab70f2b89ff07e7b3e3259fe672d81b6241596c78a537de02e5abad4537dc92ae745ae8911
+EBUILD xrootd-4.4.0.ebuild 2000 BLAKE2B 8734736459d1058c63f0719d304bf832854b2d4e880bee58de1626c7b0d81913793bbaf910991df25a6aadcc08d6e99dcb214849bd908139b9cf47e92f39e135 SHA512 1330f545925b50a3be116ef6ecb9fe28bdf1afa3da77527c9903d7a9dc403824905cb9c18febe581bc37589e80b8a14066a02e6f895f04c54b0e138d761442dd
+EBUILD xrootd-4.5.0.ebuild 2602 BLAKE2B ffaedff2f1b50f2fc3950f771f80365f3dd239704d37ee93de4cd8eb60e066c8a542615b85f7ce1b9775ccb48d41d6223fcfe56ee750623e3daba2c430465e25 SHA512 594dfc5e60edfc965b8ed82ddda1f112b96d9ec5dab5adcf911d45ba4ed276cbb37a31532c0f3d1b1d251abe440557df8b7338628f0bd2a5c62c778e48c68892
+EBUILD xrootd-4.8.3.ebuild 2598 BLAKE2B a871ab01d2e84b74948090ab93c88015e99e77fd29cfb9c686adf376953ca4b329b8345434755446478a9cf085e72c15dff07cbbb8353a61ceb199b615fb0c54 SHA512 d7fe4f320806598da1fa487b56cca952efdc092a38958e9c902880ac8dfd4d347c04538aa7d6e4b7c4541af2939ea49adaed648af8af71389c1e0fb23c3f66d6
 MISC metadata.xml 934 BLAKE2B f490ed604e1135f4440e805a5c7e6ee239326ea716074f1952361efc95d1763ab1ed7e3d9ed883f801430986181104313560092a329994b4a5caf478efec72e9 SHA512 44828821d0307904163a2a818855efc7c68029be18aa0e11ea07bd99d794c433888bcf74a19632a7e3b68494192e6d8c2b9d30b9c33aea748e8b03ebd44efb25
diff --git a/net-libs/xrootd/files/xrootd-4.8.3-crc32.patch b/net-libs/xrootd/files/xrootd-4.8.3-crc32.patch
new file mode 100644
index 000000000000..9f27c4369880
--- /dev/null
+++ b/net-libs/xrootd/files/xrootd-4.8.3-crc32.patch
@@ -0,0 +1,58 @@
+From 64f81b7fad227097f5e135d25a5574cfecf4d50d Mon Sep 17 00:00:00 2001
+From: Guilherme Amadio <amadio@cern.ch>
+Date: Fri, 18 May 2018 11:30:58 +0200
+Subject: [PATCH] Remove declarations of crc32 and adler32
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+These break compilation with the error below:
+
+xrootd-4.8.3/tests/XrdSsiTests/XrdShMap.cc:
+    In function ‘int DoA32(const char*)’:
+xrootd-4.8.3/tests/XrdSsiTests/XrdShMap.cc:418:34:
+    error: expected initializer before ‘OF’
+ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
+                              ^^
+---
+ src/XrdSsi/XrdSsiShMam.cc     | 2 +-
+ tests/XrdSsiTests/XrdShMap.cc | 3 ---
+ 2 files changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/src/XrdSsi/XrdSsiShMam.cc b/src/XrdSsi/XrdSsiShMam.cc
+index 013dc855..a4803d71 100644
+--- a/src/XrdSsi/XrdSsiShMam.cc
++++ b/src/XrdSsi/XrdSsiShMam.cc
+@@ -882,7 +882,7 @@ bool XrdSsiShMam::GetItem(void *data, const char *key, int hash)
+ /******************************************************************************/
+   
+ int XrdSsiShMam::HashVal(const char *key)
+-{  ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len));
++{
+    uLong crc;
+    int hval, klen = strlen(key);
+ 
+diff --git a/tests/XrdSsiTests/XrdShMap.cc b/tests/XrdSsiTests/XrdShMap.cc
+index bb642ac3..860fa7ad 100644
+--- a/tests/XrdSsiTests/XrdShMap.cc
++++ b/tests/XrdSsiTests/XrdShMap.cc
+@@ -415,7 +415,6 @@ void Explain(const char *what)
+   
+ int DoA32(const char *buff)
+ {
+-   ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
+    uLong adler = adler32(0L, Z_NULL, 0);
+ 
+ // Check for ID request now
+@@ -438,8 +437,6 @@ int DoA32(const char *buff)
+   
+ int DoC32(const char *buff)
+ {
+-   ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len));
+-
+ // Check for ID request now
+ //
+    if (!buff) {int myID; memcpy(&myID, "c32 ", sizeof(int)); return myID;}
+-- 
+2.17.0
+
diff --git a/net-libs/xrootd/xrootd-4.4.0.ebuild b/net-libs/xrootd/xrootd-4.4.0.ebuild
index 77d78382d960..0ce88643fb1e 100644
--- a/net-libs/xrootd/xrootd-4.4.0.ebuild
+++ b/net-libs/xrootd/xrootd-4.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ IUSE="doc fuse http kerberos readline ssl test"
 RDEPEND="
 	!<sci-physics/root-5.32[xrootd]
 	sys-libs/zlib
-	fuse? ( sys-fs/fuse )
+	fuse? ( sys-fs/fuse:0 )
 	kerberos? ( virtual/krb5 )
 	readline? ( sys-libs/readline:0= )
 	ssl? ( dev-libs/openssl:0= )"
diff --git a/net-libs/xrootd/xrootd-4.5.0.ebuild b/net-libs/xrootd/xrootd-4.5.0.ebuild
index 9026596f259a..9e8e5f1338bc 100644
--- a/net-libs/xrootd/xrootd-4.5.0.ebuild
+++ b/net-libs/xrootd/xrootd-4.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ IUSE="doc examples fuse http kerberos python readline rbd ssl test"
 CDEPEND="
 	!<sci-physics/root-5.32[xrootd]
 	sys-libs/zlib
-	fuse? ( sys-fs/fuse )
+	fuse? ( sys-fs/fuse:0 )
 	kerberos? ( virtual/krb5 )
 	python? ( ${PYTHON_DEPS} )
 	rbd? ( sys-cluster/ceph )
diff --git a/net-libs/xrootd/xrootd-4.8.3.ebuild b/net-libs/xrootd/xrootd-4.8.3.ebuild
new file mode 100644
index 000000000000..e43d7d367bd6
--- /dev/null
+++ b/net-libs/xrootd/xrootd-4.8.3.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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"
+
+CDEPEND="
+	!<sci-physics/root-5.32[xrootd]
+	sys-libs/zlib
+	fuse? ( sys-fs/fuse:= )
+	kerberos? ( virtual/krb5 )
+	python? ( ${PYTHON_DEPS} )
+	rbd? ( sys-cluster/ceph )
+	readline? ( sys-libs/readline:0= )
+	ssl? ( dev-libs/openssl:0= )
+"
+DEPEND="${CDEPEND}
+	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}"/${P}-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() {
+	enewgroup xrootd
+	enewuser xrootd -1 -1 "${EPREFIX}"/var/spool/xrootd xrootd
+	use python && python_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_CEPH=$(usex rbd)
+		-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
+}