commit: f14944854e99909634f8ae7bb8c02d7f00e70fe6 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Thu Nov 3 21:52:56 2016 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Thu Nov 3 22:07:08 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=f1494485
kde-apps/okular: Frameworks merged to master Package-Manager: portage-2.3.0 Signed-off-by: Johannes Huber <johu <AT> gentoo.org> kde-apps/okular/okular-5.9999.ebuild | 76 ------------------------------------ kde-apps/okular/okular-9999.ebuild | 71 ++++++++++++++++++++------------- 2 files changed, 44 insertions(+), 103 deletions(-) diff --git a/kde-apps/okular/okular-5.9999.ebuild b/kde-apps/okular/okular-5.9999.ebuild deleted file mode 100644 index ff291a9..0000000 --- a/kde-apps/okular/okular-5.9999.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -KDE_HANDBOOK="forceoptional" -KDE_TEST="forceoptional" -EGIT_BRANCH="frameworks" -inherit kde5 - -DESCRIPTION="Universal document viewer based on KDE Frameworks" -HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular"; -KEYWORDS="" -IUSE="chm crypt djvu ebook +jpeg mobi +pdf +postscript speech +tiff" - -DEPEND=" - $(add_frameworks_dep kactivities) - $(add_frameworks_dep karchive) - $(add_frameworks_dep kbookmarks) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep khtml) - $(add_frameworks_dep kio) - $(add_frameworks_dep kjs) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep threadweaver) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtsvg) - $(add_qt_dep qtwidgets) - media-libs/freetype - media-libs/phonon[qt5] - sys-libs/zlib - chm? ( dev-libs/chmlib ) - crypt? ( app-crypt/qca:2[qt5] ) - djvu? ( app-text/djvu ) - ebook? ( app-text/ebook-tools ) - jpeg? ( - $(add_kdeapps_dep libkexiv2) - virtual/jpeg:0 - ) - mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) ) - pdf? ( app-text/poppler[qt5,-exceptions(-)] ) - postscript? ( app-text/libspectre ) - speech? ( $(add_qt_dep qtspeech) ) - tiff? ( media-libs/tiff:0 ) -" -RDEPEND="${DEPEND}" - -src_prepare() { - kde5_src_prepare - use test || cmake_comment_add_subdirectory conf/autotests -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package chm CHM) - $(cmake-utils_use_find_package crypt Qca-qt5) - $(cmake-utils_use_find_package djvu DjVuLibre) - $(cmake-utils_use_find_package ebook EPub) - $(cmake-utils_use_find_package jpeg KF5KExiv2) - $(cmake-utils_use_find_package mobi QMobipocket) - $(cmake-utils_use_find_package pdf Poppler) - $(cmake-utils_use_find_package postscript LibSpectre) - $(cmake-utils_use_find_package speech Qt5TextToSpeech) - $(cmake-utils_use_find_package tiff TIFF) - ) - - kde5_src_configure -} diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild index 4962501..324abb4 100644 --- a/kde-apps/okular/okular-9999.ebuild +++ b/kde-apps/okular/okular-9999.ebuild @@ -4,55 +4,72 @@ EAPI=6 -KDE_HANDBOOK="optional" -#VIRTUALX_REQUIRED=test -RESTRICT=test -# test 2: parttest hangs +KDE_HANDBOOK="forceoptional" +KDE_TEST="forceoptional" +inherit kde5 -inherit kde4-base - -DESCRIPTION="Universal document viewer based on KPDF" +DESCRIPTION="Universal document viewer based on KDE Frameworks" HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular"; KEYWORDS="" -IUSE="chm crypt debug djvu dpi ebook +jpeg mobi +postscript +pdf +tiff" +IUSE="chm crypt djvu ebook +jpeg mobi +pdf +postscript speech +tiff" DEPEND=" + $(add_frameworks_dep kactivities) + $(add_frameworks_dep karchive) + $(add_frameworks_dep kbookmarks) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep khtml) + $(add_frameworks_dep kio) + $(add_frameworks_dep kjs) + $(add_frameworks_dep kparts) + $(add_frameworks_dep kwallet) + $(add_frameworks_dep threadweaver) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtprintsupport) + $(add_qt_dep qtsvg) + $(add_qt_dep qtwidgets) media-libs/freetype - media-libs/phonon[qt4] - media-libs/qimageblitz + media-libs/phonon[qt5] sys-libs/zlib chm? ( dev-libs/chmlib ) - crypt? ( app-crypt/qca:2[qt4] ) + crypt? ( app-crypt/qca:2[qt5] ) djvu? ( app-text/djvu ) - dpi? ( x11-libs/libkscreen:4 ) ebook? ( app-text/ebook-tools ) jpeg? ( $(add_kdeapps_dep libkexiv2) virtual/jpeg:0 ) mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) ) - pdf? ( >=app-text/poppler-0.20[qt4,-exceptions(-)] ) + pdf? ( app-text/poppler[qt5,-exceptions(-)] ) postscript? ( app-text/libspectre ) + speech? ( $(add_qt_dep qtspeech) ) tiff? ( media-libs/tiff:0 ) " RDEPEND="${DEPEND}" +src_prepare() { + kde5_src_prepare + use test || cmake_comment_add_subdirectory conf/autotests +} + src_configure() { local mycmakeargs=( - -DWITH_KActivities=OFF - -DWITH_CHM=$(usex chm) - -DWITH_QCA2=$(usex crypt) - -DWITH_DjVuLibre=$(usex djvu) - -DWITH_LibKScreen=$(usex dpi) - -DWITH_EPub=$(usex ebook) - -DWITH_JPEG=$(usex jpeg) - -DWITH_Kexiv2=$(usex jpeg) - -DWITH_QMobipocket=$(usex mobi) - -DWITH_LibSpectre=$(usex postscript) - -DWITH_PopplerQt4=$(usex pdf) - -DWITH_Poppler=$(usex pdf) - -DWITH_TIFF=$(usex tiff) + $(cmake-utils_use_find_package chm CHM) + $(cmake-utils_use_find_package crypt Qca-qt5) + $(cmake-utils_use_find_package djvu DjVuLibre) + $(cmake-utils_use_find_package ebook EPub) + $(cmake-utils_use_find_package jpeg KF5KExiv2) + $(cmake-utils_use_find_package mobi QMobipocket) + $(cmake-utils_use_find_package pdf Poppler) + $(cmake-utils_use_find_package postscript LibSpectre) + $(cmake-utils_use_find_package speech Qt5TextToSpeech) + $(cmake-utils_use_find_package tiff TIFF) ) - kde4-base_src_configure + kde5_src_configure }
