[gentoo-commits] proj/kde:master commit in: kde-apps/kolourpaint/

["Johannes Huber" <johu@gentoo.org>]

commit:     cabd376285ddfb2ba8329762314055e69e4fe3c7
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 13 18:33:32 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jul 13 18:33:32 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=cabd3762

kde-apps/kolourpaint: Frameworks merged to master

Spotted by Andreas Sturmlechner <andreas.sturmlechner <AT> gmail.com>.

Package-Manager: portage-2.3.0

 kde-apps/kolourpaint/kolourpaint-5.9999.ebuild | 43 --------------------------
 kde-apps/kolourpaint/kolourpaint-9999.ebuild   | 30 ++++++++++++------
 2 files changed, 21 insertions(+), 52 deletions(-)

diff --git a/kde-apps/kolourpaint/kolourpaint-5.9999.ebuild b/kde-apps/kolourpaint/kolourpaint-5.9999.ebuild
deleted file mode 100644
index 9bc6b44..0000000
--- a/kde-apps/kolourpaint/kolourpaint-5.9999.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-EGIT_BRANCH="frameworks"
-inherit kde5
-
-DESCRIPTION="Paint Program by KDE"
-HOMEPAGE="https://www.kde.org/applications/graphics/kolourpaint/"
-KEYWORDS=""
-LICENSE="BSD LGPL-2"
-IUSE="scanner"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-	scanner? ( $(add_kdeapps_dep libksane) )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package scanner KF5Sane)
-	)
-
-	kde5_src_configure
-}

diff --git a/kde-apps/kolourpaint/kolourpaint-9999.ebuild b/kde-apps/kolourpaint/kolourpaint-9999.ebuild
index b30e54f..34ab03c 100644
--- a/kde-apps/kolourpaint/kolourpaint-9999.ebuild
+++ b/kde-apps/kolourpaint/kolourpaint-9999.ebuild
@@ -4,27 +4,39 @@
 
 EAPI=6
 
-KDE_HANDBOOK="optional"
-inherit kde4-base
+inherit kde5
 
 DESCRIPTION="Paint Program by KDE"
 HOMEPAGE="https://www.kde.org/applications/graphics/kolourpaint/"
 KEYWORDS=""
 LICENSE="BSD LGPL-2"
-IUSE="debug scanner"
+IUSE="scanner"
 
-DEPEND="
-	media-libs/qimageblitz
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
 	scanner? ( $(add_kdeapps_dep libksane) )
 "
-RDEPEND="${DEPEND}
-	scanner? ( $(add_kdeapps_dep ksaneplugin) )
+DEPEND="${RDEPEND}
+	sys-devel/gettext
 "
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_find_package scanner KSane)
+		$(cmake-utils_use_find_package scanner KF5Sane)
 	)
 
-	kde4-base_src_configure
+	kde5_src_configure
 }