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

["Michael Palimaka" <kensington@gentoo.org>]

commit:     4de16d1b00084ed1d1b5680f14a562dda3e2820e
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Fri Oct 16 14:00:12 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Oct 16 18:24:10 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=4de16d1b

kde-apps/libksane: Frameworks merged to master

Package-Manager: portage-2.2.20.1

 kde-apps/libksane/libksane-5.9999.ebuild | 27 ---------------------------
 kde-apps/libksane/libksane-9999.ebuild   | 13 +++++++++++--
 2 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/kde-apps/libksane/libksane-5.9999.ebuild b/kde-apps/libksane/libksane-5.9999.ebuild
deleted file mode 100644
index e99fd67..0000000
--- a/kde-apps/libksane/libksane-5.9999.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_BRANCH="frameworks"
-inherit kde5
-
-DESCRIPTION="SANE Library interface for KDE"
-KEYWORDS=""
-IUSE=""
-LICENSE="LGPL-2"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-gfx/sane-backends
-"
-RDEPEND="${DEPEND}"

diff --git a/kde-apps/libksane/libksane-9999.ebuild b/kde-apps/libksane/libksane-9999.ebuild
index abf54de..59f215f 100644
--- a/kde-apps/libksane/libksane-9999.ebuild
+++ b/kde-apps/libksane/libksane-9999.ebuild
@@ -4,14 +4,23 @@
 
 EAPI=5
 
-inherit kde4-base
+inherit kde5
 
 DESCRIPTION="SANE Library interface for KDE"
 KEYWORDS=""
-IUSE="debug"
+IUSE=""
 LICENSE="LGPL-2"
 
 DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
 	media-gfx/sane-backends
 "
 RDEPEND="${DEPEND}"