From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1333723-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C80AD158087 for <garchives@archives.gentoo.org>; Tue, 26 Oct 2021 10:44:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D6B74E0844; Tue, 26 Oct 2021 10:44:04 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9C9C2E0845 for <gentoo-commits@lists.gentoo.org>; Tue, 26 Oct 2021 10:44:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 814A4343975 for <gentoo-commits@lists.gentoo.org>; Tue, 26 Oct 2021 10:44:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0EFC1178 for <gentoo-commits@lists.gentoo.org>; Tue, 26 Oct 2021 10:44:02 +0000 (UTC) From: "Andrew Ammerlaan" <andrewammerlaan@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" <andrewammerlaan@gentoo.org> Message-ID: <1635244232.2d0d3f4ff85978975d360f96969e323f129c5d53.andrewammerlaan@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: net-misc/cernbox-client/, net-misc/cernbox-client/files/ X-VCS-Repository: proj/sci X-VCS-Files: net-misc/cernbox-client/cernbox-client-2.9.1.5500.ebuild net-misc/cernbox-client/files/cernbox-theme-2.9.1.patch X-VCS-Directories: net-misc/cernbox-client/files/ net-misc/cernbox-client/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 2d0d3f4ff85978975d360f96969e323f129c5d53 X-VCS-Branch: master Date: Tue, 26 Oct 2021 10:44:02 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4d2f8f79-083c-457a-9a09-a62b6a80564d X-Archives-Hash: 9dfa1e9c9b4f68b79ff64bbfda550b86 commit: 2d0d3f4ff85978975d360f96969e323f129c5d53 Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com> AuthorDate: Sat Oct 23 18:54:16 2021 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Tue Oct 26 10:30:32 2021 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=2d0d3f4f net-misc/cernbox-client: Bump to 2.9.1.5500. Requires a small patch to the CERNBox theme due to ownCloud upstream changes to themeing. Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com> Closes: https://github.com/gentoo/sci/pull/1116 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> .../cernbox-client-2.9.1.5500.ebuild | 83 ++++++++++++++++++++++ .../cernbox-client/files/cernbox-theme-2.9.1.patch | 11 +++ 2 files changed, 94 insertions(+) diff --git a/net-misc/cernbox-client/cernbox-client-2.9.1.5500.ebuild b/net-misc/cernbox-client/cernbox-client-2.9.1.5500.ebuild new file mode 100644 index 000000000..482b29c54 --- /dev/null +++ b/net-misc/cernbox-client/cernbox-client-2.9.1.5500.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake rpm xdg + +DESCRIPTION="Synchronize files from CERNBox EOS with your computer" + +# Origin is classic owncloud-client, branded for CERN during compilation. +ORIGIN_PN="ownCloud" +BRANDED_P="cernbox" +BRANDED_PV="2.7.1" +BRANDED_REL="2596" +HOMEPAGE="https://cernbox.cern.ch/" +SRC_URI="http://download.owncloud.com/desktop/${ORIGIN_PN}/stable/${PV}/source/${ORIGIN_PN}-${PV}.tar.xz + https://cernbox.cern.ch/cernbox/doc/Linux/repo/CentOS_7/src/${PN}-${BRANDED_PV}-${BRANDED_REL}.src.rpm + https://cern.ch/ofreyerm/gentoo/cernbox/${PN}-${BRANDED_PV}-${BRANDED_REL}.src.rpm" + +LICENSE="CC-BY-3.0 GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="dolphin gnome-keyring nautilus test" + +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[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 )" + +RDEPEND="${COMMON_DEPEND}" +DEPEND="${COMMON_DEPEND} + dev-qt/linguist-tools:5 + kde-frameworks/extra-cmake-modules + test? ( + dev-util/cmocka + dev-qt/qttest:5 + )" + +RESTRICT="!test? ( test )" + +S=${WORKDIR}/${ORIGIN_PN}-${PV} + +PATCHES=( "${FILESDIR}"/cernbox-theme-2.9.1.patch ) + +src_unpack() { + rpm_src_unpack ${PN}-${BRANDED_PV}-${BRANDED_REL}.src.rpm || die "failed to extract branding RPM" + mv ${PN%-*}-${BRANDED_PV}.${BRANDED_REL}/branding "${S}" || die "failed to extract branding" +} + +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_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc + -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} + -DBUILD_SHELL_INTEGRATION_DOLPHIN=$(usex dolphin) + -DBUILD_TESTING=$(usex test) + ) + + cmake_src_configure +} diff --git a/net-misc/cernbox-client/files/cernbox-theme-2.9.1.patch b/net-misc/cernbox-client/files/cernbox-theme-2.9.1.patch new file mode 100644 index 000000000..c2ccbcc5e --- /dev/null +++ b/net-misc/cernbox-client/files/cernbox-theme-2.9.1.patch @@ -0,0 +1,11 @@ +--- a/branding/cernbox-theme.h 2021-10-21 13:10:22.832842670 +0200 ++++ b/branding/cernbox-theme.h 2021-10-21 13:14:57.394479817 +0200 +@@ -62,7 +62,7 @@ + + + QString about() const { +- QString devString = tr("<p>Version %1. For more information visit <a href=\"%2\">https://%3</a></p>").arg(Utility::escape(QStringLiteral(MIRALL_VERSION_STRING)), Utility::escape(QStringLiteral("https://" MIRALL_STRINGIFY(APPLICATION_DOMAIN))), Utility::escape(QStringLiteral(MIRALL_STRINGIFY(APPLICATION_DOMAIN)))); ++ QString devString = tr("<p>Version %1. For more information visit <a href=\"%2\">https://%3</a></p>").arg(Utility::escape(QStringLiteral(MIRALL_VERSION_STRING)), Utility::escape(QStringLiteral("https://" APPLICATION_DOMAIN)), Utility::escape(QStringLiteral(APPLICATION_DOMAIN))); + + + return devString;