commit: 056cf87fda9bd579d4b20424ae6c95c6502c525f
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Jan 4 12:06:45 2015 +0000
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Thu Jan 8 22:44:09 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=056cf87f
libkomparediff2-5.9999:5 -> libkomparediff2-9999:5
---
...2-9999.ebuild => libkomparediff2-4.9999.ebuild} | 3 ++-
.../libkomparediff2/libkomparediff2-5.9999.ebuild | 29 ----------------------
.../libkomparediff2/libkomparediff2-9999.ebuild | 18 ++++++++++++--
sets/kde-applications-live | 2 +-
4 files changed, 19 insertions(+), 33 deletions(-)
diff --git a/kde-apps/libkomparediff2/libkomparediff2-9999.ebuild
b/kde-apps/libkomparediff2/libkomparediff2-4.9999.ebuild
similarity index 76%
copy from kde-apps/libkomparediff2/libkomparediff2-9999.ebuild
copy to kde-apps/libkomparediff2/libkomparediff2-4.9999.ebuild
index 9b42a32..5620b0f 100644
--- a/kde-apps/libkomparediff2/libkomparediff2-9999.ebuild
+++ b/kde-apps/libkomparediff2/libkomparediff2-4.9999.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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"
diff --git a/kde-apps/libkomparediff2/libkomparediff2-5.9999.ebuild
b/kde-apps/libkomparediff2/libkomparediff2-5.9999.ebuild
deleted file mode 100644
index 92eef29..0000000
--- 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 9b42a32..92eef29 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
"
diff --git a/sets/kde-applications-live b/sets/kde-applications-live
index 986edc2..4cecc54 100644
--- a/sets/kde-applications-live
+++ b/sets/kde-applications-live
@@ -10,7 +10,7 @@
~kde-apps/ksnapshot-5.9999
~kde-apps/kwrite-9999
~kde-apps/libkcddb-5.9999
-~kde-apps/libkomparediff2-5.9999
+~kde-apps/libkomparediff2-9999
~kde-apps/libkonq-5.9999
~kde-apps/okteta-9999
~kde-apps/okular-5.9999
