3 files changed, 32 insertions, 31 deletions
diff --git a/kde-apps/libkomparediff2/libkomparediff2-4.9999.ebuild b/kde-apps/libkomparediff2/libkomparediff2-4.9999.ebuild
new file mode 100644
index 00000000000..5620b0ff532
--- /dev/null
+++ b/kde-apps/libkomparediff2/libkomparediff2-4.9999.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+EGIT_BRANCH="Applications/14.12"
+inherit kde4-base
+
+DESCRIPTION="KDE library to compare files and strings"
+KEYWORDS=""
+IUSE="debug test"
+
+RDEPEND="${DEPEND}
+	!<=kde-base/kompare-4.11.50
+"
diff --git a/kde-apps/libkomparediff2/libkomparediff2-5.9999.ebuild b/kde-apps/libkomparediff2/libkomparediff2-5.9999.ebuild
deleted file mode 100644
index 92eef293c7f..00000000000
--- a/kde-apps/libkomparediff2/libkomparediff2-5.9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-KDE_TEST="true"
-EGIT_BRANCH="frameworks"
-inherit kde5
-
-DESCRIPTION="KDE library to compare files and strings"
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kxmlgui)
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}
-	!<=kde-base/kompare-4.11.50
-	!kde-base/libkomparediff2:4
-"
diff --git a/kde-apps/libkomparediff2/libkomparediff2-9999.ebuild b/kde-apps/libkomparediff2/libkomparediff2-9999.ebuild
index 9b42a3201ef..92eef293c7f 100644
--- a/kde-apps/libkomparediff2/libkomparediff2-9999.ebuild
+++ b/kde-apps/libkomparediff2/libkomparediff2-9999.ebuild
@@ -4,12 +4,26 @@
 
 EAPI=5
 
-inherit kde4-base
+KDE_TEST="true"
+EGIT_BRANCH="frameworks"
+inherit kde5
 
 DESCRIPTION="KDE library to compare files and strings"
 KEYWORDS=""
-IUSE="debug test"
+IUSE=""
 
+DEPEND="
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kxmlgui)
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
 RDEPEND="${DEPEND}
 	!<=kde-base/kompare-4.11.50
+	!kde-base/libkomparediff2:4
 "