commit: 1a01c487a27ff2e2d67b2926b146f87ec2fcf93b Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com> AuthorDate: Fri May 19 19:09:43 2017 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Sat May 20 09:51:42 2017 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=1a01c487
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 .../cernbox-client/cernbox-client-2.2.4-r1.ebuild | 106 --------------------- ...nt-2.3.0.ebuild => cernbox-client-2.3.2.ebuild} | 0 .../files/shell-integration-nautilus.patch | 25 ----- 3 files changed, 131 deletions(-) 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 similarity index 100% rename from net-misc/cernbox-client/cernbox-client-2.3.0.ebuild rename to 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 <[email protected]> -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) - - -
