[gentoo-commits] proj/sci:master commit in: net-misc/cernbox-client/files/, net-misc/cernbox-client/

[Horea Christian]

commit:     ff37c2c1cbd5798ee4c5306429d8b0977b6cc64b
Author:     Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Sun Oct  4 18:34:12 2020 +0000
Commit:     Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Mon Oct  5 20:21:40 2020 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=ff37c2c1

net-misc/cernbox-client: Bump to version 2.6.3.14058.

This commit also drops the old version in one commit,
since it was broken in any case (fetching failed).

It also adds myself as maintainer.

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Signed-off-by: Horea Christian <chr <AT> chymera.eu>

 ....2.ebuild => cernbox-client-2.6.3.14058.ebuild} | 75 +++++++++++-----------
 .../files/owncloud-client-2.6.3.14058-qt515.patch  | 11 ++++
 net-misc/cernbox-client/metadata.xml               | 21 +++---
 3 files changed, 59 insertions(+), 48 deletions(-)

diff --git a/net-misc/cernbox-client/cernbox-client-2.3.2.ebuild b/net-misc/cernbox-client/cernbox-client-2.6.3.14058.ebuild
similarity index 51%
rename from net-misc/cernbox-client/cernbox-client-2.3.2.ebuild
rename to net-misc/cernbox-client/cernbox-client-2.6.3.14058.ebuild
index 9513b064b..5cb28eec0 100644
--- a/net-misc/cernbox-client/cernbox-client-2.3.2.ebuild
+++ b/net-misc/cernbox-client/cernbox-client-2.6.3.14058.ebuild
@@ -1,55 +1,50 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils rpm
+inherit cmake rpm xdg
+
+DESCRIPTION="Synchronize files from CERNBox EOS with your computer"
 
 # Origin is classic owncloud-client, branded for CERN during compilation.
-ORIGIN_P="owncloudclient"
+ORIGIN_P="owncloud-client"
 BRANDED_P="cernbox"
-BRANDED_PV="2.2.4"
-BRANDED_REL="1.1"
-
-DESCRIPTION="Synchronize files from CERNbox EOS with your computer"
+BRANDED_PV="2.5.4"
+BRANDED_REL="2719.1"
+BRANDED_TS="202002062027"
 HOMEPAGE="https://cernbox.cern.ch/"
-SRC_URI="
-	http://download.owncloud.com/desktop/stable/${ORIGIN_P}-${PV}.tar.xz
+SRC_URI="http://download.owncloud.com/desktop/stable/${ORIGIN_P/-}-${PV}.tar.xz
 	https://cernbox.cern.ch/cernbox/doc/Linux/repo/CentOS_7/src/${PN}-${BRANDED_PV}-${BRANDED_REL}.src.rpm"
 
 LICENSE="CC-BY-3.0 GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc dolphin nautilus samba +sftp test"
+IUSE="doc dolphin gnome-keyring nautilus test"
 
-COMMON_DEPEND="
-	>=dev-db/sqlite-3.4:3
-	dev-libs/qtkeychain
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3
+	dev-libs/qtkeychain[gnome-keyring?,qt5(+)]
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
+	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtsql:5
-	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
 	sys-fs/inotify-tools
-	virtual/libiconv
 	dolphin? (
 		kde-frameworks/kcoreaddons:5
 		kde-frameworks/kio:5
 	)
-	nautilus? ( dev-python/nautilus-python )
-	samba? ( >=net-fs/samba-3.5 )
-	sftp? ( >=net-libs/libssh-0.5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!net-misc/ocsync
-	!net-misc/nextcloud-client
-"
+	nautilus? ( dev-python/nautilus-python )"
+
+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
 	)
@@ -57,43 +52,44 @@ DEPEND="${COMMON_DEPEND}
 	test? (
 		dev-util/cmocka
 		dev-qt/qttest:5
-	)
-"
+	)"
+
+RESTRICT="!test? ( test )"
 
 S=${WORKDIR}/owncloudclient-${PV}
 
+PATCHES=( "${FILESDIR}"/${ORIGIN_P}-${PV}-qt515.patch )
+
 src_unpack() {
-	rpm_src_unpack ${PN}-${BRANDED_PV}-${BRANDED_REL}.src.rpm
-	mv ${PN/-}-${BRANDED_PV}/cernbox "${S}" || die "failed to extract branding"
+	rpm_src_unpack ${PN}-${BRANDED_PV}-${BRANDED_REL}.src.rpm || die "failed to extract branding RPM"
+	mv ${PN/-}-${BRANDED_PV}.${BRANDED_TS}/cernbox "${S}" || die "failed to extract branding"
+	rm -rf "${S}/theme" || die "failed to remove vanilla theme"
+	mv ${PN/-}-${BRANDED_PV}.${BRANDED_TS}/theme "${S}" || die "failed to extract branding"
 }
 
 src_prepare() {
 	# Keep tests in ${T}
-	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.cpp || die "sed failed"
+	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
-	default
+	cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
 		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
-		-DWITH_ICONV=ON
-		-DWITH_DOC=$(usex doc)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Sphinx=$(usex !doc)
 		-DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin)
-		-DBUILD_WITH_QT4=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=$(usex !samba)
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=$(usex !sftp)
-		-DUNIT_TESTING=$(usex test)
-		-DOEM_THEME_DIR=${PWD}/${BRANDED_P}/mirall
+		-DBUILD_TESTING=$(usex test)
+		-DOEM_THEME_DIR=${PWD}/${BRANDED_P}/syncclient
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
@@ -101,4 +97,5 @@ pkg_postinst() {
 		elog "Documentation and man pages not installed"
 		elog "Enable doc USE-flag to generate them"
 	fi
+	xdg_pkg_postinst
 }

diff --git a/net-misc/cernbox-client/files/owncloud-client-2.6.3.14058-qt515.patch b/net-misc/cernbox-client/files/owncloud-client-2.6.3.14058-qt515.patch
new file mode 100644
index 000000000..57dd20938
--- /dev/null
+++ b/net-misc/cernbox-client/files/owncloud-client-2.6.3.14058-qt515.patch
@@ -0,0 +1,11 @@
+diff -Naur owncloudclient-2.6.3.14058.orig/src/libsync/networkjobs.cpp owncloudclient-2.6.3.14058/src/libsync/networkjobs.cpp
+--- owncloudclient-2.6.3.14058.orig/src/libsync/networkjobs.cpp	2020-06-12 14:35:04.000000000 +0200
++++ owncloudclient-2.6.3.14058/src/libsync/networkjobs.cpp	2020-06-13 11:18:28.822842347 +0200
+@@ -31,6 +31,7 @@
+ #include <QJsonObject>
+ #ifndef TOKEN_AUTH_ONLY
+ #include <QPainter>
++#include <QPainterPath>
+ #endif
+ 
+ #include "networkjobs.h"

diff --git a/net-misc/cernbox-client/metadata.xml b/net-misc/cernbox-client/metadata.xml
index ac0a4fc58..c67ea7b66 100644
--- a/net-misc/cernbox-client/metadata.xml
+++ b/net-misc/cernbox-client/metadata.xml
@@ -1,27 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>o.freyermuth@××××××××××.com</email>
+		<name>Oliver Freyermuth</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>sci-physics@g.o</email>
 		<name>Gentoo Physics Project</name>
 	</maintainer>
 	<longdescription lang="en">
-This service provides a cloud synchronisation service for all CERN users between personal devices (like a laptop) and a centrally-managed data storage.
+		This service provides a cloud synchronisation service for all CERN users between personal devices (like a laptop) and a centrally-managed data storage.
 
-Available to all CERN users. This service provides synchronisation capabilities:
-everyone having a CERN computing account can use box to synchronise data (files and directories) across a series of (mobile) devices (smartphones, tablet, laptop, desktop).
-Major software distributions are supported (notably recent Mac, Linux and Windows).
+		Available to all CERN users. This service provides synchronisation capabilities:
+		everyone having a CERN computing account can use box to synchronise data (files and directories) across a series of (mobile) devices (smartphones, tablet, laptop, desktop).
+		Major software distributions are supported (notably recent Mac, Linux and Windows).
 
-The service provides off-line eventually synchronised access to data and it is also meant for data sharing across collaborators (for example to share presentations or text documents).
+		The service provides off-line eventually synchronised access to data and it is also meant for data sharing across collaborators (for example to share presentations or text documents).
 
-The service is not suitable for critical-path activities like data acquisition, world-wide data distribution and massive batch processing.
-</longdescription>
+		The service is not suitable for critical-path activities like data acquisition, world-wide data distribution and massive batch processing.
+	</longdescription>
 	<use>
 		<flag name="dolphin">Install the <pkg>kde-apps/dolphin</pkg> extension</flag>
 		<flag name="nautilus">Install the <pkg>gnome-base/nautilus</pkg> extension</flag>
-		<flag name="sftp">Enable sftp transfer support via <pkg>net-libs/libssh</pkg></flag>
 	</use>
 	<upstream>
-		<doc>http://cernbox.web.cern.ch/cernbox/00_getting_started/index.html</doc>
+		<doc>https://cernbox.web.cern.ch/cernbox/</doc>
 	</upstream>
 </pkgmetadata>