gentoo resync : 18.11.2019

4 files changed, 99 insertions, 2 deletions

diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index db345476a672..1f687584d7e4 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,5 +1,7 @@
 DIST nextcloud-client-2.5.2.tar.gz 18995992 BLAKE2B 6ad23962d327c1feeec34f59092021f7f82f4baeaf973fac0572db55cb03bc8ba2ed0c5037bcbfa80ca057d3976aaf6e402e129f2ec963b3a9c432330ef6aaf3 SHA512 1000b420355d7a4104ca5b41e813d467dcb345b60c79c78ce532de9c58ea89cad10d5565a433409bd512f0f7771c18c7c27974b968c74f84ccfda1ed3510d3ae
 DIST nextcloud-client-2.6.0.tar.gz 18789917 BLAKE2B db5c703ecf630a96c141c9c8a7b15894c5a679e1b36217f38a02cd55307fadb5ea19c13ab44371fbbcf0610ddafdd2fb0c1ef6119db04808b94a72dbfb27da9a SHA512 161733540de85c436e204b150fb91b527737fee213e569335248ce7c6e1446497aad5e3fa814b3f98a1ec0cdb94fad64ccc0807eb953a94170f9d40abb478545
-EBUILD nextcloud-client-2.5.2.ebuild 2004 BLAKE2B bf10f233d3d41a8aeefef7c8c14fd996b75dacd66daa79573ae391896704397fc448b7c85ce3047372bf1fe02938aee85d0a9e85287e4e7fb1ab99a6c8a92df2 SHA512 b10fe3a2a696763d6ea390966b3597efd76da7c88d1b98a757031a47ea9762f9fa02d762ce337c142a723ec8ed4bf81dec59c78c73ffc3127a8d235c5c7b64a5
-EBUILD nextcloud-client-2.6.0.ebuild 1997 BLAKE2B 93dcb863a801307fc378326d0d3027e23b6db25d70cadd8c58d5a5cc5a17d4847f8018574823a933b634c76b2018590a64083ef12cc7b4384d1d0e8701c1739b SHA512 39367dad554bbf6a6d062dc1f85474b931d6a92d099957f0322ec100eaa540c925574afefbd69407a007509bf2f0ba2960065aafe61d5538d2f5c86b48e21a0b
+DIST nextcloud-client-2.6.1.tar.gz 18947504 BLAKE2B 940145f9f633ad35e740a92d44d0d7172f7c0883bf29951694dd540213dcfc64f9d480a1cd38b586842dad8c96d3c2948d6e8af6042005f0cd23d9b6d3eab7c6 SHA512 dbda59f5ef6f5f85d8344732be4a0b51e51fa9d0180d5b589f79ab6fe1bacf3a63879aee2f297bc76d6257dd830b38c695cf88f98b9e3f788acf9d6b2f11f619
+EBUILD nextcloud-client-2.5.2.ebuild 2032 BLAKE2B 7d8868094ef1a9c9204165ae2e716f09e1964c2eaad5e74a100492a11b3d180ec6ac66f6fc3374515c01dcf8430f1cf00ee845d1ea27ab6026b98dbc24b78eb0 SHA512 18b8ff5a30c85e4cfeb487e8f1cdd70b088e729b27a3031ec5bcdc1378bcbc9fd8f17d4b225067e2c9c024373cb76c42a32674bcad5f7069fd50c578442b5f17
+EBUILD nextcloud-client-2.6.0.ebuild 2025 BLAKE2B eac2c678f5ec56df913561427cd809d7bf78b29b98c93bd7a07ee507a937d86932d7b79fefa1b830fb444bed242f3a0f25db617a647c2b9cf8c182a8adde6919 SHA512 993568c7066c2e3ae06fff1440c2d183fc383ce42e2b8ea7682a2678437ec4fbcc29ea16fec6a43ec9069df0081b192bef46f7e25093633e517b3eb0851c8065
+EBUILD nextcloud-client-2.6.1.ebuild 2025 BLAKE2B eac2c678f5ec56df913561427cd809d7bf78b29b98c93bd7a07ee507a937d86932d7b79fefa1b830fb444bed242f3a0f25db617a647c2b9cf8c182a8adde6919 SHA512 993568c7066c2e3ae06fff1440c2d183fc383ce42e2b8ea7682a2678437ec4fbcc29ea16fec6a43ec9069df0081b192bef46f7e25093633e517b3eb0851c8065
 MISC metadata.xml 590 BLAKE2B 6ddde648f1b75a5ac3b83ff6b24cdef05b016052257dc99d152db249b029c88854a2b44a2d5a5e7a2b87b9148dbb677fa5bf12066c7f59a9ef5812bdbd57964b SHA512 27f8098bbdec79e03007513d2f4bd6799a399fc5930871542eedf3d018a13cacc1c4dfa23f9c78275c8e5a61830b1b6d4ebe667e3a4ff42541581d5287e940b4
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.5.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.5.2.ebuild
index ec0ad38c8fec..64e9dfd92b7f 100644
--- a/net-misc/nextcloud-client/nextcloud-client-2.5.2.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-2.5.2.ebuild
@@ -49,6 +49,8 @@ DEPEND="${COMMON_DEPEND}
 		dev-qt/qttest:5
 	)"
 
+RESTRICT="!test? ( test )"
+
 S=${WORKDIR}/desktop-${PV/_/-}
 
 src_prepare() {
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.6.0.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.6.0.ebuild
index e931c2d92649..6a82390c3c07 100644
--- a/net-misc/nextcloud-client/nextcloud-client-2.6.0.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-2.6.0.ebuild
@@ -49,6 +49,8 @@ DEPEND="${COMMON_DEPEND}
 		dev-qt/qttest:5
 	)"
 
+RESTRICT="!test? ( test )"
+
 S=${WORKDIR}/desktop-${PV/_/-}
 
 src_prepare() {
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.6.1.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.6.1.ebuild
new file mode 100644
index 000000000000..6a82390c3c07
--- /dev/null
+++ b/net-misc/nextcloud-client/nextcloud-client-2.6.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg-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
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}