From 2c94ad560187ec2a882d9d5805a396e0919e93de Mon Sep 17 00:00:00 2001
From: Marek Szuba <marecki@gentoo.org>
Date: Fri, 24 Apr 2020 15:22:56 +0100
Subject: sys-cluster/singularity: do not install bash-completion rules

Singularity installs them into the compatibility directory
(/etc/bash_completions.d), moreover they might be automatically generated
but they are still badly broken (confirmed to affect quite a few
commands which have got nothing to do with singularity).

With apologies to everyone who will end up emerge a revbump just to get
rid of a single shell file.

Signed-off-by: Marek Szuba <marecki@gentoo.org>
---
 .../singularity/singularity-3.5.3-r1.ebuild        | 69 ++++++++++++++++++++++
 sys-cluster/singularity/singularity-3.5.3.ebuild   | 59 ------------------
 2 files changed, 69 insertions(+), 59 deletions(-)
 create mode 100644 sys-cluster/singularity/singularity-3.5.3-r1.ebuild
 delete mode 100644 sys-cluster/singularity/singularity-3.5.3.ebuild

diff --git a/sys-cluster/singularity/singularity-3.5.3-r1.ebuild b/sys-cluster/singularity/singularity-3.5.3-r1.ebuild
new file mode 100644
index 000000000000..16834ae083a3
--- /dev/null
+++ b/sys-cluster/singularity/singularity-3.5.3-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info
+
+DESCRIPTION="Application containers for Linux"
+HOMEPAGE="https://sylabs.io"
+SRC_URI="https://github.com/sylabs/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples +network +suid"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+COMMON="sys-libs/libseccomp"
+BDEPEND="virtual/pkgconfig"
+DEPEND="${COMMON}
+	>=dev-lang/go-1.13.0
+	app-crypt/gpgme
+	dev-libs/openssl
+	sys-apps/util-linux
+	sys-fs/cryptsetup"
+RDEPEND="${COMMON}
+	sys-fs/squashfs-tools"
+
+CONFIG_CHECK="~SQUASHFS"
+
+S=${WORKDIR}/${PN}
+
+src_configure() {
+	local myconfargs=(
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--runstatedir=/run \
+		--localstatedir=/var \
+		$(usex network "" "--without-network") \
+		$(usex suid "" "--without-suid")
+	)
+	./mconfig -v ${myconfargs[@]} || die "Error invoking mconfig"
+}
+
+src_compile() {
+	emake -C builddir
+}
+
+src_install() {
+	emake DESTDIR="${ED}" -C builddir install
+	keepdir /var/singularity/mnt/session
+
+	# As of version 3.5.3 this seems to be very much broken, affecting
+	# commands which have got nothing to do with singularity (example:
+	# completion on 'udisks mount -b /dev/' rejects all files from that
+	# directory other than 'autofs'). Moreover, this should go into
+	# $(get_bashcompdir) (from bash-completion-r1.eclass) rather than /etc.
+	# Hopefully temporary, which is why we delete this at install time
+	# instead of patching build scripts not to generate bash-completion
+	# data in the first place.
+	rm -rf "${ED}"/etc/bash_completion.d || die
+
+	dodoc README.md CONTRIBUTORS.md CONTRIBUTING.md
+	if use examples; then
+		dodoc -r examples
+	fi
+}
diff --git a/sys-cluster/singularity/singularity-3.5.3.ebuild b/sys-cluster/singularity/singularity-3.5.3.ebuild
deleted file mode 100644
index 2a51a4074fcd..000000000000
--- a/sys-cluster/singularity/singularity-3.5.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info
-
-DESCRIPTION="Application containers for Linux"
-HOMEPAGE="https://sylabs.io"
-SRC_URI="https://github.com/sylabs/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples +network +suid"
-
-# Do not complain about CFLAGS etc since go projects do not use them.
-QA_FLAGS_IGNORED='.*'
-
-COMMON="sys-libs/libseccomp"
-BDEPEND="virtual/pkgconfig"
-DEPEND="${COMMON}
-	>=dev-lang/go-1.13.0
-	app-crypt/gpgme
-	dev-libs/openssl
-	sys-apps/util-linux
-	sys-fs/cryptsetup"
-RDEPEND="${COMMON}
-	sys-fs/squashfs-tools"
-
-CONFIG_CHECK="~SQUASHFS"
-
-S=${WORKDIR}/${PN}
-
-src_configure() {
-	local myconfargs=(
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--runstatedir=/run \
-		--localstatedir=/var \
-		$(usex network "" "--without-network") \
-		$(usex suid "" "--without-suid")
-	)
-	./mconfig -v ${myconfargs[@]} || die "Error invoking mconfig"
-}
-
-src_compile() {
-	emake -C builddir
-}
-
-src_install() {
-	emake DESTDIR="${ED}" -C builddir install
-	keepdir /var/singularity/mnt/session
-
-	dodoc README.md CONTRIBUTORS.md CONTRIBUTING.md
-	if use examples; then
-		dodoc -r examples
-	fi
-}
-- 
cgit v1.2.3-65-gdbad