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

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

commit:     c038bd17f6cca2c5ea354d22572639aba1a1bd6a
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 27 21:03:28 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jun 27 21:03:28 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c038bd17

[app-editors/kile] Drop SLOT 4

Package-Manager: portage-2.2.20

 app-editors/kile/kile-5.9999.ebuild | 75 -------------------------------------
 app-editors/kile/kile-9999.ebuild   | 37 +++++++++++++-----
 2 files changed, 28 insertions(+), 84 deletions(-)

diff --git a/app-editors/kile/kile-5.9999.ebuild b/app-editors/kile/kile-5.9999.ebuild
deleted file mode 100644
index f76a32c..0000000
--- a/app-editors/kile/kile-5.9999.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-CMAKE_MIN_VERSION="3.0.2"
-KDE_HANDBOOK=true
-EGIT_BRANCH="frameworks"
-MY_P=${P/_beta/b}
-inherit kde5
-
-DESCRIPTION="A Latex Editor and TeX shell for KDE"
-HOMEPAGE="http://kile.sourceforge.net/"
-[[ ${PV} != *9999* ]] && SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="FDL-1.2 GPL-2"
-KEYWORDS=""
-IUSE="+pdf +png"
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdoctools)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(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? (
-		|| (
-			app-text/dvipdfmx
-			>=app-text/texlive-core-2014
-		)
-		app-text/ghostscript-gpl
-	)
-	png? (
-		app-text/dvipng
-		media-gfx/imagemagick[png]
-	)
-"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( kile-remote-control.txt )
-
-src_prepare() {
-	kde5_src_prepare
-
-	# I know upstream wants to help us but it doesn't work..
-	sed -e '/INSTALL( FILES AUTHORS/s/^/#DISABLED /' \
-		-i CMakeLists.txt || die
-}

diff --git a/app-editors/kile/kile-9999.ebuild b/app-editors/kile/kile-9999.ebuild
index 524524c..f76a32c 100644
--- a/app-editors/kile/kile-9999.ebuild
+++ b/app-editors/kile/kile-9999.ebuild
@@ -4,10 +4,11 @@
 
 EAPI=5
 
-KDE_DOC_DIRS="doc"
-KDE_HANDBOOK="optional"
+CMAKE_MIN_VERSION="3.0.2"
+KDE_HANDBOOK=true
+EGIT_BRANCH="frameworks"
 MY_P=${P/_beta/b}
-inherit kde4-base
+inherit kde5
 
 DESCRIPTION="A Latex Editor and TeX shell for KDE"
 HOMEPAGE="http://kile.sourceforge.net/"
@@ -15,17 +16,35 @@ HOMEPAGE="http://kile.sourceforge.net/"
 
 LICENSE="FDL-1.2 GPL-2"
 KEYWORDS=""
-SLOT="4"
-IUSE="debug +pdf +png"
+IUSE="+pdf +png"
 
 DEPEND="
-	x11-misc/shared-mime-info
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdoctools)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_kdeapps_dep okular)
+	dev-qt/qtdbus:5
+	dev-qt/qtscript:5
+	dev-qt/qttest:5
+	dev-qt/qtwidgets:5
 "
+
 RDEPEND="${DEPEND}
-	$(add_kdeapps_dep kdebase-data)
+	!app-editors/kile:4
 	$(add_kdeapps_dep konsole)
 	|| (
-		$(add_kdeapps_dep okular 'pdf?,postscript')
+		$(add_kdeapps_dep okular 'pdf?')
 		app-text/acroread
 	)
 	virtual/latex-base
@@ -48,7 +67,7 @@ S=${WORKDIR}/${MY_P}
 DOCS=( kile-remote-control.txt )
 
 src_prepare() {
-	kde4-base_src_prepare
+	kde5_src_prepare
 
 	# I know upstream wants to help us but it doesn't work..
 	sed -e '/INSTALL( FILES AUTHORS/s/^/#DISABLED /' \