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-plasma/systemsettings/
Date: Wed, 11 Sep 2019 08:09:56
Message-Id: 1568143908.6db14199a874f5acd41444b01b43700820add758.asturm@gentoo
1 commit: 6db14199a874f5acd41444b01b43700820add758
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 10 19:18:50 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 10 19:31:48 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=6db14199
7
8 kde-plasma/systemsettings: Classic mode is gone w/ KHtml out
9
10 Upstream commit 03892b3b0dc7b956cfc766f8d8091f0385a79d90
11
12 Package-Manager: Portage-2.3.75, Repoman-2.3.17
13 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
14
15 kde-plasma/systemsettings/metadata.xml | 3 ---
16 kde-plasma/systemsettings/systemsettings-9999.ebuild | 13 ++-----------
17 2 files changed, 2 insertions(+), 14 deletions(-)
18
19 diff --git a/kde-plasma/systemsettings/metadata.xml b/kde-plasma/systemsettings/metadata.xml
20 index b028a419c8..2fdbf33d96 100644
21 --- a/kde-plasma/systemsettings/metadata.xml
22 +++ b/kde-plasma/systemsettings/metadata.xml
23 @@ -5,7 +5,4 @@
24 <email>kde@g.o</email>
25 <name>Gentoo KDE Project</name>
26 </maintainer>
27 - <use>
28 - <flag name="classic">Enable classic mode plugin, requires <pkg>kde-frameworks/khtml</pkg></flag>
29 - </use>
30 </pkgmetadata>
31
32 diff --git a/kde-plasma/systemsettings/systemsettings-9999.ebuild b/kde-plasma/systemsettings/systemsettings-9999.ebuild
33 index 20bada9ce1..f285e1a82d 100644
34 --- a/kde-plasma/systemsettings/systemsettings-9999.ebuild
35 +++ b/kde-plasma/systemsettings/systemsettings-9999.ebuild
36 @@ -6,9 +6,9 @@ EAPI=7
37 KDE_HANDBOOK="forceoptional"
38 inherit kde5
39
40 -DESCRIPTION="System settings utility"
41 +DESCRIPTION="Control Center to configure KDE Plasma desktop"
42 KEYWORDS=""
43 -IUSE="classic gtk"
44 +IUSE="gtk"
45
46 DEPEND="
47 $(add_frameworks_dep kactivities)
48 @@ -36,7 +36,6 @@ DEPEND="
49 $(add_qt_dep qtdeclarative 'widgets')
50 $(add_qt_dep qtgui)
51 $(add_qt_dep qtwidgets)
52 - classic? ( $(add_frameworks_dep khtml) )
53 "
54 RDEPEND="${DEPEND}
55 $(add_frameworks_dep kirigami)
56 @@ -50,11 +49,3 @@ src_prepare() {
57 sed -e "s/^ecm_find_qmlmodule.*org\.kde\.kcm/#&/" \
58 -i CMakeLists.txt || die
59 }
60 -
61 -src_configure() {
62 - local mycmakeargs=(
63 - $(cmake-utils_use_find_package classic KF5KHtml)
64 - )
65 -
66 - kde5_src_configure
67 -}