Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kdecore-meta/
Date: Sun, 05 Jan 2020 12:25:50
Message-Id: 1578227133.d754b4cf590cccebeca95bcbd449c5e2c87187a4.asturm@gentoo
1 commit: d754b4cf590cccebeca95bcbd449c5e2c87187a4
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 5 12:25:33 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 5 12:25:33 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d754b4cf
7
8 kde-apps/kdecore-meta: Drop USE webkit
9
10 Package-Manager: Portage-2.3.84, Repoman-2.3.20
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 kde-apps/kdecore-meta/kdecore-meta-19.12.49.9999.ebuild | 11 +++++------
14 kde-apps/kdecore-meta/metadata.xml | 1 -
15 2 files changed, 5 insertions(+), 7 deletions(-)
16
17 diff --git a/kde-apps/kdecore-meta/kdecore-meta-19.12.49.9999.ebuild b/kde-apps/kdecore-meta/kdecore-meta-19.12.49.9999.ebuild
18 index 84a00091de..a8e3fa40cd 100644
19 --- a/kde-apps/kdecore-meta/kdecore-meta-19.12.49.9999.ebuild
20 +++ b/kde-apps/kdecore-meta/kdecore-meta-19.12.49.9999.ebuild
21 @@ -9,7 +9,7 @@ HOMEPAGE="https://kde.org/"
22 LICENSE="metapackage"
23 SLOT="5"
24 KEYWORDS=""
25 -IUSE="+handbook +share +thumbnail +webengine webkit"
26 +IUSE="+handbook +share +thumbnail +webengine"
27
28 RDEPEND="
29 >=kde-apps/dolphin-${PV}:${SLOT}
30 @@ -19,11 +19,10 @@ RDEPEND="
31 >=kde-apps/konsole-${PV}:${SLOT}
32 >=kde-apps/kwrite-${PV}:${SLOT}
33 handbook? ( >=kde-apps/khelpcenter-${PV}:${SLOT} )
34 - webengine? ( www-client/falkon )
35 - webkit? (
36 - >=kde-apps/konqueror-${PV}:${SLOT}[webengine?]
37 - kde-misc/kwebkitpart:5
38 - )
39 + webengine? ( || (
40 + www-client/falkon
41 + >=kde-apps/konqueror-${PV}:${SLOT}
42 + ) )
43 "
44 # Optional runtime deps: kde-apps/dolphin
45 RDEPEND="${RDEPEND}
46
47 diff --git a/kde-apps/kdecore-meta/metadata.xml b/kde-apps/kdecore-meta/metadata.xml
48 index 99b40a291a..ce448ffcff 100644
49 --- a/kde-apps/kdecore-meta/metadata.xml
50 +++ b/kde-apps/kdecore-meta/metadata.xml
51 @@ -9,6 +9,5 @@
52 <flag name="share">Install <pkg>kde-frameworks/purpose</pkg> for share file context menu actions in <pkg>kde-apps/dolphin</pkg></flag>
53 <flag name="thumbnail">Install <pkg>kde-apps/ffmpegthumbs</pkg> and <pkg>kde-apps/thumbnailers</pkg> for thumbnail generation in <pkg>kde-apps/dolphin</pkg></flag>
54 <flag name="webengine">Enable <pkg>www-client/falkon</pkg> which depends on <pkg>dev-qt/qtwebengine</pkg></flag>
55 - <flag name="webkit">Enable <pkg>kde-apps/konqueror</pkg> with <pkg>kde-misc/kwebkitpart</pkg> which depend on <pkg>dev-qt/qtwebkit</pkg></flag>
56 </use>
57 </pkgmetadata>