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: Tue, 30 Apr 2019 03:35:16
Message-Id: 1556595297.7169c5094f2863c632a00260965102d286f218d5.prometheanfire@gentoo
1 commit: 7169c5094f2863c632a00260965102d286f218d5
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 30 03:34:40 2019 +0000
4 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 30 03:34:57 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7169c509
7
8 gui-wm/sway: swaybg was split out
9
10 Fixes: https://bugs.gentoo.org/684622
11 Package-Manager: Portage-2.3.62, Repoman-2.3.12
12 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
13
14 gui-wm/sway/sway-9999.ebuild | 5 ++---
15 1 file changed, 2 insertions(+), 3 deletions(-)
16
17 diff --git a/gui-wm/sway/sway-9999.ebuild b/gui-wm/sway/sway-9999.ebuild
18 index 0c258524b15..bb283010dfc 100644
19 --- a/gui-wm/sway/sway-9999.ebuild
20 +++ b/gui-wm/sway/sway-9999.ebuild
21 @@ -35,7 +35,7 @@ DEPEND="
22 x11-libs/pixman
23 elogind? ( >=sys-auth/elogind-239 )
24 swaybar? ( x11-libs/gdk-pixbuf:2 )
25 - swaybg? ( x11-libs/gdk-pixbuf:2 )
26 + swaybg? ( gui-apps/swaybg )
27 swayidle? ( gui-apps/swayidle )
28 swaylock? ( gui-apps/swaylock )
29 systemd? ( >=sys-apps/systemd-239 )
30 @@ -65,7 +65,6 @@ src_prepare() {
31
32 use swaybar || sed -e "s/subdir('swaybar')//g" -e "/sway-bar.[0-9].scd/d" \
33 -e "/completions\/[a-z]\+\/_\?swaybar/d" -i meson.build || die
34 - use swaybg || sed -e "s/subdir('swaybg')//g" -i meson.build || die
35 use swaymsg || sed -e "s/subdir('swaymsg')//g" -e "/swaymsg.[0-9].scd/d" \
36 -e "/completions\/[a-z]\+\/_\?swaymsg/d" -i meson.build || die
37 use swaynag || sed -e "s/subdir('swaynag')//g" -e "/swaynag.[0-9].scd/d" \
38 @@ -84,7 +83,7 @@ src_configure() {
39 "-Dwerror=false"
40 )
41
42 - if use swaybar || use swaybg; then
43 + if use swaybar; then
44 emesonargs+=("-Dgdk-pixbuf=enabled")
45 else
46 emesonargs+=("-Dgdk-pixbuf=disabled")