commit:     bda053d9d7e85d77e2ce21b850df618d4b34d7af
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Aug  2 18:40:36 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Aug  2 21:21:52 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=bda053d9

kde-apps/kfind: Frameworks merged to master

Package-Manager: portage-2.2.28

Signed-off-by: Johannes Huber <johu <AT> gentoo.org>

 kde-apps/kfind/kfind-5.9999.ebuild | 36 ------------------------------------
 kde-apps/kfind/kfind-9999.ebuild   | 25 +++++++++++++++++++++----
 2 files changed, 21 insertions(+), 40 deletions(-)

diff --git a/kde-apps/kfind/kfind-5.9999.ebuild 
b/kde-apps/kfind/kfind-5.9999.ebuild
deleted file mode 100644
index dffad59..0000000
--- a/kde-apps/kfind/kfind-5.9999.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-EGIT_BRANCH="frameworks"
-KDE_HANDBOOK="true"
-KMNAME="kde-baseapps"
-inherit kde5
-
-DESCRIPTION="KDE file finder utility"
-HOMEPAGE="https://www.kde.org/applications/utilities/kfind/";
-KEYWORDS=""
-IUSE=""
-
-DEPEND="
-       $(add_frameworks_dep karchive)
-       $(add_frameworks_dep kcompletion)
-       $(add_frameworks_dep kconfig)
-       $(add_frameworks_dep kconfigwidgets)
-       $(add_frameworks_dep kcoreaddons)
-       $(add_frameworks_dep kdelibs4support)
-       $(add_frameworks_dep ki18n)
-       $(add_frameworks_dep kio)
-       $(add_frameworks_dep kjobwidgets)
-       $(add_frameworks_dep kservice)
-       $(add_frameworks_dep kwidgetsaddons)
-       $(add_frameworks_dep kxmlgui)
-       $(add_kdeapps_dep libkonq)
-       $(add_qt_dep qtgui)
-       $(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
-
-S=${S}/${PN}

diff --git a/kde-apps/kfind/kfind-9999.ebuild b/kde-apps/kfind/kfind-9999.ebuild
index 3ccfa3c..8ad9a6a 100644
--- a/kde-apps/kfind/kfind-9999.ebuild
+++ b/kde-apps/kfind/kfind-9999.ebuild
@@ -4,16 +4,33 @@
 
 EAPI=6
 
-KDE_HANDBOOK="optional"
+KDE_DOC_DIR="docs"
+KDE_HANDBOOK="forceoptional"
 KMNAME="kde-baseapps"
-inherit kde4-meta
+inherit kde5
 
-DESCRIPTION="KDE file finder utility"
+DESCRIPTION="File finder utility based on KDE Frameworks"
 HOMEPAGE="https://www.kde.org/applications/utilities/kfind/";
 KEYWORDS=""
-IUSE="debug"
+IUSE=""
 
 DEPEND="
+       $(add_frameworks_dep karchive)
+       $(add_frameworks_dep kcompletion)
+       $(add_frameworks_dep kconfig)
+       $(add_frameworks_dep kconfigwidgets)
+       $(add_frameworks_dep kcoreaddons)
+       $(add_frameworks_dep kdelibs4support)
+       $(add_frameworks_dep ki18n)
+       $(add_frameworks_dep kio)
+       $(add_frameworks_dep kjobwidgets)
+       $(add_frameworks_dep kservice)
+       $(add_frameworks_dep kwidgetsaddons)
+       $(add_frameworks_dep kxmlgui)
        $(add_kdeapps_dep libkonq)
+       $(add_qt_dep qtgui)
+       $(add_qt_dep qtwidgets)
 "
 RDEPEND="${DEPEND}"
+
+S="${S}/${PN}"

Reply via email to