From 7f6a91d265bcf656b15b2bf86c7a93a953376d2d Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Thu, 19 Oct 2017 12:15:11 +0200 Subject: net-misc/nextcloud-client: needs dev-qt/qtxml in rdeps MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thanks Karl Lindén in bug #633816 Package-Manager: Portage-2.3.11, Repoman-2.3.3 --- .../nextcloud-client-2.3.2-r1.ebuild | 108 +++++++++++++++++++++ .../nextcloud-client/nextcloud-client-2.3.2.ebuild | 107 -------------------- 2 files changed, 108 insertions(+), 107 deletions(-) create mode 100644 net-misc/nextcloud-client/nextcloud-client-2.3.2-r1.ebuild delete mode 100644 net-misc/nextcloud-client/nextcloud-client-2.3.2.ebuild diff --git a/net-misc/nextcloud-client/nextcloud-client-2.3.2-r1.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.3.2-r1.ebuild new file mode 100644 index 000000000000..cdb6c39811b5 --- /dev/null +++ b/net-misc/nextcloud-client/nextcloud-client-2.3.2-r1.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils + +DESCRIPTION="Nextcloud themed desktop client" +HOMEPAGE="https://github.com/nextcloud/client_theming" +SRC_URI="http://download.owncloud.com/desktop/stable/owncloudclient-${PV}.tar.xz + https://github.com/nextcloud/client_theming/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="CC-BY-3.0 GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc dolphin nautilus samba +sftp shibboleth 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[ssl] + dev-qt/qtsql:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml: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 ) + shibboleth? ( dev-qt/qtwebkit:5 ) +" +RDEPEND="${COMMON_DEPEND} + !net-misc/ocsync + !net-misc/owncloud-client +" +DEPEND="${COMMON_DEPEND} + dev-qt/linguist-tools:5 + doc? ( + dev-python/sphinx + dev-tex/latexmk + dev-texlive/texlive-latexextra + virtual/latex-base + ) + dolphin? ( kde-frameworks/extra-cmake-modules ) + test? ( + dev-util/cmocka + dev-qt/qttest:5 + ) +" + +S=${WORKDIR}/client_theming-${PV} + +src_unpack() { + default + + rmdir "${S}"/client || die + mv "${WORKDIR}"/owncloudclient-${PV} "${S}"/client \ + || die +} + +src_prepare() { + CMAKE_USE_DIR="${S}"/client + # Keep tests in ${T} + sed -i -e "s#\"/tmp#\"${T}#g" client/test/test*.cpp || die + # Fix icon name + sed -e "/^Icon.*=/s/@APPLICATION_EXECUTABLE@/Nextcloud/" \ + -i client/mirall.desktop.in || die + + if ! use nautilus; then + pushd client/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) + -DNO_SHIBBOLETH=$(usex !shibboleth) + -DUNIT_TESTING=$(usex test) + -DOEM_THEME_DIR="${S}"/nextcloudtheme + ) + + 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/nextcloud-client/nextcloud-client-2.3.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.3.2.ebuild deleted file mode 100644 index 67f8b9ea2be2..000000000000 --- a/net-misc/nextcloud-client/nextcloud-client-2.3.2.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="Nextcloud themed desktop client" -HOMEPAGE="https://github.com/nextcloud/client_theming" -SRC_URI="http://download.owncloud.com/desktop/stable/owncloudclient-${PV}.tar.xz - https://github.com/nextcloud/client_theming/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="CC-BY-3.0 GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc dolphin nautilus samba +sftp shibboleth 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[ssl] - dev-qt/qtsql:5 - dev-qt/qtwidgets: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 ) - shibboleth? ( dev-qt/qtwebkit:5 ) -" -RDEPEND="${COMMON_DEPEND} - !net-misc/ocsync - !net-misc/owncloud-client -" -DEPEND="${COMMON_DEPEND} - dev-qt/linguist-tools:5 - doc? ( - dev-python/sphinx - dev-tex/latexmk - dev-texlive/texlive-latexextra - virtual/latex-base - ) - dolphin? ( kde-frameworks/extra-cmake-modules ) - test? ( - dev-util/cmocka - dev-qt/qttest:5 - ) -" - -S=${WORKDIR}/client_theming-${PV} - -src_unpack() { - default - - rmdir "${S}"/client || die - mv "${WORKDIR}"/owncloudclient-${PV} "${S}"/client \ - || die -} - -src_prepare() { - CMAKE_USE_DIR="${S}"/client - # Keep tests in ${T} - sed -i -e "s#\"/tmp#\"${T}#g" client/test/test*.cpp || die - # Fix icon name - sed -e "/^Icon.*=/s/@APPLICATION_EXECUTABLE@/Nextcloud/" \ - -i client/mirall.desktop.in || die - - if ! use nautilus; then - pushd client/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) - -DNO_SHIBBOLETH=$(usex !shibboleth) - -DUNIT_TESTING=$(usex test) - -DOEM_THEME_DIR="${S}"/nextcloudtheme - ) - - 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 -} -- cgit v1.2.3-65-gdbad