gentoo resync : 20.03.2022

4 files changed, 134 insertions, 25 deletions

diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index c80f2edfe87b..cf6b3f40a7b6 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,6 +1,8 @@
 AUX nextcloud-client-3.3.4-inkscape_to_rsvg.patch 2170 BLAKE2B 1593e98d25f5a9cbb30829a9619ad6916e6fd2e3be64a538dc0452ff3785deea86cdccfa5c7bae40dc4dcfc83e127d9dfb16e14d3954449ebf15939cf3f34d76 SHA512 9d97656af41df5dcd1c647f49833cdc71bfa5c7d0941d722ee01d6040702754c6d07d7320637a18bd8baddcf724e84c4dec6128d329646bb5773f5f2fd22830a
-DIST nextcloud-client-3.1.3.tar.gz 19552683 BLAKE2B 321ddc6bd5f9428abe1eafe25d426c26c99307c5e7d204bc60fd1bafe773fbed9cb54264f7b1ec7766078b8c06a2399c916a8bd9291e0e28e5b6b3ed8725a7a4 SHA512 ca0a70e65be67e10a7cb45f2b30f6b82230f30c2e3afcd16a222a8ed6fb8df4eff5e78fe0b6e3f4c6a18ff963896ccd6d8282c9829bd75a943324d4ab0068a99
 DIST nextcloud-client-3.3.6.tar.gz 14106065 BLAKE2B b4f1179787a835f7fa203dfeaa2091eb1368f15ea6252dbf2ddd2d1a46786752f3a896574283c9ebc3faeaa024272c20fa67e4ee08b8ebca319d224ad4eb19f5 SHA512 d6c16ebd8af0d97f412102cfa9f7b7d4ca502ff5d025618f3a98a33a068dce9d0b71ee71e7b3c3a02219929584559a1237d57b1a7aa27ad8234653b56530c9f0
-EBUILD nextcloud-client-3.1.3.ebuild 1973 BLAKE2B f175a9555be40de2623e5392e99d587a6e5ae2e058964924165c01495be57d42f209c15db261571cc8120587e9be0c04aa5b83293f2d0e7f714fe521a8b6bac9 SHA512 65ec99fb719ec4ebdf0466aa59ac5e9a4ffecaac9a8b94cb2f59a2efadab5ce9e44ec54e574fc818cbb71554828c14b7b1a575ddd97fc881345854045b8931e3
+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
 EBUILD nextcloud-client-3.3.6.ebuild 2193 BLAKE2B 50f2084e5a1882d928273fcc938ff6258fc88b0fc2c22c47bfe2ff361e6791abb5f9e7baa6c8b8aee0ed696dd90f994f7fc9ddb985ed2ea6088208ce8576a951 SHA512 55038556483e044b6f91906efc6feb9311bde74bb09dab1877af6c92e0d5c70d3e8405541d9a30ee2aa7aa1c121d5d691cbbb4b4711a0bfc2c8289dfd4c69a3d
-MISC metadata.xml 605 BLAKE2B c24c20e11e5ddf2ce188c7c80aecacc9af7145aa325b150e9d9b753b11525683938409aa911d65d4e62a2f6177df369005aaba7c10768beba4bb66955126b547 SHA512 5fc64dfed80ed91c89402e22910dc72e8d3649be1bcd27b0a48ecd6a86f129b06d9d37fa7d4f7d54c083b3b04935a28ae982871e7c1cf28a88cbd9dbf9aebc17
+EBUILD nextcloud-client-3.4.2.ebuild 2183 BLAKE2B 98c007d8f662a8aa427a928f8494368d4da7be14afd25586c411f6eecb4e6456e775490d00d10cf39b17e14919355a452a69af472546e359a799cf1b181c695b SHA512 c6af39554e7aa76e122d799edb801afa60c4c0f91ffb29d2be0b764d9697cf84c92b0c24135f19413a851dc5ab9aea9d66dd5062d224c8e1d1c0ae2abe31516a
+EBUILD nextcloud-client-3.4.3.ebuild 2183 BLAKE2B 98c007d8f662a8aa427a928f8494368d4da7be14afd25586c411f6eecb4e6456e775490d00d10cf39b17e14919355a452a69af472546e359a799cf1b181c695b SHA512 c6af39554e7aa76e122d799edb801afa60c4c0f91ffb29d2be0b764d9697cf84c92b0c24135f19413a851dc5ab9aea9d66dd5062d224c8e1d1c0ae2abe31516a
+MISC metadata.xml 712 BLAKE2B 423b16fa8879b0bc21d8ff1c692e5e592f571b5d69dcdd35fe79dae08b770c0d5beb2cbf71af2e7410d1dfd6917d15bac0482a84a40ce602ab03ab0f59940355 SHA512 2cfeff27549192c2aaa9c64369545e75b3a056c123d7647c96505dd410490230027401961e95ef88c93b0485393bd54aa11ddc922bcaf2782f9e68a2d8d17b32
diff --git a/net-misc/nextcloud-client/metadata.xml b/net-misc/nextcloud-client/metadata.xml
index 48b762c1d592..be33f72f7b7c 100644
--- a/net-misc/nextcloud-client/metadata.xml
+++ b/net-misc/nextcloud-client/metadata.xml
@@ -5,6 +5,10 @@
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
 	</maintainer>
+	<maintainer type="person">
+		<name>Florian Schmaus</name>
+		<email>flow@gentoo.org</email>
+	</maintainer>
 	<use>
 		<flag name="dolphin">Install the <pkg>kde-apps/dolphin</pkg> extension</flag>
 		<flag name="nautilus">Install the <pkg>gnome-base/nautilus</pkg> extension</flag>
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.1.3.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.4.2.ebuild
index 80095a1fb503..df314cf64b74 100644
--- a/net-misc/nextcloud-client/nextcloud-client-3.1.3.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-3.4.2.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,11 +11,13 @@ 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"
-IUSE="doc dolphin nautilus test"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc dolphin nautilus test webengine"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND=">=dev-db/sqlite-3.34:3
-	dev-libs/qtkeychain[gnome-keyring,qt5(+)]
+	>=dev-libs/openssl-1.1.0:0=
+	dev-libs/qtkeychain:=[qt5(+)]
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtdeclarative:5
@@ -23,7 +25,6 @@ COMMON_DEPEND=">=dev-db/sqlite-3.34:3
 	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtquickcontrols2:5
 	dev-qt/qtsvg:5
-	dev-qt/qtwebengine:5[widgets]
 	dev-qt/qtwebsockets:5
 	dev-qt/qtwidgets:5
 	sys-libs/zlib
@@ -31,14 +32,14 @@ COMMON_DEPEND=">=dev-db/sqlite-3.34:3
 		kde-frameworks/kcoreaddons:5
 		kde-frameworks/kio:5
 	)
-	>=dev-libs/openssl-1.1.0:0=
-	nautilus? ( dev-python/nautilus-python )"
+	nautilus? ( dev-python/nautilus-python )
+	webengine? ( dev-qt/qtwebengine:5[widgets] )"
 
-RDEPEND="${COMMON_DEPEND}"
 DEPEND="${COMMON_DEPEND}
 	dev-qt/linguist-tools:5
 	dev-qt/qtconcurrent:5
 	dev-qt/qtxml:5
+	gnome-base/librsvg
 	doc? (
 		dev-python/sphinx
 		dev-tex/latexmk
@@ -51,37 +52,43 @@ DEPEND="${COMMON_DEPEND}
 		dev-qt/qttest:5
 	)"
 
-RESTRICT="!test? ( test )"
+RDEPEND="${COMMON_DEPEND}"
 
-S=${WORKDIR}/desktop-${PV/_/-}
+S="${WORKDIR}/desktop-${PV/_/-}"
 
 src_prepare() {
+	# We do not package libcloudproviders
+	sed -e "s/pkg_check_modules.*cloudproviders/#&/" -i CMakeLists.txt || die
+
 	# Keep tests in ${T}
 	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
 
-	if ! use nautilus; then
-		pushd shell_integration > /dev/null || die
-		cmake_comment_add_subdirectory nautilus
-		popd > /dev/null || die
-	fi
 	cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
-		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
 		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
-		-DNO_SHIBBOLETH=yes
-		-DUNIT_TESTING=$(usex test)
+		-DBUILD_UPDATER=OFF
+		$(cmake_use_find_package doc Sphinx)
+		$(cmake_use_find_package doc PdfLatex)
+		$(cmake_use_find_package webengine Qt5WebEngine)
+		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
+		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
+		-DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus)
+		-DBUILD_TESTING=$(usex test)
 	)
 
 	cmake_src_configure
 }
 
+src_test() {
+	virtx cmake_src_test
+}
+
 pkg_postinst() {
 	xdg_pkg_postinst
+
 	if ! use doc ; then
 		elog "Documentation and man pages not installed"
 		elog "Enable doc USE-flag to generate them"
diff --git a/net-misc/nextcloud-client/nextcloud-client-3.4.3.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.4.3.ebuild
new file mode 100644
index 000000000000..df314cf64b74
--- /dev/null
+++ b/net-misc/nextcloud-client/nextcloud-client-3.4.3.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake virtualx xdg
+
+DESCRIPTION="Desktop Syncing Client for Nextcloud"
+HOMEPAGE="https://github.com/nextcloud/desktop"
+SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc dolphin nautilus test webengine"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.34:3
+	>=dev-libs/openssl-1.1.0:0=
+	dev-libs/qtkeychain:=[qt5(+)]
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtquickcontrols2:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebsockets:5
+	dev-qt/qtwidgets:5
+	sys-libs/zlib
+	dolphin? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kio:5
+	)
+	nautilus? ( dev-python/nautilus-python )
+	webengine? ( dev-qt/qtwebengine:5[widgets] )"
+
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtxml:5
+	gnome-base/librsvg
+	doc? (
+		dev-python/sphinx
+		dev-tex/latexmk
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	dolphin? ( kde-frameworks/extra-cmake-modules )
+	test? (
+		dev-util/cmocka
+		dev-qt/qttest:5
+	)"
+
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/desktop-${PV/_/-}"
+
+src_prepare() {
+	# We do not package libcloudproviders
+	sed -e "s/pkg_check_modules.*cloudproviders/#&/" -i CMakeLists.txt || die
+
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DBUILD_UPDATER=OFF
+		$(cmake_use_find_package doc Sphinx)
+		$(cmake_use_find_package doc PdfLatex)
+		$(cmake_use_find_package webengine Qt5WebEngine)
+		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
+		-DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin)
+		-DBUILD_SHELL_INTEGRATION_NAUTILUS=$(usex nautilus)
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use doc ; then
+		elog "Documentation and man pages not installed"
+		elog "Enable doc USE-flag to generate them"
+	fi
+}