commit: 560196c931ca6c847aee03aa39d1b933f10df72a
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Oct 16 13:37:45 2015 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Oct 16 18:24:09 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=560196c9
kde-apps/libkipi: Frameworks merged to master
Package-Manager: portage-2.2.20.1
kde-apps/libkipi/libkipi-5.9999.ebuild | 26 --------------------------
kde-apps/libkipi/libkipi-9999.ebuild | 18 ++++++++++++++++--
2 files changed, 16 insertions(+), 28 deletions(-)
diff --git a/kde-apps/libkipi/libkipi-5.9999.ebuild
b/kde-apps/libkipi/libkipi-5.9999.ebuild
deleted file mode 100644
index b1752e9..0000000
--- a/kde-apps/libkipi/libkipi-5.9999.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_BRANCH="frameworks"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="A library for image plugins accross KDE applications"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep kxmlgui)
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
-"
-
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkipi/libkipi-9999.ebuild
b/kde-apps/libkipi/libkipi-9999.ebuild
index d7867b3..3a13708 100644
--- a/kde-apps/libkipi/libkipi-9999.ebuild
+++ b/kde-apps/libkipi/libkipi-9999.ebuild
@@ -4,8 +4,22 @@
EAPI=5
-inherit kde4-base
+KDE_TEST="true"
+inherit kde5
DESCRIPTION="A library for image plugins accross KDE applications"
KEYWORDS=""
-IUSE="debug"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kxmlgui)
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+"
+
+RDEPEND="${DEPEND}"
