Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kfind/
Date: Tue, 02 Aug 2016 21:22:24
Message-Id: 1470172912.bda053d9d7e85d77e2ce21b850df618d4b34d7af.johu@gentoo
1 commit: bda053d9d7e85d77e2ce21b850df618d4b34d7af
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Tue Aug 2 18:40:36 2016 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 2 21:21:52 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=bda053d9
7
8 kde-apps/kfind: Frameworks merged to master
9
10 Package-Manager: portage-2.2.28
11
12 Signed-off-by: Johannes Huber <johu <AT> gentoo.org>
13
14 kde-apps/kfind/kfind-5.9999.ebuild | 36 ------------------------------------
15 kde-apps/kfind/kfind-9999.ebuild | 25 +++++++++++++++++++++----
16 2 files changed, 21 insertions(+), 40 deletions(-)
17
18 diff --git a/kde-apps/kfind/kfind-5.9999.ebuild b/kde-apps/kfind/kfind-5.9999.ebuild
19 deleted file mode 100644
20 index dffad59..0000000
21 --- a/kde-apps/kfind/kfind-5.9999.ebuild
22 +++ /dev/null
23 @@ -1,36 +0,0 @@
24 -# Copyright 1999-2016 Gentoo Foundation
25 -# Distributed under the terms of the GNU General Public License v2
26 -# $Id$
27 -
28 -EAPI=6
29 -
30 -EGIT_BRANCH="frameworks"
31 -KDE_HANDBOOK="true"
32 -KMNAME="kde-baseapps"
33 -inherit kde5
34 -
35 -DESCRIPTION="KDE file finder utility"
36 -HOMEPAGE="https://www.kde.org/applications/utilities/kfind/"
37 -KEYWORDS=""
38 -IUSE=""
39 -
40 -DEPEND="
41 - $(add_frameworks_dep karchive)
42 - $(add_frameworks_dep kcompletion)
43 - $(add_frameworks_dep kconfig)
44 - $(add_frameworks_dep kconfigwidgets)
45 - $(add_frameworks_dep kcoreaddons)
46 - $(add_frameworks_dep kdelibs4support)
47 - $(add_frameworks_dep ki18n)
48 - $(add_frameworks_dep kio)
49 - $(add_frameworks_dep kjobwidgets)
50 - $(add_frameworks_dep kservice)
51 - $(add_frameworks_dep kwidgetsaddons)
52 - $(add_frameworks_dep kxmlgui)
53 - $(add_kdeapps_dep libkonq)
54 - $(add_qt_dep qtgui)
55 - $(add_qt_dep qtwidgets)
56 -"
57 -RDEPEND="${DEPEND}"
58 -
59 -S=${S}/${PN}
60
61 diff --git a/kde-apps/kfind/kfind-9999.ebuild b/kde-apps/kfind/kfind-9999.ebuild
62 index 3ccfa3c..8ad9a6a 100644
63 --- a/kde-apps/kfind/kfind-9999.ebuild
64 +++ b/kde-apps/kfind/kfind-9999.ebuild
65 @@ -4,16 +4,33 @@
66
67 EAPI=6
68
69 -KDE_HANDBOOK="optional"
70 +KDE_DOC_DIR="docs"
71 +KDE_HANDBOOK="forceoptional"
72 KMNAME="kde-baseapps"
73 -inherit kde4-meta
74 +inherit kde5
75
76 -DESCRIPTION="KDE file finder utility"
77 +DESCRIPTION="File finder utility based on KDE Frameworks"
78 HOMEPAGE="https://www.kde.org/applications/utilities/kfind/"
79 KEYWORDS=""
80 -IUSE="debug"
81 +IUSE=""
82
83 DEPEND="
84 + $(add_frameworks_dep karchive)
85 + $(add_frameworks_dep kcompletion)
86 + $(add_frameworks_dep kconfig)
87 + $(add_frameworks_dep kconfigwidgets)
88 + $(add_frameworks_dep kcoreaddons)
89 + $(add_frameworks_dep kdelibs4support)
90 + $(add_frameworks_dep ki18n)
91 + $(add_frameworks_dep kio)
92 + $(add_frameworks_dep kjobwidgets)
93 + $(add_frameworks_dep kservice)
94 + $(add_frameworks_dep kwidgetsaddons)
95 + $(add_frameworks_dep kxmlgui)
96 $(add_kdeapps_dep libkonq)
97 + $(add_qt_dep qtgui)
98 + $(add_qt_dep qtwidgets)
99 "
100 RDEPEND="${DEPEND}"
101 +
102 +S="${S}/${PN}"