| 1 |
commit: 10413490854e9f77f765aa1b06528eab9e960de0 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 25 03:04:09 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 31 00:16:49 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10413490 |
| 7 |
|
| 8 |
gui-apps/swaylock: [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-apps/swaylock/metadata.xml | 1 - |
| 18 |
.../swaylock/{swaylock-1.3.ebuild => swaylock-1.3-r1.ebuild} | 11 ++++++----- |
| 19 |
.../swaylock/{swaylock-1.5.ebuild => swaylock-1.5-r1.ebuild} | 9 +++++---- |
| 20 |
gui-apps/swaylock/swaylock-9999.ebuild | 11 ++++++----- |
| 21 |
4 files changed, 17 insertions(+), 15 deletions(-) |
| 22 |
|
| 23 |
diff --git a/gui-apps/swaylock/metadata.xml b/gui-apps/swaylock/metadata.xml |
| 24 |
index f357232b5ed..ee32d0f89da 100644 |
| 25 |
--- a/gui-apps/swaylock/metadata.xml |
| 26 |
+++ b/gui-apps/swaylock/metadata.xml |
| 27 |
@@ -18,7 +18,6 @@ |
| 28 |
Swaylock is the official screen locker for <pkg>gui-wm/sway</pkg>. |
| 29 |
</longdescription> |
| 30 |
<use> |
| 31 |
- <flag name="fish-completion">Enable fish completion support</flag> |
| 32 |
<flag name="gdk-pixbuf">Enable additional image format support via the <pkg>x11-libs/gdk-pixbuf</pkg> library</flag> |
| 33 |
</use> |
| 34 |
<upstream> |
| 35 |
|
| 36 |
diff --git a/gui-apps/swaylock/swaylock-1.3.ebuild b/gui-apps/swaylock/swaylock-1.3-r1.ebuild |
| 37 |
similarity index 81% |
| 38 |
rename from gui-apps/swaylock/swaylock-1.3.ebuild |
| 39 |
rename to gui-apps/swaylock/swaylock-1.3-r1.ebuild |
| 40 |
index 3813578e21a..5f1de9f7b81 100644 |
| 41 |
--- a/gui-apps/swaylock/swaylock-1.3.ebuild |
| 42 |
+++ b/gui-apps/swaylock/swaylock-1.3-r1.ebuild |
| 43 |
@@ -1,4 +1,4 @@ |
| 44 |
-# Copyright 1999-2019 Gentoo Authors |
| 45 |
+# Copyright 1999-2021 Gentoo Authors |
| 46 |
# Distributed under the terms of the GNU General Public License v2 |
| 47 |
|
| 48 |
EAPI=7 |
| 49 |
@@ -18,7 +18,7 @@ fi |
| 50 |
|
| 51 |
LICENSE="MIT" |
| 52 |
SLOT="0" |
| 53 |
-IUSE="fish-completion +gdk-pixbuf +man +pam zsh-completion" |
| 54 |
+IUSE="+gdk-pixbuf +man +pam" |
| 55 |
|
| 56 |
DEPEND=" |
| 57 |
dev-libs/wayland |
| 58 |
@@ -42,13 +42,14 @@ src_configure() { |
| 59 |
-Dman-pages=$(usex man enabled disabled) |
| 60 |
-Dpam=$(usex pam enabled disabled) |
| 61 |
-Dgdk-pixbuf=$(usex gdk-pixbuf enabled disabled) |
| 62 |
- $(meson_use fish-completion fish-completions) |
| 63 |
- $(meson_use zsh-completion zsh-completions) |
| 64 |
+ "-Dfish-completions=true" |
| 65 |
+ "-Dzsh-completions=true" |
| 66 |
"-Dbash-completions=true" |
| 67 |
"-Dwerror=false" |
| 68 |
) |
| 69 |
+ |
| 70 |
if [[ ${PV} != 9999 ]]; then |
| 71 |
- emesonargs+=("-Dswaylock-version=${PV}") |
| 72 |
+ emesonargs+=( "-Dswaylock-version=${PV}" ) |
| 73 |
fi |
| 74 |
|
| 75 |
meson_src_configure |
| 76 |
|
| 77 |
diff --git a/gui-apps/swaylock/swaylock-1.5.ebuild b/gui-apps/swaylock/swaylock-1.5-r1.ebuild |
| 78 |
similarity index 84% |
| 79 |
rename from gui-apps/swaylock/swaylock-1.5.ebuild |
| 80 |
rename to gui-apps/swaylock/swaylock-1.5-r1.ebuild |
| 81 |
index d37597d6ded..c3e2e1fccdc 100644 |
| 82 |
--- a/gui-apps/swaylock/swaylock-1.5.ebuild |
| 83 |
+++ b/gui-apps/swaylock/swaylock-1.5-r1.ebuild |
| 84 |
@@ -18,7 +18,7 @@ fi |
| 85 |
|
| 86 |
LICENSE="MIT" |
| 87 |
SLOT="0" |
| 88 |
-IUSE="fish-completion +gdk-pixbuf +man +pam zsh-completion" |
| 89 |
+IUSE="+gdk-pixbuf +man +pam" |
| 90 |
|
| 91 |
DEPEND=" |
| 92 |
dev-libs/wayland |
| 93 |
@@ -39,13 +39,14 @@ src_configure() { |
| 94 |
-Dman-pages=$(usex man enabled disabled) |
| 95 |
-Dpam=$(usex pam enabled disabled) |
| 96 |
-Dgdk-pixbuf=$(usex gdk-pixbuf enabled disabled) |
| 97 |
- $(meson_use fish-completion fish-completions) |
| 98 |
- $(meson_use zsh-completion zsh-completions) |
| 99 |
+ "-Dfish-completions=true" |
| 100 |
+ "-Dzsh-completions=true" |
| 101 |
"-Dbash-completions=true" |
| 102 |
"-Dwerror=false" |
| 103 |
) |
| 104 |
+ |
| 105 |
if [[ ${PV} != 9999 ]]; then |
| 106 |
- emesonargs+=("-Dswaylock-version=${PV}") |
| 107 |
+ emesonargs+=( "-Dswaylock-version=${PV}" ) |
| 108 |
fi |
| 109 |
|
| 110 |
meson_src_configure |
| 111 |
|
| 112 |
diff --git a/gui-apps/swaylock/swaylock-9999.ebuild b/gui-apps/swaylock/swaylock-9999.ebuild |
| 113 |
index 1775122395b..68f84c85db2 100644 |
| 114 |
--- a/gui-apps/swaylock/swaylock-9999.ebuild |
| 115 |
+++ b/gui-apps/swaylock/swaylock-9999.ebuild |
| 116 |
@@ -1,4 +1,4 @@ |
| 117 |
-# Copyright 1999-2020 Gentoo Authors |
| 118 |
+# Copyright 1999-2021 Gentoo Authors |
| 119 |
# Distributed under the terms of the GNU General Public License v2 |
| 120 |
|
| 121 |
EAPI=7 |
| 122 |
@@ -18,7 +18,7 @@ fi |
| 123 |
|
| 124 |
LICENSE="MIT" |
| 125 |
SLOT="0" |
| 126 |
-IUSE="fish-completion +gdk-pixbuf +man +pam zsh-completion" |
| 127 |
+IUSE="+gdk-pixbuf +man +pam" |
| 128 |
|
| 129 |
DEPEND=" |
| 130 |
dev-libs/wayland |
| 131 |
@@ -39,13 +39,14 @@ src_configure() { |
| 132 |
-Dman-pages=$(usex man enabled disabled) |
| 133 |
-Dpam=$(usex pam enabled disabled) |
| 134 |
-Dgdk-pixbuf=$(usex gdk-pixbuf enabled disabled) |
| 135 |
- $(meson_use fish-completion fish-completions) |
| 136 |
- $(meson_use zsh-completion zsh-completions) |
| 137 |
+ "-Dfish-completions=true" |
| 138 |
+ "-Dzsh-completions=true" |
| 139 |
"-Dbash-completions=true" |
| 140 |
"-Dwerror=false" |
| 141 |
) |
| 142 |
+ |
| 143 |
if [[ ${PV} != 9999 ]]; then |
| 144 |
- emesonargs+=("-Dswaylock-version=${PV}") |
| 145 |
+ emesonargs+=( "-Dswaylock-version=${PV}" ) |
| 146 |
fi |
| 147 |
|
| 148 |
meson_src_configure |
Archives