commit: 612d367836a2f1c93ac9ac0359887cbfe6efce4f Author: Justin Lecher <jlec <AT> gentoo <DOT> org> AuthorDate: Mon Apr 2 12:31:53 2018 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Mon Apr 2 12:31:53 2018 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=612d3678
net-misc/cernbox-client: Fix USE-deps Drop old Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> Package-Manager: Portage-2.3.27, Repoman-2.3.9 .../cernbox-client/cernbox-client-2.3.1.ebuild | 103 --------------------- .../cernbox-client/cernbox-client-2.3.2.ebuild | 13 +-- 2 files changed, 7 insertions(+), 109 deletions(-) diff --git a/net-misc/cernbox-client/cernbox-client-2.3.1.ebuild b/net-misc/cernbox-client/cernbox-client-2.3.1.ebuild deleted file mode 100644 index 6f3ad8c70..000000000 --- a/net-misc/cernbox-client/cernbox-client-2.3.1.ebuild +++ /dev/null @@ -1,103 +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 - 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.2.ebuild b/net-misc/cernbox-client/cernbox-client-2.3.2.ebuild index 6f3ad8c70..9513b064b 100644 --- a/net-misc/cernbox-client/cernbox-client-2.3.2.ebuild +++ b/net-misc/cernbox-client/cernbox-client-2.3.2.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 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" +DESCRIPTION="Synchronize files from CERNbox EOS with your computer" 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" @@ -22,8 +22,9 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="doc dolphin nautilus samba +sftp test" -COMMON_DEPEND=">=dev-db/sqlite-3.4:3 - dev-libs/qtkeychain[qt5] +COMMON_DEPEND=" + >=dev-db/sqlite-3.4:3 + dev-libs/qtkeychain dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5
