gentoo resync : 11.07.2019

4 files changed, 5 insertions, 85 deletions

diff --git a/net-libs/davix/Manifest b/net-libs/davix/Manifest
index bdd9f6f46065..ccc8f49406c5 100644
--- a/net-libs/davix/Manifest
+++ b/net-libs/davix/Manifest
@@ -1,11 +1,9 @@
 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.7.1.tar 4336124 BLAKE2B 5db4f8f03fef38feedb0f0a9dfce763ff53ba9b1aa19d09f0af979e111d9f52226222e7b00e48aa3589070e9bf857e000f297d1a162aac83fe877ce3cd2984e1 SHA512 a4408960c4e16011de5e6cea1470d7fa487fd0b9c462082d8fb800bcaa812cab10a92643c9eeb66dda506d177903917176e6310c2a10042a848a52b858f4eb4e
-DIST davix-0.7.2.tar 4338425 BLAKE2B 9a09d2d702b8d9767ac6b0a5e04170d3f7e930b4c9c0cd8127bee2eae99978f5fdbed7be09875c1bbdcd38c29aede1b8f74a56cc15d31ab5ffa3e1f92fb26990 SHA512 207cf290aa4dedfa8c37cf7e7d8fd2162ecd04421abef55f7ade23193e6ca18942d1fb0d611a63fbeed45d9ba5eab8f9957efcdad7f6296b9ac9a69b07c9c339
 DIST davix-0.7.3.tar 4341865 BLAKE2B 8ba2855f7170ca24f4a15edc32562e47711304f48eaeb1e2870e1325396ae2b664f8af7a482986da6883ab5c92ab6e61034e8840baf3f59c3bd691e7e483fc7e SHA512 b7e7814066ca53c44c2aa0a0d1d6a2d995ea44d3d122da1d19f12849d8c2d4e91eafb40c18d4d18d1736a7c5c5099972519c08a6c7ab5b32300fc8a1fcdc5bfd
+DIST davix-0.7.4.tar 4343614 BLAKE2B 0fd618a4575cfdcbb0142b26ed8bd5ea0b8d880706ec6ebcc8e9a8755a8f392c715e2bc3cb25dd316fa90f06e7223ecd3e8272a0e5867eb2f5d74eec3053ddf2 SHA512 835d49f1729be95b88c1c422723a2ac6fa9fa0c4a85089e67d68a365c482bf648471fea000b90e7797add0809a9262b5c7275a965fde437bb8206154266fd970
 EBUILD davix-0.6.7.ebuild 1479 BLAKE2B b443682bf8396040d259a69f39a5b6d3c04e8bd96f315aff99e84cad4a8afa571b2d3aaca24310b7f632739e43db129c595ed6ac1c404ccf98d05cb178887ecf SHA512 7032a772e90ed906f446f6e9ce1104545c6bf38c433914936759864402526197cb9aa6dfa0d586984fa7b19865aa96cf9c8b801a85a48171885a4bd566c135f1
-EBUILD davix-0.7.1.ebuild 1597 BLAKE2B b6e322e6c78ff1044750f95f6b767b320752a782824ffa3cd0a28b8f69e463ecb0d80f29af11f8d958144267d670a5f6fb95f26cf3f41e23f4fe3dd8349abd0d SHA512 b04f578b4096f521bab40cef92ff2a28ba3433d0abcfd6f583faecb156ea04f6311811f2ff605a29c353f4d0d46dd13ea5ee8872196406f9d30686d94278dd6b
-EBUILD davix-0.7.2.ebuild 1597 BLAKE2B f01cf0694e0b0b4ae31af08f7303904e84d86f87ac9e811bdea09c376c1102845838ff8be825bd2caed1a14fdf88aad02ca8943aa9b9af4b93040aac08d5d19e SHA512 4718cac415d1582a3e326cb2c37295c1785b7dd2e86600e6b5cffb198a3763fa835349ef49812c2d9bf1f7659e849f7396dfc54864b74b3649b1ecf5d89941c4
-EBUILD davix-0.7.3.ebuild 1597 BLAKE2B f01cf0694e0b0b4ae31af08f7303904e84d86f87ac9e811bdea09c376c1102845838ff8be825bd2caed1a14fdf88aad02ca8943aa9b9af4b93040aac08d5d19e SHA512 4718cac415d1582a3e326cb2c37295c1785b7dd2e86600e6b5cffb198a3763fa835349ef49812c2d9bf1f7659e849f7396dfc54864b74b3649b1ecf5d89941c4
+EBUILD davix-0.7.3.ebuild 1595 BLAKE2B d4522abac211e65960947ada16a381768b26e5825a2b8f41fec90a5ae67406450e0e2a50e7876b0ca0d45e3b062280e1162c25580ebe224cd94d0f29452457a4 SHA512 673ec1fdedacb7006c90e8483031e89020032a94870a0f7e3d5c9a9c6c9fc4a48ff45d2c9712f6c0f4d5a34f0d736259da218377ea782df1e9849baf0dae55d1
+EBUILD davix-0.7.4.ebuild 1597 BLAKE2B 0bac6db2f4bbe6cbf4416011de19bec02176dbe2a330bf5bcc2898c8149d5ab602ef4ee4981a82a4e24756d2e74d878518723aa5630c882e92103d20637b41be SHA512 a0902984c48641530e929abf52babb06f0f5c9591a8971bd68db9b83fe5c13fa553517cc7fe405fc641a95990eb9425c441f9414b54cdaefa30bd1b0b877e441
 MISC metadata.xml 327 BLAKE2B c075f375c74797f407cff004dd39e41ab7b60d4e5039f8c9d6c214ce7af54ccec989807d1a09656c87dbce164f1da0289c655f215265ef011abd40b47c5fa841 SHA512 12db2d285a12948788387cbb97fdb299ebd3cdaf50832f1271fcb8cae3a9f7acd1deb7aff4392bdd082e97747d714359fa427bcd0ec9f28f2ecea74703ab9ab0
diff --git a/net-libs/davix/davix-0.7.1.ebuild b/net-libs/davix/davix-0.7.1.ebuild
deleted file mode 100644
index b6b1dbf9c82f..000000000000
--- a/net-libs/davix/davix-0.7.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="High-performance file management over WebDAV/HTTP"
-HOMEPAGE="https://dmc.web.cern.ch/projects/davix"
-SRC_URI="http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/${PN}/${PV}/${P}.tar.gz -> ${P}.tar"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc ipv6 kernel_linux test tools"
-
-CDEPEND="
-		dev-libs/libxml2:2=
-		dev-libs/openssl:0=
-		kernel_linux? ( sys-apps/util-linux )
-"
-
-DEPEND="${CDEPEND}
-		doc? (
-			app-doc/doxygen[dot]
-			dev-python/sphinx
-		)
-		virtual/pkgconfig
-"
-
-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"
-		-DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}"
-		-DENABLE_HTML_DOCS=$(usex doc)
-		-DENABLE_IPV6=$(usex ipv6)
-		-DENABLE_TOOLS=$(usex tools)
-		-DHTML_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}/html"
-		-DSOUND_INSTALL_DIR="${EPREFIX}/usr/share/${PN}/sounds"
-		-DSTATIC_LIBRARY=OFF
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}/etc"
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use doc; then
-		cmake-utils_src_compile doc
-	fi
-}
-
-src_install() {
-	cmake-utils_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
-}
diff --git a/net-libs/davix/davix-0.7.3.ebuild b/net-libs/davix/davix-0.7.3.ebuild
index b80ff8a2e7e7..e6daabed3b67 100644
--- a/net-libs/davix/davix-0.7.3.ebuild
+++ b/net-libs/davix/davix-0.7.3.ebuild
@@ -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.7.2.ebuild b/net-libs/davix/davix-0.7.4.ebuild
index b80ff8a2e7e7..448dc89c144a 100644
--- a/net-libs/davix/davix-0.7.2.ebuild
+++ b/net-libs/davix/davix-0.7.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils