Gentoo Archives: gentoo-commits

From: Marek Szuba <marecki@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/
Date: Fri, 24 Apr 2020 14:25:58
Message-Id: 1587738342.2c94ad560187ec2a882d9d5805a396e0919e93de.marecki@gentoo
1 commit: 2c94ad560187ec2a882d9d5805a396e0919e93de
2 Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 24 14:22:56 2020 +0000
4 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 24 14:25:42 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c94ad56
7
8 sys-cluster/singularity: do not install bash-completion rules
9
10 Singularity installs them into the compatibility directory
11 (/etc/bash_completions.d), moreover they might be automatically generated
12 but they are still badly broken (confirmed to affect quite a few
13 commands which have got nothing to do with singularity).
14
15 With apologies to everyone who will end up emerge a revbump just to get
16 rid of a single shell file.
17
18 Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
19
20 .../{singularity-3.5.3.ebuild => singularity-3.5.3-r1.ebuild} | 10 ++++++++++
21 1 file changed, 10 insertions(+)
22
23 diff --git a/sys-cluster/singularity/singularity-3.5.3.ebuild b/sys-cluster/singularity/singularity-3.5.3-r1.ebuild
24 similarity index 69%
25 rename from sys-cluster/singularity/singularity-3.5.3.ebuild
26 rename to sys-cluster/singularity/singularity-3.5.3-r1.ebuild
27 index 2a51a4074fc..16834ae083a 100644
28 --- a/sys-cluster/singularity/singularity-3.5.3.ebuild
29 +++ b/sys-cluster/singularity/singularity-3.5.3-r1.ebuild
30 @@ -52,6 +52,16 @@ src_install() {
31 emake DESTDIR="${ED}" -C builddir install
32 keepdir /var/singularity/mnt/session
33
34 + # As of version 3.5.3 this seems to be very much broken, affecting
35 + # commands which have got nothing to do with singularity (example:
36 + # completion on 'udisks mount -b /dev/' rejects all files from that
37 + # directory other than 'autofs'). Moreover, this should go into
38 + # $(get_bashcompdir) (from bash-completion-r1.eclass) rather than /etc.
39 + # Hopefully temporary, which is why we delete this at install time
40 + # instead of patching build scripts not to generate bash-completion
41 + # data in the first place.
42 + rm -rf "${ED}"/etc/bash_completion.d || die
43 +
44 dodoc README.md CONTRIBUTORS.md CONTRIBUTING.md
45 if use examples; then
46 dodoc -r examples