| 1 |
commit: a5742c8160e01f5a2fea086fd1d354e62d799981 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 25 03:04:12 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 31 00:17:12 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5742c81 |
| 7 |
|
| 8 |
gui-wm/sway: [QA] unconditionally install completion files |
| 9 |
|
| 10 |
QA policy [0] says that we don't conditionalise installation of |
| 11 |
small files. It's a wasteful rebuild and inconsistent across packages |
| 12 |
for when users desire completions to be available. |
| 13 |
|
| 14 |
[0] https://projects.gentoo.org/qa/policy-guide/installed-files.html#pg0301 |
| 15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 16 |
|
| 17 |
gui-wm/sway/{sway-1.6.ebuild => sway-1.6-r1.ebuild} | 14 +++++++------- |
| 18 |
gui-wm/sway/{sway-1.6.1.ebuild => sway-1.6.1-r1.ebuild} | 14 +++++++------- |
| 19 |
gui-wm/sway/sway-9999.ebuild | 14 +++++++------- |
| 20 |
3 files changed, 21 insertions(+), 21 deletions(-) |
| 21 |
|
| 22 |
diff --git a/gui-wm/sway/sway-1.6.ebuild b/gui-wm/sway/sway-1.6-r1.ebuild |
| 23 |
similarity index 88% |
| 24 |
rename from gui-wm/sway/sway-1.6.ebuild |
| 25 |
rename to gui-wm/sway/sway-1.6-r1.ebuild |
| 26 |
index 2cd639ebc15..9b861ded488 100644 |
| 27 |
--- a/gui-wm/sway/sway-1.6.ebuild |
| 28 |
+++ b/gui-wm/sway/sway-1.6-r1.ebuild |
| 29 |
@@ -20,7 +20,7 @@ fi |
| 30 |
|
| 31 |
LICENSE="MIT" |
| 32 |
SLOT="0" |
| 33 |
-IUSE="elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag seatd systemd tray wallpapers X zsh-completion" |
| 34 |
+IUSE="elogind +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag seatd systemd tray wallpapers X" |
| 35 |
REQUIRED_USE="?? ( elogind systemd ) |
| 36 |
tray? ( || ( elogind seatd systemd ) )" |
| 37 |
|
| 38 |
@@ -83,16 +83,16 @@ src_configure() { |
| 39 |
-Dtray=$(usex tray enabled disabled) |
| 40 |
-Dxwayland=$(usex X enabled disabled) |
| 41 |
$(meson_use wallpapers default-wallpaper) |
| 42 |
- $(meson_use fish-completion fish-completions) |
| 43 |
- $(meson_use zsh-completion zsh-completions) |
| 44 |
- "-Dbash-completions=true" |
| 45 |
- "-Dwerror=false" |
| 46 |
+ -Dfish-completions=true |
| 47 |
+ -Dzsh-completions=true |
| 48 |
+ -Dbash-completions=true |
| 49 |
+ -Dwerror=false |
| 50 |
) |
| 51 |
|
| 52 |
if use swaybar; then |
| 53 |
- emesonargs+=("-Dgdk-pixbuf=enabled") |
| 54 |
+ emesonargs+=( -Dgdk-pixbuf=enabled ) |
| 55 |
else |
| 56 |
- emesonargs+=("-Dgdk-pixbuf=disabled") |
| 57 |
+ emesonargs+=( -Dgdk-pixbuf=disabled ) |
| 58 |
fi |
| 59 |
|
| 60 |
meson_src_configure |
| 61 |
|
| 62 |
diff --git a/gui-wm/sway/sway-1.6.1.ebuild b/gui-wm/sway/sway-1.6.1-r1.ebuild |
| 63 |
similarity index 86% |
| 64 |
rename from gui-wm/sway/sway-1.6.1.ebuild |
| 65 |
rename to gui-wm/sway/sway-1.6.1-r1.ebuild |
| 66 |
index 9bf7e960777..7373d695f64 100644 |
| 67 |
--- a/gui-wm/sway/sway-1.6.1.ebuild |
| 68 |
+++ b/gui-wm/sway/sway-1.6.1-r1.ebuild |
| 69 |
@@ -20,7 +20,7 @@ fi |
| 70 |
|
| 71 |
LICENSE="MIT" |
| 72 |
SLOT="0" |
| 73 |
-IUSE="fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag tray wallpapers X zsh-completion" |
| 74 |
+IUSE="+man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag tray wallpapers X" |
| 75 |
|
| 76 |
DEPEND=" |
| 77 |
>=dev-libs/json-c-0.13:0= |
| 78 |
@@ -80,16 +80,16 @@ src_configure() { |
| 79 |
-Dtray=$(usex tray enabled disabled) |
| 80 |
-Dxwayland=$(usex X enabled disabled) |
| 81 |
$(meson_use wallpapers default-wallpaper) |
| 82 |
- $(meson_use fish-completion fish-completions) |
| 83 |
- $(meson_use zsh-completion zsh-completions) |
| 84 |
- "-Dbash-completions=true" |
| 85 |
- "-Dwerror=false" |
| 86 |
+ -Dfish-completions=true |
| 87 |
+ -Dzsh-completions=true |
| 88 |
+ -Dbash-completions=true |
| 89 |
+ -Dwerror=false |
| 90 |
) |
| 91 |
|
| 92 |
if use swaybar; then |
| 93 |
- emesonargs+=("-Dgdk-pixbuf=enabled") |
| 94 |
+ emesonargs+=( -Dgdk-pixbuf=enabled ) |
| 95 |
else |
| 96 |
- emesonargs+=("-Dgdk-pixbuf=disabled") |
| 97 |
+ emesonargs+=( -Dgdk-pixbuf=disabled ) |
| 98 |
fi |
| 99 |
|
| 100 |
meson_src_configure |
| 101 |
|
| 102 |
diff --git a/gui-wm/sway/sway-9999.ebuild b/gui-wm/sway/sway-9999.ebuild |
| 103 |
index c6a53ff0d87..cfaa40e0985 100644 |
| 104 |
--- a/gui-wm/sway/sway-9999.ebuild |
| 105 |
+++ b/gui-wm/sway/sway-9999.ebuild |
| 106 |
@@ -20,7 +20,7 @@ fi |
| 107 |
|
| 108 |
LICENSE="MIT" |
| 109 |
SLOT="0" |
| 110 |
-IUSE="fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag tray wallpapers X zsh-completion" |
| 111 |
+IUSE="+man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag tray wallpapers X" |
| 112 |
|
| 113 |
DEPEND=" |
| 114 |
>=dev-libs/json-c-0.13:0= |
| 115 |
@@ -80,16 +80,16 @@ src_configure() { |
| 116 |
-Dtray=$(usex tray enabled disabled) |
| 117 |
-Dxwayland=$(usex X enabled disabled) |
| 118 |
$(meson_use wallpapers default-wallpaper) |
| 119 |
- $(meson_use fish-completion fish-completions) |
| 120 |
- $(meson_use zsh-completion zsh-completions) |
| 121 |
- "-Dbash-completions=true" |
| 122 |
- "-Dwerror=false" |
| 123 |
+ -Dfish-completions=true |
| 124 |
+ -Dzsh-completions=true |
| 125 |
+ -Dbash-completions=true |
| 126 |
+ -Dwerror=false |
| 127 |
) |
| 128 |
|
| 129 |
if use swaybar; then |
| 130 |
- emesonargs+=("-Dgdk-pixbuf=enabled") |
| 131 |
+ emesonargs+=( -Dgdk-pixbuf=enabled ) |
| 132 |
else |
| 133 |
- emesonargs+=("-Dgdk-pixbuf=disabled") |
| 134 |
+ emesonargs+=( -Dgdk-pixbuf=disabled ) |
| 135 |
fi |
| 136 |
|
| 137 |
meson_src_configure |
Archives