[gentoo-commits] proj/kde:master commit in: app-editors/kile/

["Johannes Huber" <johu@gentoo.org>]

commit:     6ebd1d942f96d926c57bf21ad20dc36aa7a22ebf
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sun Jan 11 16:32:28 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Jan 13 20:45:40 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6ebd1d94

[app-editors/kile] Re-organise dependencies
 - move packages to DEPEND
 - use CMAKE_MIN_VERSION
 - drop non-existing okular[postscript] use-dep
 - fix konsole RDEPEND
 - block app-editors/kile:4 (adhere to coding style guide)
 - remove qtcore:5 dependency as it is set by kde5.eclass

Package-Manager: portage-2.2.14

---
 app-editors/kile/kile-5.9999.ebuild | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/app-editors/kile/kile-5.9999.ebuild b/app-editors/kile/kile-5.9999.ebuild
index 0c48f50..9b460a9 100644
--- a/app-editors/kile/kile-5.9999.ebuild
+++ b/app-editors/kile/kile-5.9999.ebuild
@@ -4,6 +4,7 @@
 
 EAPI=5
 
+CMAKE_MIN_VERSION="3.0.2"
 KDE_HANDBOOK=true
 EGIT_BRANCH="frameworks"
 MY_P=${P/_beta/b}
@@ -18,10 +19,6 @@ KEYWORDS=""
 IUSE="debug +pdf +png"
 
 DEPEND="
-	>=dev-util/cmake-3.0.2
-"
-
-RDEPEND="${DEPEND}
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kdelibs4support)
 	$(add_frameworks_dep kdoctools)
@@ -35,16 +32,20 @@ RDEPEND="${DEPEND}
 	$(add_frameworks_dep ktexteditor)
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
-	|| (
-		$(add_kdeapps_dep konsole)
-		$(add_kdeapps_dep okular 'pdf?,postscript')
-		app-text/acroread
-	)
-	dev-qt/qtcore:5
+	$(add_kdeapps_dep okular)
 	dev-qt/qtdbus:5
 	dev-qt/qtscript:5
 	dev-qt/qttest:5
 	dev-qt/qtwidgets:5
+"
+
+RDEPEND="${DEPEND}
+	!app-editors/kile:4
+	$(add_kdeapps_dep konsole)
+	|| (
+		$(add_kdeapps_dep okular 'pdf?')
+		app-text/acroread
+	)
 	virtual/latex-base
 	virtual/tex-base
 	pdf? (