From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C6CA9139696 for ; Sat, 22 Apr 2017 08:41:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 05904E0BE2; Sat, 22 Apr 2017 08:41:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C4ED9E0BE0 for ; Sat, 22 Apr 2017 08:41:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 87247340AC7 for ; Sat, 22 Apr 2017 08:41:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A8C0973F3 for ; Sat, 22 Apr 2017 08:41:14 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1492849902.e164b679524099ffc915af8c48ebb162c5af5df0.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/okular/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/okular/metadata.xml kde-apps/okular/okular-17.04.49.9999.ebuild kde-apps/okular/okular-9999.ebuild X-VCS-Directories: kde-apps/okular/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e164b679524099ffc915af8c48ebb162c5af5df0 X-VCS-Branch: master Date: Sat, 22 Apr 2017 08:41:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9434e7cf-34b1-4960-a49c-f9f1fff4c3ea X-Archives-Hash: d4fad243fa0cb299b54be7d4bc4bf9d4 commit: e164b679524099ffc915af8c48ebb162c5af5df0 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Apr 22 08:08:31 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Apr 22 08:31:42 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e164b679 kde-apps/okular: USE=jpeg->exif, add USE=plucker Reported-by: Ostashevskyi Viktor ostash.kiev.ua> Gentoo-bug: 616266 Package-Manager: Portage-2.3.3, Repoman-2.3.1 kde-apps/okular/metadata.xml | 1 + kde-apps/okular/okular-17.04.49.9999.ebuild | 13 ++++++++----- kde-apps/okular/okular-9999.ebuild | 13 ++++++++----- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml index 0d0cb081aa..e29d704c14 100644 --- a/kde-apps/okular/metadata.xml +++ b/kde-apps/okular/metadata.xml @@ -10,6 +10,7 @@ Add E-Book support Add mobipocket support Enable Plasma mobile support + Enable Plucker E-Book for Palm OS devices support Enable text-to-speech support diff --git a/kde-apps/okular/okular-17.04.49.9999.ebuild b/kde-apps/okular/okular-17.04.49.9999.ebuild index adc3e749a6..a99e614c07 100644 --- a/kde-apps/okular/okular-17.04.49.9999.ebuild +++ b/kde-apps/okular/okular-17.04.49.9999.ebuild @@ -11,7 +11,7 @@ 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 mobile +pdf +postscript speech +tiff" +IUSE="chm crypt djvu ebook +exif mobi mobile +pdf plucker +postscript speech +tiff" DEPEND=" $(add_frameworks_dep kactivities) @@ -21,7 +21,6 @@ DEPEND=" $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) $(add_frameworks_dep kio) $(add_frameworks_dep kjs) $(add_frameworks_dep kparts) @@ -35,7 +34,6 @@ DEPEND=" $(add_qt_dep qtwidgets) media-libs/freetype media-libs/phonon[qt5] - sys-libs/zlib chm? ( $(add_frameworks_dep khtml) dev-libs/chmlib @@ -43,12 +41,16 @@ DEPEND=" crypt? ( app-crypt/qca:2[qt5] ) djvu? ( app-text/djvu ) ebook? ( app-text/ebook-tools ) - jpeg? ( + exif? ( $(add_kdeapps_dep libkexiv2) virtual/jpeg:0 ) mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) ) pdf? ( app-text/poppler[qt5,-exceptions(-)] ) + plucker? ( + sys-libs/zlib + virtual/jpeg:0 + ) postscript? ( app-text/libspectre ) speech? ( $(add_qt_dep qtspeech) ) tiff? ( media-libs/tiff:0 ) @@ -72,9 +74,10 @@ src_configure() { $(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 exif KF5KExiv2) $(cmake-utils_use_find_package mobi QMobipocket) $(cmake-utils_use_find_package pdf Poppler) + $(cmake-utils_use_find_package plucker ZLIB) $(cmake-utils_use_find_package postscript LibSpectre) $(cmake-utils_use_find_package speech Qt5TextToSpeech) $(cmake-utils_use_find_package tiff TIFF) diff --git a/kde-apps/okular/okular-9999.ebuild b/kde-apps/okular/okular-9999.ebuild index adc3e749a6..a99e614c07 100644 --- a/kde-apps/okular/okular-9999.ebuild +++ b/kde-apps/okular/okular-9999.ebuild @@ -11,7 +11,7 @@ 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 mobile +pdf +postscript speech +tiff" +IUSE="chm crypt djvu ebook +exif mobi mobile +pdf plucker +postscript speech +tiff" DEPEND=" $(add_frameworks_dep kactivities) @@ -21,7 +21,6 @@ DEPEND=" $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) $(add_frameworks_dep kio) $(add_frameworks_dep kjs) $(add_frameworks_dep kparts) @@ -35,7 +34,6 @@ DEPEND=" $(add_qt_dep qtwidgets) media-libs/freetype media-libs/phonon[qt5] - sys-libs/zlib chm? ( $(add_frameworks_dep khtml) dev-libs/chmlib @@ -43,12 +41,16 @@ DEPEND=" crypt? ( app-crypt/qca:2[qt5] ) djvu? ( app-text/djvu ) ebook? ( app-text/ebook-tools ) - jpeg? ( + exif? ( $(add_kdeapps_dep libkexiv2) virtual/jpeg:0 ) mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) ) pdf? ( app-text/poppler[qt5,-exceptions(-)] ) + plucker? ( + sys-libs/zlib + virtual/jpeg:0 + ) postscript? ( app-text/libspectre ) speech? ( $(add_qt_dep qtspeech) ) tiff? ( media-libs/tiff:0 ) @@ -72,9 +74,10 @@ src_configure() { $(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 exif KF5KExiv2) $(cmake-utils_use_find_package mobi QMobipocket) $(cmake-utils_use_find_package pdf Poppler) + $(cmake-utils_use_find_package plucker ZLIB) $(cmake-utils_use_find_package postscript LibSpectre) $(cmake-utils_use_find_package speech Qt5TextToSpeech) $(cmake-utils_use_find_package tiff TIFF)