commit:     a5742c8160e01f5a2fea086fd1d354e62d799981
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 25 03:04:12 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 31 00:17:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5742c81

gui-wm/sway: [QA] unconditionally install completion files

QA policy [0] says that we don't conditionalise installation of
small files. It's a wasteful rebuild and inconsistent across packages
for when users desire completions to be available.

[0] https://projects.gentoo.org/qa/policy-guide/installed-files.html#pg0301
Signed-off-by: Sam James <sam <AT> gentoo.org>

 gui-wm/sway/{sway-1.6.ebuild => sway-1.6-r1.ebuild}     | 14 +++++++-------
 gui-wm/sway/{sway-1.6.1.ebuild => sway-1.6.1-r1.ebuild} | 14 +++++++-------
 gui-wm/sway/sway-9999.ebuild                            | 14 +++++++-------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/gui-wm/sway/sway-1.6.ebuild b/gui-wm/sway/sway-1.6-r1.ebuild
similarity index 88%
rename from gui-wm/sway/sway-1.6.ebuild
rename to gui-wm/sway/sway-1.6-r1.ebuild
index 2cd639ebc15..9b861ded488 100644
--- a/gui-wm/sway/sway-1.6.ebuild
+++ b/gui-wm/sway/sway-1.6-r1.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock 
+swaymsg +swaynag seatd systemd tray wallpapers X zsh-completion"
+IUSE="elogind +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag 
seatd systemd tray wallpapers X"
 REQUIRED_USE="?? ( elogind systemd )
        tray? ( || ( elogind seatd systemd ) )"
 
@@ -83,16 +83,16 @@ src_configure() {
                -Dtray=$(usex tray enabled disabled)
                -Dxwayland=$(usex X enabled disabled)
                $(meson_use wallpapers default-wallpaper)
-               $(meson_use fish-completion fish-completions)
-               $(meson_use zsh-completion zsh-completions)
-               "-Dbash-completions=true"
-               "-Dwerror=false"
+               -Dfish-completions=true
+               -Dzsh-completions=true
+               -Dbash-completions=true
+               -Dwerror=false
        )
 
        if use swaybar; then
-               emesonargs+=("-Dgdk-pixbuf=enabled")
+               emesonargs+=( -Dgdk-pixbuf=enabled )
        else
-               emesonargs+=("-Dgdk-pixbuf=disabled")
+               emesonargs+=( -Dgdk-pixbuf=disabled )
        fi
 
        meson_src_configure

diff --git a/gui-wm/sway/sway-1.6.1.ebuild b/gui-wm/sway/sway-1.6.1-r1.ebuild
similarity index 86%
rename from gui-wm/sway/sway-1.6.1.ebuild
rename to gui-wm/sway/sway-1.6.1-r1.ebuild
index 9bf7e960777..7373d695f64 100644
--- a/gui-wm/sway/sway-1.6.1.ebuild
+++ b/gui-wm/sway/sway-1.6.1-r1.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg 
+swaynag tray wallpapers X zsh-completion"
+IUSE="+man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag tray 
wallpapers X"
 
 DEPEND="
        >=dev-libs/json-c-0.13:0=
@@ -80,16 +80,16 @@ src_configure() {
                -Dtray=$(usex tray enabled disabled)
                -Dxwayland=$(usex X enabled disabled)
                $(meson_use wallpapers default-wallpaper)
-               $(meson_use fish-completion fish-completions)
-               $(meson_use zsh-completion zsh-completions)
-               "-Dbash-completions=true"
-               "-Dwerror=false"
+               -Dfish-completions=true
+               -Dzsh-completions=true
+               -Dbash-completions=true
+               -Dwerror=false
        )
 
        if use swaybar; then
-               emesonargs+=("-Dgdk-pixbuf=enabled")
+               emesonargs+=( -Dgdk-pixbuf=enabled )
        else
-               emesonargs+=("-Dgdk-pixbuf=disabled")
+               emesonargs+=( -Dgdk-pixbuf=disabled )
        fi
 
        meson_src_configure

diff --git a/gui-wm/sway/sway-9999.ebuild b/gui-wm/sway/sway-9999.ebuild
index c6a53ff0d87..cfaa40e0985 100644
--- a/gui-wm/sway/sway-9999.ebuild
+++ b/gui-wm/sway/sway-9999.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg 
+swaynag tray wallpapers X zsh-completion"
+IUSE="+man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag tray 
wallpapers X"
 
 DEPEND="
        >=dev-libs/json-c-0.13:0=
@@ -80,16 +80,16 @@ src_configure() {
                -Dtray=$(usex tray enabled disabled)
                -Dxwayland=$(usex X enabled disabled)
                $(meson_use wallpapers default-wallpaper)
-               $(meson_use fish-completion fish-completions)
-               $(meson_use zsh-completion zsh-completions)
-               "-Dbash-completions=true"
-               "-Dwerror=false"
+               -Dfish-completions=true
+               -Dzsh-completions=true
+               -Dbash-completions=true
+               -Dwerror=false
        )
 
        if use swaybar; then
-               emesonargs+=("-Dgdk-pixbuf=enabled")
+               emesonargs+=( -Dgdk-pixbuf=enabled )
        else
-               emesonargs+=("-Dgdk-pixbuf=disabled")
+               emesonargs+=( -Dgdk-pixbuf=disabled )
        fi
 
        meson_src_configure

Reply via email to