Gentoo Archives: gentoo-commits

From: Matthew Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gui-wm/sway/
Date: Fri, 30 Dec 2022 04:10:33
Message-Id: 1672373425.550b3c8b21f54a1df4d4a6a149afbea7042fae86.prometheanfire@gentoo
1 commit: 550b3c8b21f54a1df4d4a6a149afbea7042fae86
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 30 04:09:38 2022 +0000
4 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 30 04:10:25 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=550b3c8b
7
8 gui-wm/sway: move xcb-util-wm dep under the X flag
9
10 Closes: https://bugs.gentoo.org/888878
11
12 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
13
14 gui-wm/sway/{sway-1.8.ebuild => sway-1.8-r1.ebuild} | 6 ++++--
15 gui-wm/sway/sway-9999.ebuild | 6 ++++--
16 2 files changed, 8 insertions(+), 4 deletions(-)
17
18 diff --git a/gui-wm/sway/sway-1.8.ebuild b/gui-wm/sway/sway-1.8-r1.ebuild
19 similarity index 98%
20 rename from gui-wm/sway/sway-1.8.ebuild
21 rename to gui-wm/sway/sway-1.8-r1.ebuild
22 index 8468aba7acc3..b689ca496c42 100644
23 --- a/gui-wm/sway/sway-1.8.ebuild
24 +++ b/gui-wm/sway/sway-1.8-r1.ebuild
25 @@ -32,7 +32,6 @@ DEPEND="
26 x11-libs/libxkbcommon
27 x11-libs/pango
28 x11-libs/pixman
29 - x11-libs/xcb-util-wm
30 media-libs/mesa[gles2,libglvnd(+)]
31 swaybar? ( x11-libs/gdk-pixbuf:2 )
32 tray? ( || (
33 @@ -41,7 +40,10 @@ DEPEND="
34 sys-libs/basu
35 ) )
36 wallpapers? ( gui-apps/swaybg[gdk-pixbuf(+)] )
37 - X? ( x11-libs/libxcb:0= )
38 + X? (
39 + x11-libs/libxcb:0=
40 + x11-libs/xcb-util-wm
41 + )
42 "
43 # x11-libs/xcb-util-wm needed for xcb-iccm
44 if [[ ${PV} == 9999 ]]; then
45
46 diff --git a/gui-wm/sway/sway-9999.ebuild b/gui-wm/sway/sway-9999.ebuild
47 index 8468aba7acc3..b689ca496c42 100644
48 --- a/gui-wm/sway/sway-9999.ebuild
49 +++ b/gui-wm/sway/sway-9999.ebuild
50 @@ -32,7 +32,6 @@ DEPEND="
51 x11-libs/libxkbcommon
52 x11-libs/pango
53 x11-libs/pixman
54 - x11-libs/xcb-util-wm
55 media-libs/mesa[gles2,libglvnd(+)]
56 swaybar? ( x11-libs/gdk-pixbuf:2 )
57 tray? ( || (
58 @@ -41,7 +40,10 @@ DEPEND="
59 sys-libs/basu
60 ) )
61 wallpapers? ( gui-apps/swaybg[gdk-pixbuf(+)] )
62 - X? ( x11-libs/libxcb:0= )
63 + X? (
64 + x11-libs/libxcb:0=
65 + x11-libs/xcb-util-wm
66 + )
67 "
68 # x11-libs/xcb-util-wm needed for xcb-iccm
69 if [[ ${PV} == 9999 ]]; then