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/kinfocenter/
Date: Thu, 02 Jan 2020 20:49:36
Message-Id: 1577995831.5e82e2fae3f72c20372d1278a8f7ae3b1707c6a9.asturm@gentoo
1 commit: 5e82e2fae3f72c20372d1278a8f7ae3b1707c6a9
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 2 20:10:31 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 2 20:10:31 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5e82e2fa
7
8 kde-plasma/kinfocenter: Drop CMAKE_MIN_VERSION
9
10 BDEPEND on >=dev-util/cmake-3.14.3 directly.
11
12 Package-Manager: Portage-2.3.84, Repoman-2.3.20
13 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
14
15 kde-plasma/kinfocenter/kinfocenter-5.17.49.9999.ebuild | 12 ++++++------
16 kde-plasma/kinfocenter/kinfocenter-9999.ebuild | 4 ++--
17 2 files changed, 8 insertions(+), 8 deletions(-)
18
19 diff --git a/kde-plasma/kinfocenter/kinfocenter-5.17.49.9999.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.17.49.9999.ebuild
20 index ac12a09f39..42f51acc1b 100644
21 --- a/kde-plasma/kinfocenter/kinfocenter-5.17.49.9999.ebuild
22 +++ b/kde-plasma/kinfocenter/kinfocenter-5.17.49.9999.ebuild
23 @@ -3,7 +3,6 @@
24
25 EAPI=7
26
27 -CMAKE_MIN_VERSION=3.14.3
28 ECM_HANDBOOK="forceoptional"
29 KFMIN=5.64.0
30 PVCUT=$(ver_cut 1-3)
31 @@ -20,7 +19,12 @@ IUSE="gles2 ieee1394 +opengl +pci wayland"
32
33 REQUIRED_USE="wayland? ( || ( gles2 opengl ) )"
34
35 +BDEPEND=">=dev-util/cmake-3.14.3"
36 COMMON_DEPEND="
37 + >=dev-qt/qtdbus-${QTMIN}:5
38 + >=dev-qt/qtdeclarative-${QTMIN}:5
39 + >=dev-qt/qtgui-${QTMIN}:5
40 + >=dev-qt/qtwidgets-${QTMIN}:5
41 >=kde-frameworks/kcmutils-${KFMIN}:5
42 >=kde-frameworks/kcompletion-${KFMIN}:5
43 >=kde-frameworks/kconfig-${KFMIN}:5
44 @@ -37,10 +41,6 @@ COMMON_DEPEND="
45 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
46 >=kde-frameworks/kxmlgui-${KFMIN}:5
47 >=kde-frameworks/solid-${KFMIN}:5
48 - >=dev-qt/qtdbus-${QTMIN}:5
49 - >=dev-qt/qtdeclarative-${QTMIN}:5
50 - >=dev-qt/qtgui-${QTMIN}:5
51 - >=dev-qt/qtwidgets-${QTMIN}:5
52 x11-libs/libX11
53 ieee1394? ( sys-libs/libraw1394 )
54 opengl? (
55 @@ -58,8 +58,8 @@ DEPEND="${COMMON_DEPEND}
56 >=kde-frameworks/plasma-${KFMIN}:5
57 "
58 RDEPEND="${COMMON_DEPEND}
59 - >=kde-plasma/kde-cli-tools-${PVCUT}:5
60 >=dev-qt/qtquickcontrols2-${QTMIN}:5
61 + >=kde-plasma/kde-cli-tools-${PVCUT}:5
62 "
63
64 src_configure() {
65
66 diff --git a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
67 index 9b5b7d202c..8a16272880 100644
68 --- a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
69 +++ b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild
70 @@ -3,7 +3,6 @@
71
72 EAPI=7
73
74 -CMAKE_MIN_VERSION=3.14.3
75 ECM_HANDBOOK="forceoptional"
76 KFMIN=9999
77 PVCUT=$(ver_cut 1-3)
78 @@ -21,6 +20,7 @@ IUSE="gles2 ieee1394 +opengl +pci wayland"
79
80 REQUIRED_USE="wayland? ( || ( gles2 opengl ) )"
81
82 +BDEPEND=">=dev-util/cmake-3.14.3"
83 COMMON_DEPEND="
84 >=kde-frameworks/kcmutils-${KFMIN}:5
85 >=kde-frameworks/kcompletion-${KFMIN}:5
86 @@ -59,8 +59,8 @@ DEPEND="${COMMON_DEPEND}
87 >=kde-frameworks/plasma-${KFMIN}:5
88 "
89 RDEPEND="${COMMON_DEPEND}
90 - >=kde-plasma/kde-cli-tools-${PVCUT}:5
91 >=dev-qt/qtquickcontrols2-${QTMIN}:5
92 + >=kde-plasma/kde-cli-tools-${PVCUT}:5
93 "
94
95 src_configure() {