Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: gui-apps/swayidle/
Date: Sat, 31 Jul 2021 00:18:42
Message-Id: 1627690619.f13835cb87bdbf99bb75c37024739e339049c15d.sam@gentoo
1 commit: f13835cb87bdbf99bb75c37024739e339049c15d
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 25 03:04:10 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 31 00:16:59 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f13835cb
7
8 gui-apps/swayidle: [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/swayidle/metadata.xml | 1 -
18 gui-apps/swayidle/swayidle-1.6.ebuild | 7 ++++---
19 gui-apps/swayidle/swayidle-9999.ebuild | 8 ++++----
20 3 files changed, 8 insertions(+), 8 deletions(-)
21
22 diff --git a/gui-apps/swayidle/metadata.xml b/gui-apps/swayidle/metadata.xml
23 index 91ff1890bc1..4c7034b2aaf 100644
24 --- a/gui-apps/swayidle/metadata.xml
25 +++ b/gui-apps/swayidle/metadata.xml
26 @@ -15,7 +15,6 @@
27 </longdescription>
28 <use>
29 <flag name="elogind">Enable support for rootless session via elogind</flag>
30 - <flag name="fish-completion">Enable fish completion support</flag>
31 </use>
32 <upstream>
33 <remote-id type="github">swaywm/swayidle</remote-id>
34
35 diff --git a/gui-apps/swayidle/swayidle-1.6.ebuild b/gui-apps/swayidle/swayidle-1.6.ebuild
36 index ae2ed9985b4..94194af2e4a 100644
37 --- a/gui-apps/swayidle/swayidle-1.6.ebuild
38 +++ b/gui-apps/swayidle/swayidle-1.6.ebuild
39 @@ -18,7 +18,7 @@ fi
40
41 LICENSE="MIT"
42 SLOT="0"
43 -IUSE="elogind fish-completion +man systemd zsh-completion"
44 +IUSE="elogind +man systemd"
45 REQUIRED_USE="?? ( elogind systemd )"
46
47 DEPEND="
48 @@ -36,11 +36,12 @@ BDEPEND="
49 src_configure() {
50 local emesonargs=(
51 -Dman-pages=$(usex man enabled disabled)
52 - $(meson_use fish-completion fish-completions)
53 - $(meson_use zsh-completion zsh-completions)
54 + "-Dfish-completions=true"
55 + "-Dzsh-completions=true"
56 "-Dbash-completions=true"
57 "-Dwerror=false"
58 )
59 +
60 if use systemd; then
61 emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=systemd")
62 elif use elogind; then
63
64 diff --git a/gui-apps/swayidle/swayidle-9999.ebuild b/gui-apps/swayidle/swayidle-9999.ebuild
65 index 8604bda5510..f6abc2bf723 100644
66 --- a/gui-apps/swayidle/swayidle-9999.ebuild
67 +++ b/gui-apps/swayidle/swayidle-9999.ebuild
68 @@ -1,4 +1,4 @@
69 -# Copyright 1999-2020 Gentoo Authors
70 +# Copyright 1999-2021 Gentoo Authors
71 # Distributed under the terms of the GNU General Public License v2
72
73 EAPI=7
74 @@ -18,7 +18,7 @@ fi
75
76 LICENSE="MIT"
77 SLOT="0"
78 -IUSE="elogind fish-completion +man systemd zsh-completion"
79 +IUSE="elogind +man systemd"
80 REQUIRED_USE="?? ( elogind systemd )"
81
82 DEPEND="
83 @@ -36,8 +36,8 @@ BDEPEND="
84 src_configure() {
85 local emesonargs=(
86 -Dman-pages=$(usex man enabled disabled)
87 - $(meson_use fish-completion fish-completions)
88 - $(meson_use zsh-completion zsh-completions)
89 + "-Dfish-completions=true"
90 + "-Dzsh-completions=true"
91 "-Dbash-completions=true"
92 "-Dwerror=false"
93 )