gentoo resync : 25.08.2018

4 files changed, 123 insertions, 2 deletions

diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index e40e1eb5f935..5e932dfb55c1 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,4 +1,7 @@
+AUX nextcloud-client-2.5.0_beta1-fix_cmake.patch 783 BLAKE2B e02f2df582ec0e1a2872e2d200fd20916b45a7c654be270b4cfb698010c494dd8babc1ead29daafcd2b80ffdc94e381de939619d1cf46080b9b170be8b3a1db9 SHA512 e3cd2de00c7baa00085498b05f4a64c63dd5e73f2ca435143e9069708e31d68a99bb3e903721a335256889c1e244b38c95ab8be7956a15ac3fd5c4dad2123343
 DIST nextcloud-client-2.3.3.tar.gz 708611 BLAKE2B 8f0a1f433ad18743e7d78bf4ab523e57f2c40cc1527508e940bb14c75f944723d728a5ee188c06a181ded535b910bea68620e8eb950c290af7556423fc28264f SHA512 fd02c61a7a92b77f9063e4f15be426be84d02033bead4b176d876134f8b85d7385e4a361959b68c332f1ccb55d43e2a8b55e0d5c8e5a54f645a5816a37790bde
+DIST nextcloud-client-2.5.0_beta1.tar.gz 18930446 BLAKE2B cb6630950e26013c96151a6f8fc236a9e25313fa6479e00de754fe9c45762c62042b039f18d11febfed4cac4e36c9d7bc2fdb25a522d1a6c153343eca03d46f7 SHA512 0d6a7b24965b4cdae41aacb06804ea5463309f219d39cefbf970ba57697035b4113d1f185166b51ab296745d26e43591896fa1c8fb7430a9d624f7547fafaea4
 DIST owncloudclient-2.3.3.tar.xz 33801712 BLAKE2B 7642148a4f503a2702d56f920067202699b4a55bb6216337ecbd9df141e0a7467aaf2db8d7d6871502061d3866294f8c44c791fdbf9597ca8d761f360f7ffda1 SHA512 8cbffd4fdd4bd3bbbfb947498ec9bfbaceac3966ac29d61dea3db82405976230c1067c3a3afc9ddc4ce152c69c530ad44be154615a391f63524dc2fb40d5e5d2
 EBUILD nextcloud-client-2.3.3.ebuild 2453 BLAKE2B e953f8c60f10101c891e46c98ba4c6c2f3ec09a17c40cdfe66687b31dcc0e17a9c3da8c4c8d6e7f27c1c0786f756dd98df2b979d671fa8d649d18eb1861fc7e2 SHA512 42614380bd5945afc39fb3b653c1d03e7afcd61f7bdb3715983198bb8dc7e75a029150189bf800ab39d9a0d9775aa3b05439269b6a0a987f9c02443167dc447f
-MISC metadata.xml 597 BLAKE2B 397ed87eb33cdcdb7fb56b9668bd6e9c5209f2e0ebf674f7ad3ddc7d5971f7e2a14a160c9ab9ea49ab5ea75cbde6114fa143c469bc83987a3c58a2b1615acdf2 SHA512 162d60e031785d85fd743e92f422579d3654414f014ea3a827f7f2467b5b7d6f7552593e68f46d29a8d757a31fa58c59aeae8acd9b99430a68648cd331fccb77
+EBUILD nextcloud-client-2.5.0_beta1.ebuild 2073 BLAKE2B c71f9f29633bfd6bd7da1bac441267234a427fbbccf4837e97d4935b620783a7327eabb62e5aaaf82d1942bfcfd22e82c8d736833accc5ed483db084572caf71 SHA512 1187ec4c134cad98547e5132d1677bba9d9f6e05d221598e62ab28c9e645f47a0f66367b03bed9b2083aa7e918f8bb78cd43bfbdc9eea656461202fb99d8a1d5
+MISC metadata.xml 590 BLAKE2B 6ddde648f1b75a5ac3b83ff6b24cdef05b016052257dc99d152db249b029c88854a2b44a2d5a5e7a2b87b9148dbb677fa5bf12066c7f59a9ef5812bdbd57964b SHA512 27f8098bbdec79e03007513d2f4bd6799a399fc5930871542eedf3d018a13cacc1c4dfa23f9c78275c8e5a61830b1b6d4ebe667e3a4ff42541581d5287e940b4
diff --git a/net-misc/nextcloud-client/files/nextcloud-client-2.5.0_beta1-fix_cmake.patch b/net-misc/nextcloud-client/files/nextcloud-client-2.5.0_beta1-fix_cmake.patch
new file mode 100644
index 000000000000..e160d514088f
--- /dev/null
+++ b/net-misc/nextcloud-client/files/nextcloud-client-2.5.0_beta1-fix_cmake.patch
@@ -0,0 +1,24 @@
+From 2b825a1748b2ecd624a38976d1bd6601bdb198c9 Mon Sep 17 00:00:00 2001
+From: Ronny Kunze <Shinji.Ikari_de@gmx.de>
+Date: Sat, 4 Aug 2018 16:53:06 +0200
+Subject: [PATCH] rearange CMake find_package OpenSSL
+
+the command seems to be malformed . The keyword VERSION is not valid .
+And the version should follow direct after the packagename.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f8b8330f2..f1d07eea2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -183,7 +183,7 @@ if(BUILD_CLIENT)
+     endif()
+     find_package(Sphinx)
+     find_package(PdfLatex)
+-    find_package(OpenSSL REQUIRED VERSION 1.1)
++    find_package(OpenSSL 1.1 REQUIRED )
+ 
+    find_package(ZLIB REQUIRED)
+    find_package(GLib2)
diff --git a/net-misc/nextcloud-client/metadata.xml b/net-misc/nextcloud-client/metadata.xml
index 965f93ab61b0..4342ef68dc63 100644
--- a/net-misc/nextcloud-client/metadata.xml
+++ b/net-misc/nextcloud-client/metadata.xml
@@ -11,6 +11,6 @@
 		<flag name="shibboleth">Build support for Shibboleth single sign-on</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">nextcloud/client_theming</remote-id>
+		<remote-id type="github">nextcloud/desktop</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.5.0_beta1.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.5.0_beta1.ebuild
new file mode 100644
index 000000000000..388cf73e7697
--- /dev/null
+++ b/net-misc/nextcloud-client/nextcloud-client-2.5.0_beta1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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/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}
+	!net-misc/ocsync
+	!net-misc/owncloud-client
+"
+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
+	)
+"
+
+S=${WORKDIR}/desktop-${PV/_/-}
+
+PATCHES=( "${FILESDIR}"/${P}-fix_cmake.patch )
+
+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
+}