gentoo resync : 16.09.2020

4 files changed, 9 insertions, 126 deletions

diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 53d545e3a150..f1b12ae3db50 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,11 +1,8 @@
 AUX nextcloud-client-2.6.1-include_tests.patch 679 BLAKE2B 654c729a191643d4a37c301b4be62c495f059c81fcd1f3d8a5a85c579400fd97b86bb057c82bfb790588c9faa6f302a239b1c043ab53530713cb75a88179654c SHA512 c14054e6dc228ca77a659371b3c151e0551477fce3a2678a54da4ba73adbcf972a78114c5649adc3dc813fb01b55bbb812620caac0bc0460519424c2caa6c81f
-AUX nextcloud-client-2.6.4-qt515.patch 678 BLAKE2B 767ff6f3bb4ecd9ff6e87484d8e2b74b7c8f1753b71d5037f98838fa8ea5c78f63a75b66b8ee8cbd20f48a47296603136f525e090f0f625ee15e1fe6a6e688ac SHA512 19caea8c5b8b14db7af6520e72b4e4e2f20b45e6c6c8dcd2e1b0de5d8abd8d274127bb50fc16ba448d9fea189fc5cfb8c5f1e0d7c6d00661a2738ac959156049
-DIST nextcloud-client-2.5.2.tar.gz 18995992 BLAKE2B 6ad23962d327c1feeec34f59092021f7f82f4baeaf973fac0572db55cb03bc8ba2ed0c5037bcbfa80ca057d3976aaf6e402e129f2ec963b3a9c432330ef6aaf3 SHA512 1000b420355d7a4104ca5b41e813d467dcb345b60c79c78ce532de9c58ea89cad10d5565a433409bd512f0f7771c18c7c27974b968c74f84ccfda1ed3510d3ae
-DIST nextcloud-client-2.6.4.tar.gz 19035129 BLAKE2B 8721737a4e2515996de1910219c2d36b545e068ed5c66b2df85166646c25488f401563e113674254d9d1b1a70c19435c7c0728718e1633e8036ac1e415925b97 SHA512 849bf9bfa6a50342f6b58e805dc72ef342cb5f3e2e27d8f45d6a48759b1956dec194fb376b9a6b760df724f01eec3a22aadaa439f03e5166b1b2afb5454e40f1
 DIST nextcloud-client-2.6.5.tar.gz 19134736 BLAKE2B 12defed7dc9a23622d49228c2e78586533f51d1cfd6209e263a0a8b94d307028b1afa76004768432a2bee68140602da003ef10133cd166fd3443a0a45ccccabc SHA512 fcb8ac368e064f9e9ffdc014faabb4f308045d2b047e1011e17bf2e54fa61f462f529eb48e5ec2aa638df8d9720bd7b88acef9b26aa3ba2b90e8977b3be45462
 DIST nextcloud-client-3.0.0.tar.gz 19060293 BLAKE2B 80c53e2db30c9a3a8bae8673a937448915010f9d736836a99660c498c0afe0f3e5d78faf80df4c2214f452c41c9d92357a341f00ecb8f4720f6c459a9d2ccb30 SHA512 5b03ad99feeb16dd7d22399df624da98bf6f2e758337aad5b4ff21f25e39e44d94fe0451101cbc8100e43adbd4a39f8d1bac64881d9e39ef3de58b018ccd35d6
-EBUILD nextcloud-client-2.5.2.ebuild 2032 BLAKE2B 7d8868094ef1a9c9204165ae2e716f09e1964c2eaad5e74a100492a11b3d180ec6ac66f6fc3374515c01dcf8430f1cf00ee845d1ea27ab6026b98dbc24b78eb0 SHA512 18b8ff5a30c85e4cfeb487e8f1cdd70b088e729b27a3031ec5bcdc1378bcbc9fd8f17d4b225067e2c9c024373cb76c42a32674bcad5f7069fd50c578442b5f17
-EBUILD nextcloud-client-2.6.4.ebuild 2063 BLAKE2B 8cba515c853082f9295afe9511f59c63a52d71410247df752aa89725c4091bbbd0aeac0e99c553f8e6246076266e398af9bc14329b5d033ed735fdc3d7b6f965 SHA512 b3b809f73652286f2df1c2720b36448e0ab4bcb66485211f1f8c4ca0a404fe31e6d38e70e19a956268050f0919f7cebe671bc1c21109fb55d3f813f4c5df5b68
+DIST nextcloud-client-3.0.1.tar.gz 19059671 BLAKE2B c85f9d1627a75745c5a450b1c59799716c17dad3ba5ce277a62bebbbb80f243236cb4d529ff8ce4af9371c7ab1948b5a86dfaa3fbeb9de8681c9df0f397044f7 SHA512 9d6f3d8977f411942703a2dea8990a5b37ef8892b142292720915f5d1937b0443e9cb8c17562eb30a16c31abf30efc023bbb9199079f3a9ca47bdfa51ea5f3a5
 EBUILD nextcloud-client-2.6.5.ebuild 2013 BLAKE2B d2108ce06b9c25a56a13852fa5c8809217db7537346bb803311f5c034f483bcd050b8cb617c9bacde98b9e012cd91a2f130aa471b4190e013dca263080bef290 SHA512 338a289d30bbfb89619805425032142052860d86f415338d5e66e13ca05d6ca02d0ef0a41a41e5d889ce7ced734dc9a5ac50bfad6d00ed8b1e9fdaa0fc05df4d
 EBUILD nextcloud-client-3.0.0.ebuild 2022 BLAKE2B 7ee522c834b3e1ce046177e40c071cb15fdd940fd55b9124e22d9849f8ebf5c70c7a2a97003e1c707508b532c6c551dc7c6a11989182a2ad51b22fbdc07de1db SHA512 33858e8b186394ec736534eda2f972ce72c2c4fa57e489c2aeb78f70115d8f0bbb05ebf66c8fc5084af4539cd383981ce4264987297eed689dc3497e7e271a41
+EBUILD nextcloud-client-3.0.1.ebuild 2022 BLAKE2B 7ee522c834b3e1ce046177e40c071cb15fdd940fd55b9124e22d9849f8ebf5c70c7a2a97003e1c707508b532c6c551dc7c6a11989182a2ad51b22fbdc07de1db SHA512 33858e8b186394ec736534eda2f972ce72c2c4fa57e489c2aeb78f70115d8f0bbb05ebf66c8fc5084af4539cd383981ce4264987297eed689dc3497e7e271a41
 MISC metadata.xml 590 BLAKE2B 6ddde648f1b75a5ac3b83ff6b24cdef05b016052257dc99d152db249b029c88854a2b44a2d5a5e7a2b87b9148dbb677fa5bf12066c7f59a9ef5812bdbd57964b SHA512 27f8098bbdec79e03007513d2f4bd6799a399fc5930871542eedf3d018a13cacc1c4dfa23f9c78275c8e5a61830b1b6d4ebe667e3a4ff42541581d5287e940b4
diff --git a/net-misc/nextcloud-client/files/nextcloud-client-2.6.4-qt515.patch b/net-misc/nextcloud-client/files/nextcloud-client-2.6.4-qt515.patch
deleted file mode 100644
index 5c59cf46bf39..000000000000
--- a/net-misc/nextcloud-client/files/nextcloud-client-2.6.4-qt515.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 0fe7a657386b107ae498e7749ff4c20116b9752a Mon Sep 17 00:00:00 2001
-From: Michael Schuster <michael@schuster.ms>
-Date: Sun, 7 Jun 2020 02:43:45 +0200
-Subject: [PATCH] Fix Qt 5.15.0 build error (missing include)
-
-Signed-off-by: Michael Schuster <michael@schuster.ms>
----
- src/libsync/networkjobs.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp
-index fd63b9606..bb5786ea9 100644
---- a/src/libsync/networkjobs.cpp
-+++ b/src/libsync/networkjobs.cpp
-@@ -31,6 +31,7 @@
- #include <QJsonDocument>
- #include <QJsonObject>
- #include <QPainter>
-+#include <QPainterPath>
- 
- #include "networkjobs.h"
- #include "account.h"
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.5.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.5.2.ebuild
deleted file mode 100644
index 64e9dfd92b7f..000000000000
--- a/net-misc/nextcloud-client/nextcloud-client-2.5.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-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 shibboleth test"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3
-	>=dev-libs/openssl-1.1.0:0=
-	dev-libs/qtkeychain[qt5(+)]
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5
-	dev-qt/qtwebengine:5[widgets]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-fs/inotify-tools
-	dolphin? (
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kio:5
-	)
-	nautilus? ( dev-python/nautilus-python )
-	shibboleth? ( dev-qt/qtwebkit:5 )"
-
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-	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
-	)"
-
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/desktop-${PV/_/-}
-
-src_prepare() {
-	# 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-utils_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=$(usex !shibboleth)
-		-DUNIT_TESTING=$(usex test)
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	if ! use doc ; then
-		elog "Documentation and man pages not installed"
-		elog "Enable doc USE-flag to generate them"
-	fi
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild b/net-misc/nextcloud-client/nextcloud-client-3.0.1.ebuild
index c8d32ee60c14..b6dc27e09eaa 100644
--- a/net-misc/nextcloud-client/nextcloud-client-2.6.4.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-3.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="Desktop Syncing Client for Nextcloud"
 HOMEPAGE="https://github.com/nextcloud/desktop"
@@ -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 shibboleth test"
 
 COMMON_DEPEND=">=dev-db/sqlite-3.4:3
@@ -20,9 +20,12 @@ COMMON_DEPEND=">=dev-db/sqlite-3.4:3
 	dev-qt/qtconcurrent:5
 	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/qtsql:5
+	dev-qt/qtsvg:5
 	dev-qt/qtwebengine:5[widgets]
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
@@ -51,10 +54,6 @@ DEPEND="${COMMON_DEPEND}
 
 RESTRICT="!test? ( test )"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.6.1-include_tests.patch
-	"${FILESDIR}"/${P}-qt515.patch
-	)
-
 S=${WORKDIR}/desktop-${PV/_/-}
 
 src_prepare() {
@@ -66,7 +65,7 @@ src_prepare() {
 		cmake_comment_add_subdirectory nautilus
 		popd > /dev/null || die
 	fi
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -79,7 +78,7 @@ src_configure() {
 		-DUNIT_TESTING=$(usex test)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {