commit: 64f0c4baff6e18126d28109c393c53727bace951 Author: olifre <o.freyermuth <AT> googlemail <DOT> com> AuthorDate: Wed Mar 15 11:05:04 2017 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Wed Mar 15 11:05:04 2017 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=64f0c4ba
net-misc/cernbox-client: Bump to 2.3.0, (#754) * net-misc/cernbox-client: Bump to 2.3.0, adapt 2.2.4 ebuild to in-tree changes of owncloud-client, use updated cernbox-branding. Package-Manager: Portage-2.3.4, Repoman-2.3.2 * net-misc/cernbox-client: drop leading whitespace. Package-Manager: Portage-2.3.4, Repoman-2.3.2 ...2.2.4.ebuild => cernbox-client-2.2.4-r1.ebuild} | 67 +++++++++------------ ...nt-2.2.4.ebuild => cernbox-client-2.3.0.ebuild} | 70 +++++++++------------- 2 files changed, 56 insertions(+), 81 deletions(-) diff --git a/net-misc/cernbox-client/cernbox-client-2.2.4.ebuild b/net-misc/cernbox-client/cernbox-client-2.2.4-r1.ebuild similarity index 66% copy from net-misc/cernbox-client/cernbox-client-2.2.4.ebuild copy to net-misc/cernbox-client/cernbox-client-2.2.4-r1.ebuild index f3ab1972d..d6687b872 100644 --- a/net-misc/cernbox-client/cernbox-client-2.2.4.ebuild +++ b/net-misc/cernbox-client/cernbox-client-2.2.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,65 +10,54 @@ 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.1.1" +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"; + 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 qt4 +qt5" - -REQUIRED_USE="^^ ( qt4 qt5 ) - dolphin? ( qt5 )" - -RDEPEND=">=dev-db/sqlite-3.4:3 +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.16:5 - >=kde-frameworks/kio-5.16:5 ) - nautilus? ( dev-python/nautilus-python ) - qt4? ( - dev-libs/qtkeychain[qt4] - dev-qt/qtcore:4 - dev-qt/qtdbus:4 - dev-qt/qtgui:4 - dev-qt/qtsql:4 - dev-qt/qtwebkit:4 - net-libs/neon[ssl] - ) - qt5? ( - dev-libs/qtkeychain[qt5] - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - >=dev-qt/qtnetwork-5.4:5 - dev-qt/qtgui:5 - dev-qt/qtquickcontrols:5 - dev-qt/qtsql:5 - dev-qt/qtwebkit:5[printsupport] + 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="${RDEPEND} + !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-5.22.0 ) - qt5? ( dev-qt/linguist-tools:5 ) + dolphin? ( kde-frameworks/extra-cmake-modules ) test? ( dev-util/cmocka - qt4? ( dev-qt/qttest:4 ) - qt5? ( dev-qt/qttest:5 ) - )" + dev-qt/qttest:5 + ) +" S=${WORKDIR}/owncloudclient-${PV} @@ -99,7 +88,7 @@ src_configure() { -DWITH_ICONV=ON -DWITH_DOC=$(usex doc) -DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin) - -DBUILD_WITH_QT4=$(usex qt4) + -DBUILD_WITH_QT4=OFF -DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=$(usex !samba) -DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=$(usex !sftp) -DUNIT_TESTING=$(usex test) diff --git a/net-misc/cernbox-client/cernbox-client-2.2.4.ebuild b/net-misc/cernbox-client/cernbox-client-2.3.0.ebuild similarity index 63% rename from net-misc/cernbox-client/cernbox-client-2.2.4.ebuild rename to net-misc/cernbox-client/cernbox-client-2.3.0.ebuild index f3ab1972d..6f3ad8c70 100644 --- a/net-misc/cernbox-client/cernbox-client-2.2.4.ebuild +++ b/net-misc/cernbox-client/cernbox-client-2.3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,65 +10,54 @@ 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.1.1" +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"; + 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 qt4 +qt5" - -REQUIRED_USE="^^ ( qt4 qt5 ) - dolphin? ( qt5 )" - -RDEPEND=">=dev-db/sqlite-3.4:3 +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.16:5 - >=kde-frameworks/kio-5.16:5 ) - nautilus? ( dev-python/nautilus-python ) - qt4? ( - dev-libs/qtkeychain[qt4] - dev-qt/qtcore:4 - dev-qt/qtdbus:4 - dev-qt/qtgui:4 - dev-qt/qtsql:4 - dev-qt/qtwebkit:4 - net-libs/neon[ssl] - ) - qt5? ( - dev-libs/qtkeychain[qt5] - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - >=dev-qt/qtnetwork-5.4:5 - dev-qt/qtgui:5 - dev-qt/qtquickcontrols:5 - dev-qt/qtsql:5 - dev-qt/qtwebkit:5[printsupport] + 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="${RDEPEND} + !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-5.22.0 ) - qt5? ( dev-qt/linguist-tools:5 ) + dolphin? ( kde-frameworks/extra-cmake-modules ) test? ( dev-util/cmocka - qt4? ( dev-qt/qttest:4 ) - qt5? ( dev-qt/qttest:5 ) - )" + dev-qt/qttest:5 + ) +" S=${WORKDIR}/owncloudclient-${PV} @@ -86,9 +75,6 @@ src_prepare() { cmake_comment_add_subdirectory nautilus popd > /dev/null || die fi - - eapply "${FILESDIR}"/shell-integration-nautilus.patch - default } @@ -99,7 +85,7 @@ src_configure() { -DWITH_ICONV=ON -DWITH_DOC=$(usex doc) -DCMAKE_DISABLE_FIND_PACKAGE_KF5=$(usex !dolphin) - -DBUILD_WITH_QT4=$(usex qt4) + -DBUILD_WITH_QT4=OFF -DCMAKE_DISABLE_FIND_PACKAGE_Libsmbclient=$(usex !samba) -DCMAKE_DISABLE_FIND_PACKAGE_LibSSH=$(usex !sftp) -DUNIT_TESTING=$(usex test)
