gentoo resync : 15.12.2019

4 files changed, 31 insertions, 14 deletions

diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 1f687584d7e4..71c6313b1458 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,7 +1,8 @@
+AUX nextcloud-client-2.6.1-include_tests.patch 679 BLAKE2B 654c729a191643d4a37c301b4be62c495f059c81fcd1f3d8a5a85c579400fd97b86bb057c82bfb790588c9faa6f302a239b1c043ab53530713cb75a88179654c SHA512 c14054e6dc228ca77a659371b3c151e0551477fce3a2678a54da4ba73adbcf972a78114c5649adc3dc813fb01b55bbb812620caac0bc0460519424c2caa6c81f
 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
 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
+EBUILD nextcloud-client-2.6.0.ebuild 1973 BLAKE2B ebe8613b3bae1c5f073404b358e70bc69552eeae1640c06f885af276d36a59b3cfbc182176672dd475e6bd927be12267029be04d791bd137e3bb483f3d2bdb02 SHA512 c10355ffa0c739f8db536b61fa22083af25c3499650ec6a60b42bc5410ec4d85bc1c12c224b8b443a2cc2b17174107fe5b8fb38d508a452f96fd0fd4622e81d3
+EBUILD nextcloud-client-2.6.1.ebuild 2025 BLAKE2B 99b22e5e6ef99827c0846c2a1eaecae496376837d72c216358c530a8c03d3a8bdd607d26753d7c978018d01b285092a42bb77f1681f3fe31715d8acf92916f8b SHA512 d682fdc9c325c314b709d7de19499b3dda98bf3e75f519750e6269018b68e15c81fb7e26959effb9559a9d8a2530c386348cf03f97a58c77e159b816da23a751
 MISC metadata.xml 590 BLAKE2B 6ddde648f1b75a5ac3b83ff6b24cdef05b016052257dc99d152db249b029c88854a2b44a2d5a5e7a2b87b9148dbb677fa5bf12066c7f59a9ef5812bdbd57964b SHA512 27f8098bbdec79e03007513d2f4bd6799a399fc5930871542eedf3d018a13cacc1c4dfa23f9c78275c8e5a61830b1b6d4ebe667e3a4ff42541581d5287e940b4
diff --git a/net-misc/nextcloud-client/files/nextcloud-client-2.6.1-include_tests.patch b/net-misc/nextcloud-client/files/nextcloud-client-2.6.1-include_tests.patch
new file mode 100644
index 000000000000..da8423022b7a
--- /dev/null
+++ b/net-misc/nextcloud-client/files/nextcloud-client-2.6.1-include_tests.patch
@@ -0,0 +1,22 @@
+From f9c6449c050cad673cf37971d9815a35e6ffb5dd Mon Sep 17 00:00:00 2001
+From: tuxmaster5000 <837503+tuxmaster5000@users.noreply.github.com>
+Date: Fri, 12 Oct 2018 15:56:26 +0200
+Subject: [PATCH] Fix include file
+
+---
+ test/testnextcloudpropagator.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/testnextcloudpropagator.cpp b/test/testnextcloudpropagator.cpp
+index 6ad1a6b37..dc2e476ad 100644
+--- a/test/testnextcloudpropagator.cpp
++++ b/test/testnextcloudpropagator.cpp
+@@ -8,7 +8,7 @@
+ #include <QDebug>
+ 
+ #include "propagatedownload.h"
+-#include "nextcloudpropagator_p.h"
++#include "owncloudpropagator_p.h"
+ 
+ using namespace OCC;
+ namespace OCC {
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 6a82390c3c07..9b0d12160a76 100644
--- a/net-misc/nextcloud-client/nextcloud-client-2.6.0.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-2.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake-utils xdg
 
 DESCRIPTION="Desktop Syncing Client for Nextcloud"
 HOMEPAGE="https://github.com/nextcloud/desktop"
@@ -79,13 +79,9 @@ src_configure() {
 }
 
 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
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
 }
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.6.1.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.6.1.ebuild
index 6a82390c3c07..ba40a56dc34c 100644
--- a/net-misc/nextcloud-client/nextcloud-client-2.6.1.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-2.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake-utils xdg
 
 DESCRIPTION="Desktop Syncing Client for Nextcloud"
 HOMEPAGE="https://github.com/nextcloud/desktop"
@@ -51,6 +51,8 @@ DEPEND="${COMMON_DEPEND}
 
 RESTRICT="!test? ( test )"
 
+PATCHES=( "${FILESDIR}"/${P}-include_tests.patch )
+
 S=${WORKDIR}/desktop-${PV/_/-}
 
 src_prepare() {
@@ -79,13 +81,9 @@ src_configure() {
 }
 
 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
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
 }