commit: 4f20b180987dc0788db7653a2e1580d3b271e6e4
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 20 10:00:06 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Nov 20 10:00:06 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=4f20b180
kde-apps/okular: Import latest kdelibs4 version
>From gentoo main tree.
Package-Manager: portage-2.3.2
kde-apps/okular/metadata.xml | 3 +-
...{okular-4.14.3.ebuild => okular-16.08.3.ebuild} | 41 +++++++++++-----------
kde-apps/okular/okular-4.14.3.ebuild | 8 ++---
3 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index 8c63d8d..9ee1348 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
<pkgmetadata>
+ <!-- maintainer-needed -->
<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>
</use>
- <!-- maintainer-needed -->
</pkgmetadata>
diff --git a/kde-apps/okular/okular-4.14.3.ebuild
b/kde-apps/okular/okular-16.08.3.ebuild
similarity index 51%
copy from kde-apps/okular/okular-4.14.3.ebuild
copy to kde-apps/okular/okular-16.08.3.ebuild
index aa029e3..a79841d 100644
--- a/kde-apps/okular/okular-4.14.3.ebuild
+++ b/kde-apps/okular/okular-16.08.3.ebuild
@@ -1,30 +1,30 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
KDE_HANDBOOK="optional"
-
#VIRTUALX_REQUIRED=test
RESTRICT=test
# test 2: parttest hangs
inherit kde4-base
-DESCRIPTION="Okular is a universal document viewer based on KPDF for KDE 4"
+DESCRIPTION="Universal document viewer based on KPDF"
HOMEPAGE="https://okular.kde.org
https://www.kde.org/applications/graphics/okular";
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86"
IUSE="chm crypt debug djvu dpi ebook +jpeg mobi +postscript +pdf +tiff"
DEPEND="
media-libs/freetype
+ media-libs/phonon[qt4]
media-libs/qimageblitz
sys-libs/zlib
chm? ( dev-libs/chmlib )
- crypt? ( app-crypt/qca:2[qt4(+)] )
+ crypt? ( app-crypt/qca:2[qt4] )
djvu? ( app-text/djvu )
- dpi? ( x11-libs/libkscreen:4 )
+ dpi? ( kde-plasma/libkscreen:4 )
ebook? ( app-text/ebook-tools )
jpeg? (
$(add_kdeapps_dep libkexiv2)
@@ -33,24 +33,25 @@ DEPEND="
mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
pdf? ( >=app-text/poppler-0.20[qt4,-exceptions(-)] )
postscript? ( app-text/libspectre )
- tiff? ( media-libs/tiff )
+ tiff? ( media-libs/tiff:0 )
"
RDEPEND="${DEPEND}"
src_configure() {
local mycmakeargs=(
- $(cmake-utils_use_with chm)
- $(cmake-utils_use_with crypt QCA2)
- $(cmake-utils_use_with djvu DjVuLibre)
- $(cmake-utils_use_with dpi LibKScreen)
- $(cmake-utils_use_with ebook EPub)
- $(cmake-utils_use_with jpeg)
- $(cmake-utils_use_with jpeg Kexiv2)
- $(cmake-utils_use_with mobi QMobiPocket)
- $(cmake-utils_use_with postscript LibSpectre)
- $(cmake-utils_use_with pdf PopplerQt4)
- $(cmake-utils_use_with pdf Poppler)
- $(cmake-utils_use_with tiff)
+ -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)
)
kde4-base_src_configure
diff --git a/kde-apps/okular/okular-4.14.3.ebuild
b/kde-apps/okular/okular-4.14.3.ebuild
index aa029e3..da136d8 100644
--- a/kde-apps/okular/okular-4.14.3.ebuild
+++ b/kde-apps/okular/okular-4.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ inherit kde4-base
DESCRIPTION="Okular is a universal document viewer based on KPDF for KDE 4"
HOMEPAGE="https://okular.kde.org
https://www.kde.org/applications/graphics/okular";
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86"
IUSE="chm crypt debug djvu dpi ebook +jpeg mobi +postscript +pdf +tiff"
DEPEND="
@@ -24,7 +24,7 @@ DEPEND="
chm? ( dev-libs/chmlib )
crypt? ( app-crypt/qca:2[qt4(+)] )
djvu? ( app-text/djvu )
- dpi? ( x11-libs/libkscreen:4 )
+ dpi? ( kde-plasma/libkscreen:4 )
ebook? ( app-text/ebook-tools )
jpeg? (
$(add_kdeapps_dep libkexiv2)
@@ -33,7 +33,7 @@ DEPEND="
mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
pdf? ( >=app-text/poppler-0.20[qt4,-exceptions(-)] )
postscript? ( app-text/libspectre )
- tiff? ( media-libs/tiff )
+ tiff? ( media-libs/tiff:0 )
"
RDEPEND="${DEPEND}"
