commit:     dbf1dc49c4cb29246bcb6e97cd62f2a4a29f8ff4
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Jul 24 23:13:51 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jul 25 15:35:51 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=dbf1dc49

kde-apps/okular: Add USE=speech, fix DEPENDs, improve DESCRIPTION

Delete obsolete comments, qimageblitz function was re-implemented.
Simplify autotests commenting.

Package-Manager: portage-2.2.28

 kde-apps/okular/metadata.xml         |  9 +++++----
 kde-apps/okular/okular-5.9999.ebuild | 25 +++++++------------------
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index 33cf4df..49b367d 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo KDE Project</name>
+       </maintainer>
        <use>
                <flag name="chm">Enable support for Microsoft Compiled HTML 
Help files</flag>
                <flag name="dpi">DPI detection support for PDF rendering via 
<pkg>x11-libs/libkscreen</pkg></flag>
                <flag name="ebook">Add E-Book support</flag>
                <flag name="kde">Enable kactivities support</flag>
                <flag name="mobi">Add mobipocket support</flag>
+               <flag name="speech">Enable text-to-speech support</flag>
        </use>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Gentoo KDE Project</name>
-       </maintainer>
 </pkgmetadata>

diff --git a/kde-apps/okular/okular-5.9999.ebuild 
b/kde-apps/okular/okular-5.9999.ebuild
index f36fd65..ff291a9 100644
--- a/kde-apps/okular/okular-5.9999.ebuild
+++ b/kde-apps/okular/okular-5.9999.ebuild
@@ -9,16 +9,12 @@ KDE_TEST="forceoptional"
 EGIT_BRANCH="frameworks"
 inherit kde5
 
-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 djvu ebook +jpeg mobi +pdf +postscript +tiff"
-# TODO:
-# * Deactivated media-libs/qimageblitz as there is no Qt5 version yet
-# * Deactivated kde-apps/kdegraphics-mobipocket, no Qt5 version yet
-# * Not packaged: Qt5TextToSpeech
+IUSE="chm crypt djvu ebook +jpeg mobi +pdf +postscript speech +tiff"
 
-COMMON_DEPEND="
+DEPEND="
        $(add_frameworks_dep kactivities)
        $(add_frameworks_dep karchive)
        $(add_frameworks_dep kbookmarks)
@@ -27,7 +23,6 @@ COMMON_DEPEND="
        $(add_frameworks_dep kconfigwidgets)
        $(add_frameworks_dep kcoreaddons)
        $(add_frameworks_dep kdbusaddons)
-       $(add_frameworks_dep kdelibs4support)
        $(add_frameworks_dep khtml)
        $(add_frameworks_dep kio)
        $(add_frameworks_dep kjs)
@@ -53,21 +48,14 @@ COMMON_DEPEND="
        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 )
 "
-DEPEND="${COMMON_DEPEND}
-       sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
        kde5_src_prepare
-
-       if ! use test ; then
-               sed -i \
-                       -e "/^add_subdirectory.*conf\/autotests/ s/^/#DONT/" \
-                       CMakeLists.txt || die
-       fi
+       use test || cmake_comment_add_subdirectory conf/autotests
 }
 
 src_configure() {
@@ -80,6 +68,7 @@ src_configure() {
                $(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)
        )
 

Reply via email to