aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Freyermuth <o.freyermuth@googlemail.com>2017-05-19 21:09:43 +0200
committerJustin Lecher <jlec@gentoo.org>2017-05-20 10:51:42 +0100
commit1a01c487a27ff2e2d67b2926b146f87ec2fcf93b (patch)
treec5b5d3845bee7fac5773a2c6aacb2c014d5a6c3d /net-misc
parentsci-biology/MaSuRCA: version bump (diff)
downloadsci-1a01c487a27ff2e2d67b2926b146f87ec2fcf93b.tar.gz
sci-1a01c487a27ff2e2d67b2926b146f87ec2fcf93b.tar.bz2
sci-1a01c487a27ff2e2d67b2926b146f87ec2fcf93b.zip
net-misc/cernbox-client: Bump to 2.3.2 release, drop old.
Following new owncloud-client version. Package-Manager: Portage-2.3.5, Repoman-2.3.2 Closes: https://github.com/gentoo/sci/pull/788
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/cernbox-client/Manifest3
-rw-r--r--net-misc/cernbox-client/cernbox-client-2.2.4-r1.ebuild106
-rw-r--r--net-misc/cernbox-client/cernbox-client-2.3.2.ebuild (renamed from net-misc/cernbox-client/cernbox-client-2.3.0.ebuild)0
-rw-r--r--net-misc/cernbox-client/files/shell-integration-nautilus.patch25
4 files changed, 1 insertions, 133 deletions
diff --git a/net-misc/cernbox-client/Manifest b/net-misc/cernbox-client/Manifest
index b4ec721bd..9f74e0f54 100644
--- a/net-misc/cernbox-client/Manifest
+++ b/net-misc/cernbox-client/Manifest
@@ -1,4 +1,3 @@
DIST cernbox-client-2.2.4-1.1.src.rpm 14208412 SHA256 1835b660026026a1fd30ef45c2f0d76fbf8efb2970399c24467c9e1611745838 SHA512 24b2a56eb7cc520271ea5f4900f86852cf34ff500b5339b63984b74a40288e30fe785fc9815937637211e7c3d8d7fde7f509f0319d676522641e04ef8192db1e WHIRLPOOL af3c11d30b77d6722c67bb561d1d6e3ab125824d3a25265d25227dfc0ef4f2198d0dfe733b0ca5a3098f59b6da08fbcdb2fac81d02b025ca3215196bf2a4e337
-DIST owncloudclient-2.2.4.tar.xz 12216896 SHA256 f313534f7cdae686beeaa6670d9e3586a627ce78b67cab6e42a448a675d9e7d3 SHA512 5bc5273c90ab63c411e58d1fe13636f6b5977c28470efe53296a71541aaa63af99001cb630adaee99b9b81a8b56fe0f66c337319464ab950dd6eac4cdd53f951 WHIRLPOOL 18aa5076049f9cdfbafa58454937b7fc4c38a5405b6e1375d762d88bbfae92b813cd2ec88a4e4108012137c94908894821575d3f6d2bf694e35d734f2b8fbd37
-DIST owncloudclient-2.3.0.tar.xz 12256428 SHA256 8e692d2eda2d74b233c67dfbd14a7a440508529a1ca73241890e926deb275081 SHA512 a0bb33ad110cfa215e87ef31ff5c4ba1a9df4f80ea48bd267e354fe1d27702d6c5b30ba3cdae5f5c7775da64260bd4f4e5c6dec977694d23addbc9e29348c8b1 WHIRLPOOL 957cde17f2e6eddfe411f49dbe824194d1f643c4a0ce870a5911834fcccb96e6e2684a325dc426c1dd8bba545f6abc301fa030066eab211a1f58bba66b58b7de
DIST owncloudclient-2.3.1.tar.xz 12260696 SHA256 93143752234a0bc4c9798b69d8239996d92130eecdc1d93b75e3d49b899f3914 SHA512 2dec3d4b452faca32e15c1a461d3fec97fc1c2e85bbfe2cb02035371a5426b8458be1382ed6b4a1102a4f38241580c3d49980ea388344365297a4a84f8dc9add WHIRLPOOL 49abeb9b9843a024338cd2d7c3a87625f7cd4f832db03513dc4d7b0d5d1908a5691d6f1e7b7437175084c30a5e3e18d837785afa5647971fdcb8e963db2d54b5
+DIST owncloudclient-2.3.2.tar.xz 12266008 SHA256 a1199d2b957a28081aff11a2a7e471ca09c965bbb1b51b1b7b7a8706304f5f09 SHA512 8abe071c28b365c100eb30ed91610640a25a7385f4347f5527289f4664788bda375e9618396ffa3e441c7e473da55bdaf7a5cdd99c8fd5801de78cb945fabb9c WHIRLPOOL 099c963940b6fec67d5d14b8d3a62eaf378617a7e8a73ca9b82c6f82451a6e80a6da4f0f0ea44e6064d5fceada68f6e1591e499e3ea2f6dfe14c6e0efa01537a
diff --git a/net-misc/cernbox-client/cernbox-client-2.2.4-r1.ebuild b/net-misc/cernbox-client/cernbox-client-2.2.4-r1.ebuild
deleted file mode 100644
index d6687b872..000000000
--- a/net-misc/cernbox-client/cernbox-client-2.2.4-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils rpm
-
-DESCRIPTION="Synchronize files from CERNbox EOS with your computer"
-
-# Origin is classic owncloud-client, branded for CERN during compilation.
-ORIGIN_P="owncloudclient"
-BRANDED_P="cernbox"
-BRANDED_PV="2.2.4"
-BRANDED_REL="1.1"
-
-HOMEPAGE="https://cernbox.cern.ch/"
-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"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3
- dev-libs/qtkeychain[qt5]
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtsql:5
- dev-qt/qtwebkit: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
-"
-DEPEND="${COMMON_DEPEND}
- dev-qt/linguist-tools:5
- doc? (
- dev-python/sphinx
- dev-texlive/texlive-latexextra
- virtual/latex-base
- )
- dolphin? ( kde-frameworks/extra-cmake-modules )
- test? (
- dev-util/cmocka
- dev-qt/qttest:5
- )
-"
-
-S=${WORKDIR}/owncloudclient-${PV}
-
-src_unpack() {
- rpm_src_unpack ${PN}-${BRANDED_PV}-${BRANDED_REL}.src.rpm
- mv ${PN/-}-${BRANDED_PV}/cernbox "${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"
-
- if ! use nautilus; then
- pushd shell_integration > /dev/null || die
- cmake_comment_add_subdirectory nautilus
- popd > /dev/null || die
- fi
-
- eapply "${FILESDIR}"/shell-integration-nautilus.patch
-
- default
-}
-
-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_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
- )
-
- 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
-}
diff --git a/net-misc/cernbox-client/cernbox-client-2.3.0.ebuild b/net-misc/cernbox-client/cernbox-client-2.3.2.ebuild
index 6f3ad8c70..6f3ad8c70 100644
--- a/net-misc/cernbox-client/cernbox-client-2.3.0.ebuild
+++ b/net-misc/cernbox-client/cernbox-client-2.3.2.ebuild
diff --git a/net-misc/cernbox-client/files/shell-integration-nautilus.patch b/net-misc/cernbox-client/files/shell-integration-nautilus.patch
deleted file mode 100644
index 45cc39e3d..000000000
--- a/net-misc/cernbox-client/files/shell-integration-nautilus.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5f2b1999f6c22b293cb8aa91835b53cedc2dec94 Mon Sep 17 00:00:00 2001
-From: Christian Kamm <mail@ckamm.de>
-Date: Wed, 28 Sep 2016 13:09:15 +0200
-Subject: [PATCH] Package: Fix nautilus plugin name collision when branded
-
-As suggested by @olifre in #5183
----
- shell_integration/nautilus/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/shell_integration/nautilus/CMakeLists.txt b/shell_integration/nautilus/CMakeLists.txt
-index 6c1e9f7..3391102 100644
---- a/shell_integration/nautilus/CMakeLists.txt
-+++ b/shell_integration/nautilus/CMakeLists.txt
-@@ -19,8 +19,8 @@ if( UNIX AND NOT APPLE )
- ERROR_VARIABLE errors OUTPUT_VARIABLE out)
-
-
-- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/syncstate.py DESTINATION ${DATADIR}/nautilus-python/extensions)
-- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/syncstate_nemo.py DESTINATION ${DATADIR}/nemo-python/extensions RENAME syncstate.py)
-+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/syncstate.py DESTINATION ${DATADIR}/nautilus-python/extensions RENAME syncstate-${APPLICATION_SHORTNAME}.py)
-+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/syncstate_nemo.py DESTINATION ${DATADIR}/nemo-python/extensions RENAME syncstate-${APPLICATION_SHORTNAME}.py)
-
-
-