[gentoo-commits] proj/kde:master commit in: kde-misc/krusader/

[Johannes Huber]

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

[kde-misc/krusader] Drop SLOT 4

Package-Manager: portage-2.2.20

 kde-misc/krusader/krusader-5.9999.ebuild | 61 --------------------------------
 kde-misc/krusader/krusader-9999.ebuild   | 57 ++++++++++++++++++++++-------
 kde-misc/krusader/metadata.xml           |  3 --
 3 files changed, 45 insertions(+), 76 deletions(-)

diff --git a/kde-misc/krusader/krusader-5.9999.ebuild b/kde-misc/krusader/krusader-5.9999.ebuild
deleted file mode 100644
index 481f64d..0000000
--- a/kde-misc/krusader/krusader-5.9999.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-EGIT_BRANCH="plasma"
-KDE_HANDBOOK="true"
-inherit kde5
-
-DESCRIPTION="An advanced twin-panel (commander-style) file-manager with many extras"
-HOMEPAGE="http://www.krusader.org/"
-
-LICENSE="GPL-2"
-KEYWORDS=""
-IUSE="xattr"
-
-CDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-libs/zlib
-	xattr? ( sys-apps/attr )
-"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${CDEPEND}
-	!kde-misc/krusader:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package xattr ACL)
-	)
-
-	kde5_src_configure
-}

diff --git a/kde-misc/krusader/krusader-9999.ebuild b/kde-misc/krusader/krusader-9999.ebuild
index 26f32f7..481f64d 100644
--- a/kde-misc/krusader/krusader-9999.ebuild
+++ b/kde-misc/krusader/krusader-9999.ebuild
@@ -4,25 +4,58 @@
 
 EAPI=5
 
-KDE_HANDBOOK="optional"
-KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et fi fr ga
-gl hr hu it ja ko lt mai nb nds nl pa pl pt pt_BR ro ru sk sl sr
-sr@ijekavian sr@ijekavianlatin sr@latin sv tr ug uk zh_CN zh_TW"
-inherit kde4-base
+EGIT_BRANCH="plasma"
+KDE_HANDBOOK="true"
+inherit kde5
 
-DESCRIPTION="An advanced twin-panel (commander-style) file-manager for KDE with many extras"
+DESCRIPTION="An advanced twin-panel (commander-style) file-manager with many extras"
 HOMEPAGE="http://www.krusader.org/"
 
 LICENSE="GPL-2"
 KEYWORDS=""
-SLOT="4"
-IUSE="+bookmarks debug"
+IUSE="xattr"
 
-RDEPEND="
-	$(add_kdeapps_dep libkonq)
+CDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
 	sys-libs/zlib
-	bookmarks? ( $(add_kdeapps_dep keditbookmarks) )
+	xattr? ( sys-apps/attr )
 "
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
 	sys-devel/gettext
 "
+RDEPEND="${CDEPEND}
+	!kde-misc/krusader:4
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package xattr ACL)
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-misc/krusader/metadata.xml b/kde-misc/krusader/metadata.xml
index 247e042..a23f444 100644
--- a/kde-misc/krusader/metadata.xml
+++ b/kde-misc/krusader/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>
-	<use>
-		<flag name="bookmarks">Add dependency on bookmark package.</flag>
-	</use>
 </pkgmetadata>