gentoo resync : 29.12.2022

5 files changed, 48 insertions, 81 deletions

diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 750a68a91d27..3f448710e8d9 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,10 +1,9 @@
-AUX nextcloud-client-3.3.4-inkscape_to_rsvg.patch 2170 BLAKE2B 1593e98d25f5a9cbb30829a9619ad6916e6fd2e3be64a538dc0452ff3785deea86cdccfa5c7bae40dc4dcfc83e127d9dfb16e14d3954449ebf15939cf3f34d76 SHA512 9d97656af41df5dcd1c647f49833cdc71bfa5c7d0941d722ee01d6040702754c6d07d7320637a18bd8baddcf724e84c4dec6128d329646bb5773f5f2fd22830a
-DIST nextcloud-client-3.3.6.tar.gz 14106065 BLAKE2B b4f1179787a835f7fa203dfeaa2091eb1368f15ea6252dbf2ddd2d1a46786752f3a896574283c9ebc3faeaa024272c20fa67e4ee08b8ebca319d224ad4eb19f5 SHA512 d6c16ebd8af0d97f412102cfa9f7b7d4ca502ff5d025618f3a98a33a068dce9d0b71ee71e7b3c3a02219929584559a1237d57b1a7aa27ad8234653b56530c9f0
-DIST nextcloud-client-3.4.2.tar.gz 14329069 BLAKE2B 5a23e9a7535aff3591d73d2b17abf71cb6302b9acfa41a1de051d42d9acb4cf4d76ed1dff3c73ec989a066c51d4fe9e94d6e71718f9fc0533d0c0e2bb0949060 SHA512 9788fd658c9e7c3b26eb3c41934ee75222aba0afd38e1fd71f8f04472bf4971e5cc7c12469f0b3f909f4dc1e5aa1a063ae1324f6a8b6052cdf9b3c8c1cc8c909
 DIST nextcloud-client-3.4.3.tar.gz 14338935 BLAKE2B c9d03e0d950764537aa883da88603746ccd8818c9d0659f8df009a2550ea33f2f51f12448327b7a73a9106e310860b8399a2d12cf18c2c6b7a8f5fa2b7652148 SHA512 b3a9aa019ea2f01ffe74fe1a39c37f3d61cfa4c4b9a520d4f17061960c388541abf0c6541d60d2beed4de26f7fa18fdbef42121d9150c6b916d566bd7285ba71
 DIST nextcloud-client-3.4.4.tar.gz 14352142 BLAKE2B 104af477a15adc30885bd4d6c5fa022efc89d63c9294c8a632349999ed60b95ad1a34bdc8fed8602fd60f4fbff7c9dca2c33461bf9b167401b8d933ef9b02821 SHA512 880d615147feed915595bf6e4f99c3c7588d03b910bdee934429ccdbc16c2a0e7b07be99665729d60cb68c22a140cfd21c0cc821fd1c4499bc6ea4aec515eaf4
-EBUILD nextcloud-client-3.3.6.ebuild 2193 BLAKE2B 50f2084e5a1882d928273fcc938ff6258fc88b0fc2c22c47bfe2ff361e6791abb5f9e7baa6c8b8aee0ed696dd90f994f7fc9ddb985ed2ea6088208ce8576a951 SHA512 55038556483e044b6f91906efc6feb9311bde74bb09dab1877af6c92e0d5c70d3e8405541d9a30ee2aa7aa1c121d5d691cbbb4b4711a0bfc2c8289dfd4c69a3d
-EBUILD nextcloud-client-3.4.2.ebuild 2183 BLAKE2B 98c007d8f662a8aa427a928f8494368d4da7be14afd25586c411f6eecb4e6456e775490d00d10cf39b17e14919355a452a69af472546e359a799cf1b181c695b SHA512 c6af39554e7aa76e122d799edb801afa60c4c0f91ffb29d2be0b764d9697cf84c92b0c24135f19413a851dc5ab9aea9d66dd5062d224c8e1d1c0ae2abe31516a
+DIST nextcloud-client-3.5.0.tar.gz 15359946 BLAKE2B 144f50fb1ce3f1cad205fd2bf5c161c54602d75642518e4db2bad1e384b28bf3baf3ba7a22eafe7530aae9aa1bced4c2025c33dc1566ba48db64224ae00537e9 SHA512 9c20cc2878832fb9fbe690fb0a2b9f960ea58480bb14c89d8e713d9847a27fad920ce4b507fb8b7b5ac211f4a0e1c775e3b985d57acd9191e87f45e01a86f85c
+DIST nextcloud-client-3.5.1.tar.gz 15392337 BLAKE2B 6f3826e33828aacfbefb1786c9a1231ccba0be4b649cc132546914d7c61b8755b32f873a9eb5c27d10d207121636738bc51354643d056ffe6733c5cd0f395cac SHA512 989cc4c99f81f7451af8b13453155f0c89448226ade565025030a8064c7e54e5668b37744564685cc700f2b5a54f899d563a4be2bfe023e43987928982a2feba
 EBUILD nextcloud-client-3.4.3.ebuild 2182 BLAKE2B 33133006cd7cba83da279d15122a00b82658967bbc3df8c2da157f9ed87582526e84b6959dd3d39dfdb909fee75eacb780a0548a9bd40564ceb38d7e61e805e9 SHA512 3b1957a1755b3dadb4d2a92d9991d97f1a17bf4f94120ea44219a46bf49b909fb8828a9f4f56e929c375d631e46645ab2cf4c084c98a26b58ebba98cf080960e
-EBUILD nextcloud-client-3.4.4.ebuild 2183 BLAKE2B 98c007d8f662a8aa427a928f8494368d4da7be14afd25586c411f6eecb4e6456e775490d00d10cf39b17e14919355a452a69af472546e359a799cf1b181c695b SHA512 c6af39554e7aa76e122d799edb801afa60c4c0f91ffb29d2be0b764d9697cf84c92b0c24135f19413a851dc5ab9aea9d66dd5062d224c8e1d1c0ae2abe31516a
+EBUILD nextcloud-client-3.4.4.ebuild 2181 BLAKE2B d246952097b7b568f21956df4b78f9189e70367edbf7798b5b915afab8468b8eb1de1a33daa7591457ad94a68c7adc7668317402e8fe3f038df498329999b0c3 SHA512 b783495c8c6ed6abe9337b9573eb7d3e8c63b4e4082643598d4273aec15b5724faee52170517e25f330541d099d4f4f993f52bdd062f4166ae19211d22bf9367
+EBUILD nextcloud-client-3.5.0.ebuild 2331 BLAKE2B 809323f95c13f2cb654c56696ff85eb4d663b533656f6f6e775dcce04e0efe8efaad503799ca6a55a8aace92506b0d2ef84432124829f64d480728644f4b14d4 SHA512 5c96c010bdb9b45ae5fdf9f0de66e86ffd6b213b05222f6eca5729430ba26169dab240eb6356318ca949957e6d30074e78a0a27cc4b81b5910a2cfa79bdf2067
+EBUILD nextcloud-client-3.5.1.ebuild 2331 BLAKE2B 809323f95c13f2cb654c56696ff85eb4d663b533656f6f6e775dcce04e0efe8efaad503799ca6a55a8aace92506b0d2ef84432124829f64d480728644f4b14d4 SHA512 5c96c010bdb9b45ae5fdf9f0de66e86ffd6b213b05222f6eca5729430ba26169dab240eb6356318ca949957e6d30074e78a0a27cc4b81b5910a2cfa79bdf2067
 MISC metadata.xml 712 BLAKE2B 423b16fa8879b0bc21d8ff1c692e5e592f571b5d69dcdd35fe79dae08b770c0d5beb2cbf71af2e7410d1dfd6917d15bac0482a84a40ce602ab03ab0f59940355 SHA512 2cfeff27549192c2aaa9c64369545e75b3a056c123d7647c96505dd410490230027401961e95ef88c93b0485393bd54aa11ddc922bcaf2782f9e68a2d8d17b32
diff --git a/net-misc/nextcloud-client/files/nextcloud-client-3.3.4-inkscape_to_rsvg.patch b/net-misc/nextcloud-client/files/nextcloud-client-3.3.4-inkscape_to_rsvg.patch
deleted file mode 100644
index 8e5510db04d5..000000000000
--- a/net-misc/nextcloud-client/files/nextcloud-client-3.3.4-inkscape_to_rsvg.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 727de34879b8ef800945e11951cc1a7bee811f03 Mon Sep 17 00:00:00 2001
-From: Heinz Wiesinger <pprkut@liwjatan.org>
-Date: Thu, 26 Aug 2021 16:07:25 +0200
-Subject: [PATCH] Allow using rsvg-convert to generate pngs instead of inkscape
-
-Signed-off-by: Heinz Wiesinger <pprkut@liwjatan.org>
----
- src/gui/CMakeLists.txt | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
-index 970d2fc165..efe1b1c349 100644
---- a/src/gui/CMakeLists.txt
-+++ b/src/gui/CMakeLists.txt
-@@ -236,13 +236,13 @@ if (NOT DEFINED APPLICATION_ICON_NAME)
- endif()
- 
- # Generate png icons from svg
--find_program(INKSCAPE
--  NAMES inkscape inkscape.exe
-+find_program(SVG_CONVERTER
-+  NAMES inkscape inkscape.exe rsvg-convert
-   REQUIRED
--  HINTS "C:\\Program Files\\Inkscape\\bin" "/usr/bin" ENV INKSCAPE_DIR)
-+  HINTS "C:\\Program Files\\Inkscape\\bin" "/usr/bin" ENV SVG_CONVERTER_DIR)
- # REQUIRED keyword is only supported on CMake 3.18 and above
--if (NOT INKSCAPE)
--  message(FATAL_ERROR "Could not find inkscape. Set INKSCAPE_DIR to the path of executable.")
-+if (NOT SVG_CONVERTER)
-+  message(FATAL_ERROR "Could not find a suitable svg converter. Set SVG_CONVERTER_DIR to the path of either the inkscape or rsvg-convert executable.")
- endif()
- 
- function(generate_sized_png_from_svg icon_path size)
-@@ -256,16 +256,16 @@ function(generate_sized_png_from_svg icon_path size)
-   set(icon_output_name "${size}-${icon_name_wle}.png")
-   message(STATUS "Generate ${icon_output_name}")
-   execute_process(COMMAND
--    "${INKSCAPE}" -w ${size} -h ${size} "${icon_path}" -o "${icon_output_name}"
-+    "${SVG_CONVERTER}" -w ${size} -h ${size} "${icon_path}" -o "${icon_output_name}"
-     WORKING_DIRECTORY "${icon_name_dir}"
-     RESULT_VARIABLE
--    INKSCAPE_SIDEBAR_ERROR
-+    SVG_CONVERTER_SIDEBAR_ERROR
-     OUTPUT_QUIET
-     ERROR_QUIET)
- 
--  if (INKSCAPE_SIDEBAR_ERROR)
-+  if (SVG_CONVERTER_SIDEBAR_ERROR)
-     message(FATAL_ERROR
--      "inkscape could not generate icon: ${INKSCAPE_SIDEBAR_ERROR}")
-+      "${SVG_CONVERTER} could not generate icon: ${SVG_CONVERTER_SIDEBAR_ERROR}")
-   else()
-   endif()
- endfunction()
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.4.4.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.4.4.ebuild
index df314cf64b74..f73bb52faae8 100644
--- a/net-misc/nextcloud-client/nextcloud-client-3.4.4.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-3.4.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.
 
 LICENSE="CC-BY-3.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc dolphin nautilus test webengine"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.4.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.5.0.ebuild
index df314cf64b74..df8b692a88c8 100644
--- a/net-misc/nextcloud-client/nextcloud-client-3.4.2.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-3.5.0.ebuild
@@ -15,7 +15,8 @@ KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc dolphin nautilus test webengine"
 RESTRICT="!test? ( test )"
 
-COMMON_DEPEND=">=dev-db/sqlite-3.34:3
+COMMON_DEPEND="
+	>=dev-db/sqlite-3.34:3
 	>=dev-libs/openssl-1.1.0:0=
 	dev-libs/qtkeychain:=[qt5(+)]
 	dev-qt/qtcore:5
@@ -33,9 +34,10 @@ COMMON_DEPEND=">=dev-db/sqlite-3.34:3
 		kde-frameworks/kio:5
 	)
 	nautilus? ( dev-python/nautilus-python )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )"
-
-DEPEND="${COMMON_DEPEND}
+	webengine? ( dev-qt/qtwebengine:5[widgets] )
+"
+DEPEND="
+	${COMMON_DEPEND}
 	dev-qt/linguist-tools:5
 	dev-qt/qtconcurrent:5
 	dev-qt/qtxml:5
@@ -50,8 +52,8 @@ DEPEND="${COMMON_DEPEND}
 	test? (
 		dev-util/cmocka
 		dev-qt/qttest:5
-	)"
-
+	)
+"
 RDEPEND="${COMMON_DEPEND}"
 
 S="${WORKDIR}/desktop-${PV/_/-}"
@@ -86,6 +88,14 @@ src_test() {
 	virtx cmake_src_test
 }
 
+src_compile() {
+	local compile_targets=(all)
+	if use doc; then
+		compile_targets+=(doc doc-man)
+	fi
+	cmake_src_compile ${compile_targets[@]}
+}
+
 pkg_postinst() {
 	xdg_pkg_postinst
 
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.3.6.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.5.1.ebuild
index 311dd37b9f30..df8b692a88c8 100644
--- a/net-misc/nextcloud-client/nextcloud-client-3.3.6.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-3.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake xdg
+inherit cmake virtualx xdg
 
 DESCRIPTION="Desktop Syncing Client for Nextcloud"
 HOMEPAGE="https://github.com/nextcloud/desktop"
@@ -11,13 +11,14 @@ SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.
 
 LICENSE="CC-BY-3.0 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="doc dolphin nautilus test webengine"
 RESTRICT="!test? ( test )"
 
-COMMON_DEPEND=">=dev-db/sqlite-3.34:3
+COMMON_DEPEND="
+	>=dev-db/sqlite-3.34:3
 	>=dev-libs/openssl-1.1.0:0=
-	dev-libs/qtkeychain[qt5(+)]
+	dev-libs/qtkeychain:=[qt5(+)]
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtdeclarative:5
@@ -33,9 +34,10 @@ COMMON_DEPEND=">=dev-db/sqlite-3.34:3
 		kde-frameworks/kio:5
 	)
 	nautilus? ( dev-python/nautilus-python )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )"
-
-DEPEND="${COMMON_DEPEND}
+	webengine? ( dev-qt/qtwebengine:5[widgets] )
+"
+DEPEND="
+	${COMMON_DEPEND}
 	dev-qt/linguist-tools:5
 	dev-qt/qtconcurrent:5
 	dev-qt/qtxml:5
@@ -50,12 +52,10 @@ DEPEND="${COMMON_DEPEND}
 	test? (
 		dev-util/cmocka
 		dev-qt/qttest:5
-	)"
-
+	)
+"
 RDEPEND="${COMMON_DEPEND}"
 
-PATCHES=( "${FILESDIR}"/${PN}-3.3.4-inkscape_to_rsvg.patch )
-
 S="${WORKDIR}/desktop-${PV/_/-}"
 
 src_prepare() {
@@ -78,12 +78,24 @@ src_configure() {
 		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
 		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
 		-DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus)
-		-DUNIT_TESTING=$(usex test)
+		-DBUILD_TESTING=$(usex test)
 	)
 
 	cmake_src_configure
 }
 
+src_test() {
+	virtx cmake_src_test
+}
+
+src_compile() {
+	local compile_targets=(all)
+	if use doc; then
+		compile_targets+=(doc doc-man)
+	fi
+	cmake_src_compile ${compile_targets[@]}
+}
+
 pkg_postinst() {
 	xdg_pkg_postinst