gentoo auto-resync : 12:02:2023 - 09:56:54

4 files changed, 25 insertions, 19 deletions

diff --git a/net-libs/davix/Manifest b/net-libs/davix/Manifest
index 83385bec5c36..fcf3def7d8b7 100644
--- a/net-libs/davix/Manifest
+++ b/net-libs/davix/Manifest
@@ -1,6 +1,6 @@
 AUX davix-0.8.3-enable-ctest.patch 639 BLAKE2B d88b3483f006057c2b91b70591af18f9922abab94c9423c7304663d66d7f6fa3bc61da9780ea6776bd2df998d783a90fb85357cbc1390ec45081c37f1eb84485 SHA512 636b0797206697c9141b1a22c0778fa448b896f1fcd0b115f58848895c3fecfdd47b95b99cd669fc49f3e5a5ef54df24c7fc523bc719a6d3c2a5c4b2892f87bb
-DIST davix-0.7.6.tar 4338692 BLAKE2B 72a918f52993ea358f243df671823a4624ac5650753e06c8f70f75a800f10adfe7f6c63d9c8fdcefb94874e3c60c3909e7aa96969af1210347ea941a42f4b9df SHA512 3e379acc763e72e2e1684121e2688da6c617b2c1f52ffd7a2a2559998a64aba957f09f7b138c57f8f4d7a26caff4fef09952cca48585bb4f6aea1f071aa9a7b7
 DIST davix-0.8.3.tar.gz 7615016 BLAKE2B 7bb9ba6e267439db0f8b42d2a2b48ded801e3a10d6443101918514f999922e9cabce485b7a666ee0c1fb60d18cd537aa76b93096eeb0445b5ce4b25e214496d4 SHA512 ce5c66e8d59710e5658a6bb9bebdce3749843ab672274171f936cc533ce42689e1f75454de2a71529df97eb182d996c4ade00f30e1b21891fbfe4a40b1dd2dc5
-EBUILD davix-0.7.6.ebuild 1633 BLAKE2B def402dfcbdfa44d7eb59b80e7e0a382d9d57bba31fa7606460c3617f83af20c7bac3e9a6738ac2348db8740d5f118b5dea411c214364ba3c252b94c599c0999 SHA512 63c22c21153d3bd8dfdc4e98e8643afebfd0e18714ff984a85267f920c710a32c6abd4cb789297ef21493af8a071881ed7662abfb69ee035765e89ed82fd7a9f
-EBUILD davix-0.8.3.ebuild 1780 BLAKE2B ac942bc42228a682a3cc147f6459be6fd37d23cae5108fa8ccb3d843e482f5576aa364311a666261397617ac170d913d85f923074c48786aee0bc86de8b436dc SHA512 7ee669705cc2deb57a4899b39d0d5d1fede4b410b7baaf61f1118d7cc90b41486c0613f6a3caa896d6a56fe29454ff5e7feaca24496af4513c435d18d072800c
-MISC metadata.xml 328 BLAKE2B e7f21fc1dad2a970911a75c9d239071b31447bc7707b0f534d447e723d3d567d46a10cea2164138ab30e6de7bda77fdfc7f8c860d1be8ea9921fc864db7e0018 SHA512 9701f7b63e1a203c6810f51a6c107f99bad9a67eac56566831be2b1930a0759aff15b3a02598a2814dfe46fb28ed28fed12e7d45a7614b623cb05ac90345f76a
+DIST davix-0.8.4.tar.gz 7616367 BLAKE2B 0048d066b5ebae0639ea511dfb9147a5c76b73e5f273e0912abd7a10c40228bbbc60fea56f1b91a1c64b396b5ab67a291b42743e037e1e61a14aee2fbb783e09 SHA512 09a0389788b525e3c29639091c11ab4dacf1668efec42a93f3e995663793467b7aaf43daf66351e8a140f760711e96391c1cce0759a7f198110ebe511c0c7a4d
+EBUILD davix-0.8.3.ebuild 1779 BLAKE2B e75bb01d8399fbb7a65b86288be855e0da924cce51da87003342915bf93cead77d87796f9d3e9fcd1f7337bb4342dc82b9fded083b894a9af4e56bd2eed352c0 SHA512 98d61c3dfcad81e45709c9923d27e56226c5f4d47d32cec73b99fa059604c4a500170e021c5aa118cc1db689cebf9773c3d7fa28cc38de0b5322a4b1fb07ef75
+EBUILD davix-0.8.4.ebuild 1750 BLAKE2B 0e9d7b7a0d6cb2e15767e0b26e446f7f4238e5091208881ffbed7f75ab724ac9af53d4a8959220aee0edffabbf26f5ed8e0b6c85acca70cb2b61710697f71380 SHA512 adb079bd2e5db0067b219e2ce14866a2708150d7fc906d4430450ca5b580ff1973e73b89164725724df6d7a075032c5dcfc288d520f06e7806244fab75fbc0b0
+MISC metadata.xml 411 BLAKE2B 2337249e053b9d5328625bc392a9234c61dab65c76d7eab80cf3ae928eadb39d9de9c952fe9f52dca01623ff4012eb121f78b0c32138e0c833dec494e683ef84 SHA512 dcd6132646ff919ba6ec3c4dbb9a31745edbc0b5faa658fe7c0f4d42737122d5294aff00c293a11ba7d8c0bafd10a931dd519c04245c8618c6ea969ec4f9e2ea
diff --git a/net-libs/davix/davix-0.8.3.ebuild b/net-libs/davix/davix-0.8.3.ebuild
index c8bd4fa184fd..4b976fe682fd 100644
--- a/net-libs/davix/davix-0.8.3.ebuild
+++ b/net-libs/davix/davix-0.8.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/cern-fts/${PN}/releases/download/R_${PV//./_}/${P}.t
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc ipv6 test tools"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/davix/davix-0.7.6.ebuild b/net-libs/davix/davix-0.8.4.ebuild
index 015f1c2d8452..1e98f134e369 100644
--- a/net-libs/davix/davix-0.7.6.ebuild
+++ b/net-libs/davix/davix-0.8.4.ebuild
@@ -1,24 +1,27 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake python-any-r1
 
 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"
+HOMEPAGE="https://github.com/cern-fts/davix"
+SRC_URI="https://github.com/cern-fts/${PN}/releases/download/R_${PV//./_}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc ipv6 test tools"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test tools"
 RESTRICT="!test? ( test )"
 
 CDEPEND="
 		dev-libs/libxml2:2=
 		dev-libs/openssl:0=
 		net-libs/gsoap[ssl,-gnutls]
+		net-misc/curl:0=
 		kernel_linux? ( sys-apps/util-linux )
 "
 
@@ -29,6 +32,7 @@ BDEPEND="
 			dev-python/sphinx
 		)
 		virtual/pkgconfig
+		${PYTHON_DEPS}
 "
 
 RDEPEND="${CDEPEND}"
@@ -47,9 +51,12 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DPython_EXECUTABLE="${PYTHON}"
 		-DDOC_INSTALL_DIR="${EPREFIX}/usr/share/doc/${P}"
+		-DEMBEDDED_LIBCURL=OFF
+		-DLIBCURL_BACKEND_BY_DEFAULT=OFF
 		-DENABLE_HTML_DOCS=$(usex doc)
-		-DENABLE_IPV6=$(usex ipv6)
+		-DENABLE_IPV6=TRUE
 		-DENABLE_TCP_NODELAY=TRUE
 		-DENABLE_THIRD_PARTY_COPY=TRUE
 		-DENABLE_TOOLS=$(usex tools)
@@ -71,12 +78,8 @@ src_compile() {
 
 src_install() {
 	cmake_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"
+		rm "${ED}/usr/bin/davix-unit-tests" || die
+		rm "${ED}/usr/bin/davix-tester" || die
 	fi
 }
diff --git a/net-libs/davix/metadata.xml b/net-libs/davix/metadata.xml
index e10c61be50c2..caa4378b455e 100644
--- a/net-libs/davix/metadata.xml
+++ b/net-libs/davix/metadata.xml
@@ -8,4 +8,7 @@
   <use>
     <flag name="tools">Install additional tools</flag>
   </use>
+  <upstream>
+    <remote-id type="github">cern-fts/davix</remote-id>
+  </upstream>
 </pkgmetadata>