gentoo resync : 20.03.2022

4 files changed, 79 insertions, 6 deletions

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index 4b904b688184..933ee1a7ba0b 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,3 +1,5 @@
 DIST singularity-3.8.5.tar.gz 7898598 BLAKE2B 3cf76734d6208340d8562f3d3d67f95c507bad3fad6797d82aed39aa39288385ca02d62854f3dddcfc1a1e3056e7485f27e6081c152b853c682ca8e3a587cf3a SHA512 857761f47528a841a3cf11b49583ab7e8a2d137703e1826ff194011abba3334ed06859219e0c457f352304e7b18f1c493a8b337cc5df67981eb428c567d0ac5f
-EBUILD singularity-3.8.5.ebuild 1954 BLAKE2B c87719797e947055428f8544f08bc5833f182fbd9292a36118a11481677f2adbb4ec48f673c2403cfa82e4f0f20a32f6f2b212e8e094ea7b242e33147f311fc9 SHA512 c3088021d35cff3c18e2c0d78dcd75ce5038475e0bfef1428c18855c60ac768dbf7d87d17d3d49426e05373c1a2e8748239135012db45255168d069886d09ab1
-MISC metadata.xml 452 BLAKE2B 5b210e6e78898e3bd858298ec713422552846c5b89c28af42df7d3ccba7935abcacb0a0c190580016c24b311e9dab2804e46337a0ad9cc1de438ae100f1fc512 SHA512 17b00ea10ebd8b196a7c7f5e42d9ea693ae8dfa2749b65612f07b11ba88552223e6c1a5bfad774fdbf97fb399ac71a8dd0637c4f74344cf22cba76dfce4598bf
+DIST singularity-3.8.6.tar.gz 8183514 BLAKE2B be82b610c2a6647b4d74894e4095b1b58499ea00d9a7b491cdc1aa1b097e5d27bc8f8c43f9898ce1ea7b1866ce5734a6b487a17ac8081dfb89441c92bc2de343 SHA512 dd20a083505503d274d075574c4efaa4e59829d751d4836a7ba9095b9e88c3ce83e2203a194ede42e2c3dba22ed16546f97d980e7ba05021b94ec3dfa6ee309f
+EBUILD singularity-3.8.5.ebuild 1981 BLAKE2B 142b49af9107f82191cdd9f6d30aa5fc91b80b99f7c02a143d4a3034383c3e8267440ffd63e798d858b0d9fc492119af69a92c31a526fd5abe68caa90374c527 SHA512 bbd5b496bced3218e409e056d461bb391fb241c91b4e9d4e428a52ee532cec84e60c26125d263950282ea2214e582765032d6b68f94dbebbde3033eeead65b5e
+EBUILD singularity-3.8.6.ebuild 1984 BLAKE2B 9b1a71926424aa983d88123913d47fd68632fe27b74c2604ce2b5bf37364c5c710670ed52cb1ab36c2539fe486fbc332b6787188bf8e149ef295b987c144c547 SHA512 1eb73f16c727bdee5ea16a23b8b10108df7bf1ff6419b05c596e3b18ad6e045ad415fc18c2c0e0b6108c848d202049ba997b5860c132642300db5fc5f3604817
+MISC metadata.xml 456 BLAKE2B 2fe2e6f15b6998b662296caafe976db4472e553ca93d2de2c3703bbbec545f2ca28c04cd5b794563b79726f34341d57c11e1b46481ccfb3d0d499a68c7ba46d8 SHA512 d3162fb561bee3e34423fa42256cb6247b1a9e398d8c9675939991e88fd3ba02baa5dfab21045dfcab30489cb0509e42637bcbd62a8483b08025904a6c2a8dbd
diff --git a/sys-cluster/singularity/metadata.xml b/sys-cluster/singularity/metadata.xml
index 756112394b65..3c7e20e8fc7a 100644
--- a/sys-cluster/singularity/metadata.xml
+++ b/sys-cluster/singularity/metadata.xml
@@ -10,6 +10,6 @@
 		<flag name="suid">Install SUID helper binary</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">hpcng/singularity</remote-id>
+		<remote-id type="github">apptainer/singularity</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-cluster/singularity/singularity-3.8.5.ebuild b/sys-cluster/singularity/singularity-3.8.5.ebuild
index cc6fc804f1fb..0ecdfaee462b 100644
--- a/sys-cluster/singularity/singularity-3.8.5.ebuild
+++ b/sys-cluster/singularity/singularity-3.8.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,8 +6,8 @@ EAPI=8
 inherit linux-info toolchain-funcs
 
 DESCRIPTION="Application containers for Linux"
-HOMEPAGE="https://sylabs.io"
-SRC_URI="https://github.com/hpcng/${PN}/releases/download/v${PV}/${P}.tar.gz"
+HOMEPAGE="https://github.com/apptainer/singularity"
+SRC_URI="https://github.com/apptainer/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
diff --git a/sys-cluster/singularity/singularity-3.8.6.ebuild b/sys-cluster/singularity/singularity-3.8.6.ebuild
new file mode 100644
index 000000000000..382b76747883
--- /dev/null
+++ b/sys-cluster/singularity/singularity-3.8.6.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info toolchain-funcs
+
+DESCRIPTION="Application containers for Linux"
+HOMEPAGE="https://github.com/apptainer/singularity"
+SRC_URI="https://github.com/apptainer/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~riscv ~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.16.12
+	app-crypt/gpgme
+	dev-libs/openssl
+	sys-apps/util-linux
+	sys-fs/cryptsetup"
+RDEPEND="${COMMON}
+	sys-fs/squashfs-tools"
+
+CONFIG_CHECK="~SQUASHFS"
+
+src_configure() {
+	local myconfargs=(
+		-c "$(tc-getBUILD_CC)" \
+		-x "$(tc-getBUILD_CXX)" \
+		-C "$(tc-getCC)" \
+		-X "$(tc-getCXX)" \
+		--prefix="${EPREFIX}"/usr \
+		--sysconfdir="${EPREFIX}"/etc \
+		--runstatedir="${EPREFIX}"/run \
+		--localstatedir="${EPREFIX}"/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="${D}" -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
+}