From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-945573-garchives=archives.gentoo.org@lists.gentoo.org>
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 B606F139694
	for <garchives@archives.gentoo.org>; Sun, 23 Apr 2017 13:38:21 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id F412DE0CAE;
	Sun, 23 Apr 2017 13:38:20 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(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 C3963E0C97
	for <gentoo-commits@lists.gentoo.org>; Sun, 23 Apr 2017 13:38:20 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(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 7B87E34071C
	for <gentoo-commits@lists.gentoo.org>; Sun, 23 Apr 2017 13:38:19 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id E36EE742C
	for <gentoo-commits@lists.gentoo.org>; Sun, 23 Apr 2017 13:38:17 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
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" <asturm@gentoo.org>
Message-ID: <1492954635.516e8b74f711afc33d6d38a6f850f3e28d2ad917.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/okular/, kde-apps/okular/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: kde-apps/okular/files/okular-17.04.0-deps.patch kde-apps/okular/metadata.xml kde-apps/okular/okular-17.04.0-r1.ebuild
X-VCS-Directories: kde-apps/okular/ kde-apps/okular/files/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 516e8b74f711afc33d6d38a6f850f3e28d2ad917
X-VCS-Branch: master
Date: Sun, 23 Apr 2017 13:38:17 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 099948a6-24d7-4cc5-b41f-111d8d6576d5
X-Archives-Hash: 81c6e25846a41bb55cb2d3cbf29cf664

commit:     516e8b74f711afc33d6d38a6f850f3e28d2ad917
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 22 15:40:55 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 23 13:37:15 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=516e8b74

kde-apps/okular: USE=jpeg->image-backend, add USE=plucker, drop unused dep

Reported-by: Ostashevskyi Viktor <ostash <AT> ostash.kiev.ua>
Gentoo-bug: 616266

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-apps/okular/files/okular-17.04.0-deps.patch | 20 ++++++
 kde-apps/okular/metadata.xml                    |  2 +
 kde-apps/okular/okular-17.04.0-r1.ebuild        | 88 +++++++++++++++++++++++++
 3 files changed, 110 insertions(+)

diff --git a/kde-apps/okular/files/okular-17.04.0-deps.patch b/kde-apps/okular/files/okular-17.04.0-deps.patch
new file mode 100644
index 00000000000..8345bb92008
--- /dev/null
+++ b/kde-apps/okular/files/okular-17.04.0-deps.patch
@@ -0,0 +1,20 @@
+commit decb01292e4b5579a53741d5412a797daa53c1d6
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Sat Apr 22 12:43:37 2017 +0200
+
+    Drop unused DBusAddons
+    
+    REVIEW: 130099
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e52b69be6..34ea3729a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -47,7 +47,6 @@ find_package(KF5 ${KF5_REQUIRED_VERSION} REQUIRED COMPONENTS
+     Config
+     ConfigWidgets
+     CoreAddons
+-    DBusAddons
+     DocTools
+     IconThemes
+     JS

diff --git a/kde-apps/okular/metadata.xml b/kde-apps/okular/metadata.xml
index 0d0cb081aad..0a06fc744c3 100644
--- a/kde-apps/okular/metadata.xml
+++ b/kde-apps/okular/metadata.xml
@@ -8,8 +8,10 @@
 	<use>
 		<flag name="chm">Enable support for Microsoft Compiled HTML Help files</flag>
 		<flag name="ebook">Add E-Book support</flag>
+		<flag name="image-backend">Enable image viewing support</flag>
 		<flag name="mobi">Add mobipocket support</flag>
 		<flag name="mobile">Enable Plasma mobile support</flag>
+		<flag name="plucker">Enable Plucker E-Book for Palm OS devices support</flag>
 		<flag name="speech">Enable text-to-speech support</flag>
 	</use>
 </pkgmetadata>

diff --git a/kde-apps/okular/okular-17.04.0-r1.ebuild b/kde-apps/okular/okular-17.04.0-r1.ebuild
new file mode 100644
index 00000000000..66b72485cfb
--- /dev/null
+++ b/kde-apps/okular/okular-17.04.0-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Universal document viewer based on KDE Frameworks"
+HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="chm crypt djvu ebook +image-backend mobi mobile +pdf plucker +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 kio)
+	$(add_frameworks_dep kjs)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpty)
+	$(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? (
+		$(add_frameworks_dep khtml)
+		dev-libs/chmlib
+	)
+	crypt? ( app-crypt/qca:2[qt5] )
+	djvu? ( app-text/djvu )
+	ebook? ( app-text/ebook-tools )
+	image-backend? (
+		$(add_kdeapps_dep libkexiv2)
+		$(add_qt_dep qtgui 'gif,jpeg,png')
+	)
+	mobi? ( $(add_kdeapps_dep kdegraphics-mobipocket) )
+	pdf? ( app-text/poppler[qt5,-exceptions(-)] )
+	plucker? ( virtual/jpeg:0 )
+	postscript? ( app-text/libspectre )
+	speech? ( $(add_qt_dep qtspeech) )
+	tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}
+	image-backend? ( $(add_frameworks_dep kimageformats) )
+	mobile? ( dev-libs/kirigami:1 )
+"
+
+PATCHES=( "${FILESDIR}/${P}-deps.patch" )
+
+# bug 603116
+RESTRICT+=" test"
+
+src_prepare() {
+	kde5_src_prepare
+	use mobile || cmake_comment_add_subdirectory mobile
+	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 image-backend KF5KExiv2)
+		$(cmake-utils_use_find_package mobi QMobipocket)
+		$(cmake-utils_use_find_package pdf Poppler)
+		$(cmake-utils_use_find_package plucker JPEG)
+		$(cmake-utils_use_find_package postscript LibSpectre)
+		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
+		$(cmake-utils_use_find_package tiff TIFF)
+	)
+
+	kde5_src_configure
+}