commit:     51a05d718ba4cf1bd765422967bdc86d50453233
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 20 16:31:52 2018 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Mon Aug 20 18:13:25 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51a05d71

net-misc/nextcloud-client: 2.5.0_beta1 bump

Masked beta version to test upstream changes and openssl-1.1 dependency

Package-Manager: Portage-2.3.47, Repoman-2.3.10

 net-misc/nextcloud-client/Manifest                 |  1 +
 .../nextcloud-client-2.5.0_beta1-fix_cmake.patch   | 24 ++++++
 .../nextcloud-client-2.5.0_beta1.ebuild            | 94 ++++++++++++++++++++++
 3 files changed, 119 insertions(+)

diff --git a/net-misc/nextcloud-client/Manifest 
b/net-misc/nextcloud-client/Manifest
index 641c6718514..1614fe6f864 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,2 +1,3 @@
 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

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 00000000000..e160d514088
--- /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...@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/nextcloud-client-2.5.0_beta1.ebuild 
b/net-misc/nextcloud-client/nextcloud-client-2.5.0_beta1.ebuild
new file mode 100644
index 00000000000..388cf73e769
--- /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
+}

Reply via email to