[gentoo-commits] repo/gentoo:master commit in: kde-apps/libkipi/, kde-apps/libkipi/files/

[gentoo-commits] repo/gentoo:master commit in: kde-apps/libkipi/, kde-apps/libkipi/files/

[Michael Palimaka]

commit:     1b14ac478300a2b2bb2bb29f131e336ced13cb35
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu Nov 24 19:38:03 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Nov 25 05:59:41 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b14ac47

kde-apps/libkipi: Fix public dependencies

Gentoo-bug: 600602

See also: https://git.reviewboard.kde.org/r/129555/

Package-Manager: portage-2.3.0

 .../files/libkipi-16.08.3-public-deps.patch        | 29 +++++++++++++++++++++
 kde-apps/libkipi/libkipi-16.08.3-r1.ebuild         | 30 ++++++++++++++++++++++
 2 files changed, 59 insertions(+)

diff --git a/kde-apps/libkipi/files/libkipi-16.08.3-public-deps.patch b/kde-apps/libkipi/files/libkipi-16.08.3-public-deps.patch
new file mode 100644
index 00000000..ef9c057
--- /dev/null
+++ b/kde-apps/libkipi/files/libkipi-16.08.3-public-deps.patch
@@ -0,0 +1,29 @@
+commit adb25b631feb2ac3fd0126e954bf988c85656c5c
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Thu Nov 24 20:17:33 2016 +0100
+
+    find_dependency takes one dependency per call
+    
+    Fixes bogus 'target KF5::Service not found' in reverse deps
+    like kipi-plugins.
+    
+    REVIEW: 129555
+
+diff --git a/cmake/templates/KF5KipiConfig.cmake.in b/cmake/templates/KF5KipiConfig.cmake.in
+index 0bd3ba9..4f92b62 100644
+--- a/cmake/templates/KF5KipiConfig.cmake.in
++++ b/cmake/templates/KF5KipiConfig.cmake.in
+@@ -13,7 +13,11 @@
+ 
+ @PACKAGE_INIT@
+ 
+-find_dependency(Qt5Core Qt5Widgets Qt5Gui @REQUIRED_QT_VERSION@)
+-find_dependency(KF5Config KF5XmlGui KF5Service)
++find_dependency(Qt5Core @REQUIRED_QT_VERSION@)
++find_dependency(Qt5Gui @REQUIRED_QT_VERSION@)
++find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@)
++find_dependency(KF5Config)
++find_dependency(KF5Service)
++find_dependency(KF5XmlGui)
+ 
+ include("${CMAKE_CURRENT_LIST_DIR}/KF5KipiTargets.cmake")

diff --git a/kde-apps/libkipi/libkipi-16.08.3-r1.ebuild b/kde-apps/libkipi/libkipi-16.08.3-r1.ebuild
new file mode 100644
index 00000000..6d79013
--- /dev/null
+++ b/kde-apps/libkipi/libkipi-16.08.3-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_BLOCK_SLOT4="false"
+inherit kde5
+
+DESCRIPTION="A library for image plugins accross KDE applications"
+LICENSE="GPL-2+"
+SLOT="5/31"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/libkipi-15.08.3-r1:4
+	!kde-base/legacy-icons
+"
+
+PATCHES=( "${FILESDIR}/${P}-public-deps.patch" )