summaryrefslogtreecommitdiff
path: root/gui-wm
diff options
context:
space:
mode:
authorMatthew Thode <prometheanfire@gentoo.org>2021-10-11 10:24:15 -0500
committerMatthew Thode <prometheanfire@gentoo.org>2021-10-11 10:24:24 -0500
commita93deaf82ad074df0b6703680bde622164c88d77 (patch)
tree0cf36e04837fd3b3d24f5092f0780f1f2ba04be3 /gui-wm
parentgui-libs/wlroots: update deps on 9999 (diff)
downloadgentoo-a93deaf82ad074df0b6703680bde622164c88d77.tar.gz
gentoo-a93deaf82ad074df0b6703680bde622164c88d77.tar.bz2
gentoo-a93deaf82ad074df0b6703680bde622164c88d77.zip
gui-wm/sway: update deps, use more meson eclass functions
Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Matthew Thode <prometheanfire@gentoo.org>
Diffstat (limited to 'gui-wm')
-rw-r--r--gui-wm/sway/sway-9999.ebuild32
1 files changed, 9 insertions, 23 deletions
diff --git a/gui-wm/sway/sway-9999.ebuild b/gui-wm/sway/sway-9999.ebuild
index cfaa40e09859..799f71a6a9dc 100644
--- a/gui-wm/sway/sway-9999.ebuild
+++ b/gui-wm/sway/sway-9999.ebuild
@@ -44,8 +44,8 @@ if [[ ${PV} == 9999 ]]; then
DEPEND+="~gui-libs/wlroots-9999:=[X=]"
else
DEPEND+="
- >=gui-libs/wlroots-0.14:=[X=]
- <gui-libs/wlroots-0.15:=[X=]
+ >=gui-libs/wlroots-0.15:=[X=]
+ <gui-libs/wlroots-0.16:=[X=]
"
fi
RDEPEND="
@@ -54,7 +54,7 @@ RDEPEND="
"
BDEPEND="
>=dev-libs/wayland-protocols-1.14
- >=dev-util/meson-0.53.0
+ >=dev-util/meson-0.59.0
virtual/pkgconfig
"
if [[ ${PV} == 9999 ]]; then
@@ -63,22 +63,14 @@ else
BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )"
fi
-src_prepare() {
- default
-
- use swaybar || sed -e "s/subdir('swaybar')//g" -e "/sway-bar.[0-9].scd/d" \
- -e "/completions\/[a-z]\+\/_\?swaybar/d" -i meson.build || die
- use swaymsg || sed -e "s/subdir('swaymsg')//g" -e "/swaymsg.[0-9].scd/d" \
- -e "/completions\/[a-z]\+\/_\?swaymsg/d" -i meson.build || die
- use swaynag || sed -e "s/subdir('swaynag')//g" -e "/swaynag.[0-9].scd/d" \
- -e "/completions\/[a-z]\+\/_\?swaynag/d" -i meson.build || die
-}
-
src_configure() {
local emesonargs=(
- -Dman-pages=$(usex man enabled disabled)
- -Dtray=$(usex tray enabled disabled)
- -Dxwayland=$(usex X enabled disabled)
+ $(meson_feature man man-pages)
+ $(meson_feature tray)
+ $(meson_feature X xwayland)
+ $(meson_feature swaybar gdk-pixbuf)
+ $(meson_use swaynag)
+ $(meson_use swaybar)
$(meson_use wallpapers default-wallpaper)
-Dfish-completions=true
-Dzsh-completions=true
@@ -86,11 +78,5 @@ src_configure() {
-Dwerror=false
)
- if use swaybar; then
- emesonargs+=( -Dgdk-pixbuf=enabled )
- else
- emesonargs+=( -Dgdk-pixbuf=disabled )
- fi
-
meson_src_configure
}