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

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     3a0e77fa599f73b6cfb2556f23d88f0c61c43338
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 26 23:19:25 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 26 23:19:25 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3a0e77fa

kde-apps/kde-dev-utils: Frameworks merged to master

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 kde-apps/kde-dev-utils/kde-dev-utils-5.9999.ebuild | 28 ----------------------
 kde-apps/kde-dev-utils/kde-dev-utils-9999.ebuild   | 21 ++++++++++++++--
 2 files changed, 19 insertions(+), 30 deletions(-)

diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-5.9999.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-5.9999.ebuild
deleted file mode 100644
index 833fbaef09..0000000000
--- a/kde-apps/kde-dev-utils/kde-dev-utils-5.9999.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_BRANCH="frameworks"
-inherit kde5
-
-DESCRIPTION="KDE Development Utilities"
-LICENSE="GPL-2+"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep designer)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"

diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-9999.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-9999.ebuild
index 7cd5384934..a3eaa965f2 100644
--- a/kde-apps/kde-dev-utils/kde-dev-utils-9999.ebuild
+++ b/kde-apps/kde-dev-utils/kde-dev-utils-9999.ebuild
@@ -3,8 +3,25 @@
 
 EAPI=6
 
-inherit kde4-base
+inherit kde5
 
 DESCRIPTION="KDE Development Utilities"
+LICENSE="GPL-2+"
 KEYWORDS=""
-IUSE="debug"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep designer)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}"