gentoo resync : 18.11.2018

3 files changed, 20 insertions, 7 deletions

diff --git a/net-libs/davix/Manifest b/net-libs/davix/Manifest
index 3751f0c07522..2c455ac70584 100644
--- a/net-libs/davix/Manifest
+++ b/net-libs/davix/Manifest
@@ -1,7 +1,7 @@
 AUX davix-0.6.7-uio.patch 316 BLAKE2B 71bf63feb080a4c34f8b672516d8237149bee9d360c7b0d289ac6b226e65427651a688679ec42cc2bf30304a53211d33b06fdccdda228e90b40e21ed7da48cea SHA512 0874cc8c04118e97c176e901bfeaafa13d3a76ec8589b045845133f3f8633e7b75a007ba10990ac4ee1bfe344294d27265510f64171cecd9110fd0b41d71ada2
 AUX davix-0.6.7-uuid.patch 1868 BLAKE2B 24d94348745db5a6b85acca3d050dd7bf44f5b7eb2c7eded0771f251459bc391e4b8a22ad1ad685918525ff0ef89bd319e562a221530ce70807f2161efdef65d SHA512 683257bf61dca6394e5ab0b375e35ea3e28c85f0e01a308a514f91f1da18aca4c63f57e45db7b3862fd7d9e0f80e7129e518798241bfec1ddefd87affc1bad4e
 DIST davix-0.6.7.tar 3346429 BLAKE2B 7510c628cd1d346ed5f4dca6100207e5e2efa3a98d0caf63dbe3ba39f58a9b11c330c95cd2d40d60d8f2497355d4cb2f2d7537babfef287a5905f32322363d90 SHA512 5cb830e415a4ab87b7b046fbd8ba615379766f4fa4b886a271b0c248c05968b9a3cb144751b44d5fd62f5e07bdb7610c0505e44f2702147f6f006b49a4b3d8ce
-DIST davix-0.6.8.tar 3461829 BLAKE2B 96e23b3d099262b577a078aad9c6ac3adb6a0ab5dd410573a1886a886f828e46af2d6df9904236ae9f1aff5c75e7bec93c81e02bd173d67a13e9f9bfce3225c1 SHA512 7c0e2a427b2a9ad807d104e8ada732a6e806818e0b7b53caf965ce6238637e4c6f5c67e56e7ef89a23004531c62bc1ba6cb7ce1dd0d1aefdc46bdd7b8c48c9c4
-EBUILD davix-0.6.7.ebuild 1484 BLAKE2B cacdc4cf848fa97be6fc46f6cbfd651f4a0fb3e9b8b9a5c7f4290b9ec813781eda2ccce8da5513d290f8c2b527f9949271e0c009d3093660a97cb395ce58970c SHA512 cee6b67866faaae5330db9f60a17e71298a00cbb80b3e2efb674bb935a63f14f094f8e61c48f3df2d0f7b1b491d684474166a231e8abeee436d30076d5292579
-EBUILD davix-0.6.8.ebuild 1408 BLAKE2B eec0c2a2fd8a95d2d71035cd1a9170ed7d038760a8c4262a1185e40ccf43f817822b5e844bcaf3f00da77e34f60c7e5c8f83c14c09da7d2bc08865e66eef1a02 SHA512 46ccc73973ac813dababa673da10442f223be28beeb16a9305f9103c616062ef9a7707d282d08cf810027cd757a70b846c92859f16931cae20b9b3ce813800f8
+DIST davix-0.7.1.tar 4336124 BLAKE2B 5db4f8f03fef38feedb0f0a9dfce763ff53ba9b1aa19d09f0af979e111d9f52226222e7b00e48aa3589070e9bf857e000f297d1a162aac83fe877ce3cd2984e1 SHA512 a4408960c4e16011de5e6cea1470d7fa487fd0b9c462082d8fb800bcaa812cab10a92643c9eeb66dda506d177903917176e6310c2a10042a848a52b858f4eb4e
+EBUILD davix-0.6.7.ebuild 1479 BLAKE2B b443682bf8396040d259a69f39a5b6d3c04e8bd96f315aff99e84cad4a8afa571b2d3aaca24310b7f632739e43db129c595ed6ac1c404ccf98d05cb178887ecf SHA512 7032a772e90ed906f446f6e9ce1104545c6bf38c433914936759864402526197cb9aa6dfa0d586984fa7b19865aa96cf9c8b801a85a48171885a4bd566c135f1
+EBUILD davix-0.7.1.ebuild 1597 BLAKE2B b6e322e6c78ff1044750f95f6b767b320752a782824ffa3cd0a28b8f69e463ecb0d80f29af11f8d958144267d670a5f6fb95f26cf3f41e23f4fe3dd8349abd0d SHA512 b04f578b4096f521bab40cef92ff2a28ba3433d0abcfd6f583faecb156ea04f6311811f2ff605a29c353f4d0d46dd13ea5ee8872196406f9d30686d94278dd6b
 MISC metadata.xml 327 BLAKE2B c075f375c74797f407cff004dd39e41ab7b60d4e5039f8c9d6c214ce7af54ccec989807d1a09656c87dbce164f1da0289c655f215265ef011abd40b47c5fa841 SHA512 12db2d285a12948788387cbb97fdb299ebd3cdaf50832f1271fcb8cae3a9f7acd1deb7aff4392bdd082e97747d714359fa427bcd0ec9f28f2ecea74703ab9ab0
diff --git a/net-libs/davix/davix-0.6.7.ebuild b/net-libs/davix/davix-0.6.7.ebuild
index 4ca799254b21..f442b5b75b91 100644
--- a/net-libs/davix/davix-0.6.7.ebuild
+++ b/net-libs/davix/davix-0.6.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/${PN
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc ipv6 kernel_linux test tools"
 
 CDEPEND="
diff --git a/net-libs/davix/davix-0.6.8.ebuild b/net-libs/davix/davix-0.7.1.ebuild
index 943d50f9fb95..b6b1dbf9c82f 100644
--- a/net-libs/davix/davix-0.6.8.ebuild
+++ b/net-libs/davix/davix-0.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,6 +32,16 @@ RDEPEND="${CDEPEND}"
 
 REQUIRED_USE="test? ( tools )"
 
+src_prepare() {
+	cmake-utils_src_prepare
+
+	for x in doc test; do
+		if ! use $x; then
+			sed -i -e "/add_subdirectory ($x)/d" CMakeLists.txt
+		fi
+	done
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
@@ -44,7 +54,6 @@ src_configure() {
 		-DSTATIC_LIBRARY=OFF
 		-DSYSCONF_INSTALL_DIR="${EPREFIX}/etc"
 		-DBUILD_TESTING=$(usex test)
-		-DUNIT_TESTS=$(usex test)
 	)
 	cmake-utils_src_configure
 }
@@ -62,4 +71,8 @@ src_install() {
 	if ! use tools; then
 		rm -rf "${ED}/usr/share/man/man1"
 	fi
+
+	if use test; then
+		rm -rf "${ED}/usr/bin/davix-unit-tests"
+	fi
 }