Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/layer-shell-qt/
Date: Sun, 03 Oct 2021 09:33:02
Message-Id: 1633253571.4e33b214277678efe6e480789afdc7f3a9c9dc31.asturm@gentoo
1 commit: 4e33b214277678efe6e480789afdc7f3a9c9dc31
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 3 09:16:24 2021 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 3 09:32:51 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e33b214
7
8 kde-plasma/layer-shell-qt: Needs dev-qt/qtwayland private headers
9
10 Add slot operator accordingly.
11
12 Bug: https://bugs.gentoo.org/815646
13 Package-Manager: Portage-3.0.26, Repoman-3.0.3
14 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
15
16 ...er-shell-qt-5.22.5.ebuild => layer-shell-qt-5.22.5-r1.ebuild} | 9 +++++++--
17 kde-plasma/layer-shell-qt/layer-shell-qt-5.22.90.ebuild | 3 ++-
18 2 files changed, 9 insertions(+), 3 deletions(-)
19
20 diff --git a/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.5.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.5-r1.ebuild
21 similarity index 69%
22 rename from kde-plasma/layer-shell-qt/layer-shell-qt-5.22.5.ebuild
23 rename to kde-plasma/layer-shell-qt/layer-shell-qt-5.22.5-r1.ebuild
24 index 04aab13c07c..a83e73a29d8 100644
25 --- a/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.5.ebuild
26 +++ b/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.5-r1.ebuild
27 @@ -14,11 +14,16 @@ SLOT="5"
28 KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
29 IUSE=""
30
31 +# dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X
32 +# slot op: various private QtWaylandClient headers
33 RDEPEND="
34 >=dev-libs/wayland-1.15
35 >=dev-qt/qtdeclarative-${QTMIN}:5
36 - >=dev-qt/qtgui-${QTMIN}:5[X]
37 - >=dev-qt/qtwayland-${QTMIN}:5
38 + || (
39 + >=dev-qt/qtgui-${QTMIN}:5[libinput]
40 + >=dev-qt/qtgui-${QTMIN}:5[X]
41 + )
42 + >=dev-qt/qtwayland-${QTMIN}:5=
43 x11-libs/libxkbcommon
44 "
45 DEPEND="${RDEPEND}
46
47 diff --git a/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.90.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.90.ebuild
48 index e70d7db79a1..582e24874ff 100644
49 --- a/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.90.ebuild
50 +++ b/kde-plasma/layer-shell-qt/layer-shell-qt-5.22.90.ebuild
51 @@ -15,6 +15,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
52 IUSE=""
53
54 # dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X
55 +# slot op: various private QtWaylandClient headers
56 RDEPEND="
57 >=dev-libs/wayland-1.15
58 >=dev-qt/qtdeclarative-${QTMIN}:5
59 @@ -22,7 +23,7 @@ RDEPEND="
60 >=dev-qt/qtgui-${QTMIN}:5[libinput]
61 >=dev-qt/qtgui-${QTMIN}:5[X]
62 )
63 - >=dev-qt/qtwayland-${QTMIN}:5
64 + >=dev-qt/qtwayland-${QTMIN}:5=
65 x11-libs/libxkbcommon
66 "
67 DEPEND="${RDEPEND}