commit: d46441338a63bd8b5273a91b4ecc8704343336b0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 18 22:40:21 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 21 22:39:28 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d4644133
kde-apps/kdesdk-kioslaves: Frameworks merged to master+Applications/17.04
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../kdesdk-kioslaves-17.04.49.9999.ebuild | 12 ++++++++++--
.../kdesdk-kioslaves/kdesdk-kioslaves-5.9999.ebuild | 19 -------------------
.../kdesdk-kioslaves/kdesdk-kioslaves-9999.ebuild | 12 ++++++++++--
3 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-17.04.49.9999.ebuild
b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-17.04.49.9999.ebuild
index 87f7cbf1fe..f90614946c 100644
--- a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-17.04.49.9999.ebuild
+++ b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-17.04.49.9999.ebuild
@@ -3,8 +3,16 @@
EAPI=6
-inherit kde4-base
+inherit kde5
DESCRIPTION="kioslaves from kdesdk package"
KEYWORDS=""
-IUSE="debug"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ dev-lang/perl
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-5.9999.ebuild
b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-5.9999.ebuild
deleted file mode 100644
index fa059607f0..0000000000
--- a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-5.9999.ebuild
+++ /dev/null
@@ -1,19 +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="kioslaves from kdesdk package"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kio)
- dev-lang/perl
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-9999.ebuild
b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-9999.ebuild
index 87f7cbf1fe..f90614946c 100644
--- a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-9999.ebuild
+++ b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-9999.ebuild
@@ -3,8 +3,16 @@
EAPI=6
-inherit kde4-base
+inherit kde5
DESCRIPTION="kioslaves from kdesdk package"
KEYWORDS=""
-IUSE="debug"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ dev-lang/perl
+"
+RDEPEND="${DEPEND}"
