[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2022-04-14 Thread Marek Szuba
commit: 53411b44a5f6c3e79248c20eb2d9bbea3b709749
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Apr 14 09:52:25 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Apr 14 09:52:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53411b44

sys-cluster/singularity: drop 3.8.5

Signed-off-by: Marek Szuba  gentoo.org>

 sys-cluster/singularity/Manifest |  1 -
 sys-cluster/singularity/singularity-3.8.5.ebuild | 71 
 2 files changed, 72 deletions(-)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index 0632e57fb18f..f3dad2760ccf 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,2 +1 @@
-DIST singularity-3.8.5.tar.gz 7898598 BLAKE2B 
3cf76734d6208340d8562f3d3d67f95c507bad3fad6797d82aed39aa39288385ca02d62854f3dddcfc1a1e3056e7485f27e6081c152b853c682ca8e3a587cf3a
 SHA512 
857761f47528a841a3cf11b49583ab7e8a2d137703e1826ff194011abba3334ed06859219e0c457f352304e7b18f1c493a8b337cc5df67981eb428c567d0ac5f
 DIST singularity-3.8.7.tar.gz 8185470 BLAKE2B 
afa1b0b5b3096e0f3634ce7b61bc19a9d5435a213e241220d2fb19cdb65e93b05e4d8a27db89eeaed6af6b4ab5e09a8914d21a3ff0be88a7c6c8d6245dce9e30
 SHA512 
5649264c15414b90bab47d1958ec61681fa0b9e37ee445a5059f78f3d822aa27f5b9c5c4f4010d053ec9d03e0215c67e2de8e315f74de7d3cd16b8399f40ee59

diff --git a/sys-cluster/singularity/singularity-3.8.5.ebuild 
b/sys-cluster/singularity/singularity-3.8.5.ebuild
deleted file mode 100644
index 0ecdfaee462b..
--- a/sys-cluster/singularity/singularity-3.8.5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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.0
-   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
-}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2022-03-20 Thread Marek Szuba
commit: 59255aa0999190e424ed969ffeeeb430a3caf3e7
Author: Marek Szuba  gentoo  org>
AuthorDate: Sun Mar 20 22:00:08 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sun Mar 20 22:42:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59255aa0

sys-cluster/singularity: add 3.8.7, drop 3.8.6

Technically deprecated by app-containers/apptainer but upstream HAS just
released another version.

Signed-off-by: Marek Szuba  gentoo.org>

 sys-cluster/singularity/Manifest   | 2 +-
 .../singularity/{singularity-3.8.6.ebuild => singularity-3.8.7.ebuild} | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index c72ec8d05d74..0632e57fb18f 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,2 +1,2 @@
 DIST singularity-3.8.5.tar.gz 7898598 BLAKE2B 
3cf76734d6208340d8562f3d3d67f95c507bad3fad6797d82aed39aa39288385ca02d62854f3dddcfc1a1e3056e7485f27e6081c152b853c682ca8e3a587cf3a
 SHA512 
857761f47528a841a3cf11b49583ab7e8a2d137703e1826ff194011abba3334ed06859219e0c457f352304e7b18f1c493a8b337cc5df67981eb428c567d0ac5f
-DIST singularity-3.8.6.tar.gz 8183514 BLAKE2B 
be82b610c2a6647b4d74894e4095b1b58499ea00d9a7b491cdc1aa1b097e5d27bc8f8c43f9898ce1ea7b1866ce5734a6b487a17ac8081dfb89441c92bc2de343
 SHA512 
dd20a083505503d274d075574c4efaa4e59829d751d4836a7ba9095b9e88c3ce83e2203a194ede42e2c3dba22ed16546f97d980e7ba05021b94ec3dfa6ee309f
+DIST singularity-3.8.7.tar.gz 8185470 BLAKE2B 
afa1b0b5b3096e0f3634ce7b61bc19a9d5435a213e241220d2fb19cdb65e93b05e4d8a27db89eeaed6af6b4ab5e09a8914d21a3ff0be88a7c6c8d6245dce9e30
 SHA512 
5649264c15414b90bab47d1958ec61681fa0b9e37ee445a5059f78f3d822aa27f5b9c5c4f4010d053ec9d03e0215c67e2de8e315f74de7d3cd16b8399f40ee59

diff --git a/sys-cluster/singularity/singularity-3.8.6.ebuild 
b/sys-cluster/singularity/singularity-3.8.7.ebuild
similarity index 97%
rename from sys-cluster/singularity/singularity-3.8.6.ebuild
rename to sys-cluster/singularity/singularity-3.8.7.ebuild
index 382b76747883..2fe146707d54 100644
--- a/sys-cluster/singularity/singularity-3.8.6.ebuild
+++ b/sys-cluster/singularity/singularity-3.8.7.ebuild
@@ -26,7 +26,8 @@ DEPEND="${COMMON}
sys-apps/util-linux
sys-fs/cryptsetup"
 RDEPEND="${COMMON}
-   sys-fs/squashfs-tools"
+   sys-fs/squashfs-tools
+   !app-containers/apptainer"
 
 CONFIG_CHECK="~SQUASHFS"
 



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2022-02-24 Thread Marek Szuba
commit: 1e9e0f6b15f9b846238eda2038df3f7b9b027f50
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Feb 22 11:45:20 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Feb 24 09:11:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e9e0f6b

sys-cluster/singularity: update HOMEPAGE

Sylabs is no longer the official upstream of Singularity, they maintain
a fork for which they have (confusingly) chosen to retain the original
name.

Signed-off-by: Marek Szuba  gentoo.org>

 sys-cluster/singularity/singularity-3.8.5.ebuild | 6 +++---
 sys-cluster/singularity/singularity-3.8.6.ebuild | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

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
index 8e1480027bc4..382b76747883 100644
--- a/sys-cluster/singularity/singularity-3.8.6.ebuild
+++ b/sys-cluster/singularity/singularity-3.8.6.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit linux-info toolchain-funcs
 
 DESCRIPTION="Application containers for Linux"
-HOMEPAGE="https://sylabs.io";
+HOMEPAGE="https://github.com/apptainer/singularity";
 
SRC_URI="https://github.com/apptainer/${PN}/releases/download/v${PV}/${P}.tar.gz";
 
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2022-02-09 Thread Marek Szuba
commit: df10c6849372769adac61b48c0a0bc1d29b23e29
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Feb  9 16:33:57 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Feb  9 16:35:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df10c684

sys-cluster/singularity: add 3.8.6

Signed-off-by: Marek Szuba  gentoo.org>

 sys-cluster/singularity/Manifest |  1 +
 sys-cluster/singularity/singularity-3.8.6.ebuild | 71 
 2 files changed, 72 insertions(+)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index 4b0ea9e7a0b2..c72ec8d05d74 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1 +1,2 @@
 DIST singularity-3.8.5.tar.gz 7898598 BLAKE2B 
3cf76734d6208340d8562f3d3d67f95c507bad3fad6797d82aed39aa39288385ca02d62854f3dddcfc1a1e3056e7485f27e6081c152b853c682ca8e3a587cf3a
 SHA512 
857761f47528a841a3cf11b49583ab7e8a2d137703e1826ff194011abba3334ed06859219e0c457f352304e7b18f1c493a8b337cc5df67981eb428c567d0ac5f
+DIST singularity-3.8.6.tar.gz 8183514 BLAKE2B 
be82b610c2a6647b4d74894e4095b1b58499ea00d9a7b491cdc1aa1b097e5d27bc8f8c43f9898ce1ea7b1866ce5734a6b487a17ac8081dfb89441c92bc2de343
 SHA512 
dd20a083505503d274d075574c4efaa4e59829d751d4836a7ba9095b9e88c3ce83e2203a194ede42e2c3dba22ed16546f97d980e7ba05021b94ec3dfa6ee309f

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 ..8e1480027bc4
--- /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://sylabs.io";
+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
+}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2022-02-09 Thread Marek Szuba
commit: 604df2bb29f140925c1e7097095836e4ecb0b218
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Feb  9 16:35:24 2022 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Feb  9 16:35:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=604df2bb

sys-cluster/singularity: update upstream metadata

Signed-off-by: Marek Szuba  gentoo.org>

 sys-cluster/singularity/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 @@
Install SUID helper binary


-   hpcng/singularity
+   apptainer/singularity

 



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2021-12-26 Thread Benda XU
commit: d7b8e166cf99a7bf0d1cfe8037239611ee7eccfd
Author: Benda Xu  gentoo  org>
AuthorDate: Sun Dec 26 13:02:52 2021 +
Commit: Benda XU  gentoo  org>
CommitDate: Sun Dec 26 13:03:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7b8e166

sys-cluster/singularity: support Prefix.

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Benda Xu  gentoo.org>

 sys-cluster/singularity/singularity-3.8.5.ebuild | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sys-cluster/singularity/singularity-3.8.5.ebuild 
b/sys-cluster/singularity/singularity-3.8.5.ebuild
index 8e6b0570d888..cc6fc804f1fb 100644
--- a/sys-cluster/singularity/singularity-3.8.5.ebuild
+++ b/sys-cluster/singularity/singularity-3.8.5.ebuild
@@ -36,10 +36,10 @@ src_configure() {
-x "$(tc-getBUILD_CXX)" \
-C "$(tc-getCC)" \
-X "$(tc-getCXX)" \
-   --prefix=/usr \
-   --sysconfdir=/etc \
-   --runstatedir=/run \
-   --localstatedir=/var \
+   --prefix="${EPREFIX}"/usr \
+   --sysconfdir="${EPREFIX}"/etc \
+   --runstatedir="${EPREFIX}"/run \
+   --localstatedir="${EPREFIX}"/var \
$(usex network "" "--without-network") \
$(usex suid "" "--without-suid")
)
@@ -51,7 +51,7 @@ src_compile() {
 }
 
 src_install() {
-   emake DESTDIR="${ED}" -C builddir 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



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2021-11-30 Thread Marek Szuba
commit: adb5552a56b4290442745071768212c15376dc49
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Nov 30 11:37:30 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Nov 30 11:37:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adb5552a

sys-cluster/singularity: drop 3.8.3

Signed-off-by: Marek Szuba  gentoo.org>

 sys-cluster/singularity/Manifest |  1 -
 sys-cluster/singularity/singularity-3.8.3.ebuild | 71 
 2 files changed, 72 deletions(-)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index 6e7f44d42947..4b0ea9e7a0b2 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,2 +1 @@
-DIST singularity-3.8.3.tar.gz 7948604 BLAKE2B 
67c8f4e52faf46a25c1bc16d4f05100f92cfb67b111898bebaeed827bb545f9d44fc3aaae99cbea020ec934c7dd3412b119a3f7f3f003f3e09a5e86dd2816957
 SHA512 
ede69bfa6602d75f67354afc215a1cf51db769df052662b77a8f1ac88cf580f13683190231452611ba618cda0e63af746dcdf59ab41611a9035bd199f8b50ec5
 DIST singularity-3.8.5.tar.gz 7898598 BLAKE2B 
3cf76734d6208340d8562f3d3d67f95c507bad3fad6797d82aed39aa39288385ca02d62854f3dddcfc1a1e3056e7485f27e6081c152b853c682ca8e3a587cf3a
 SHA512 
857761f47528a841a3cf11b49583ab7e8a2d137703e1826ff194011abba3334ed06859219e0c457f352304e7b18f1c493a8b337cc5df67981eb428c567d0ac5f

diff --git a/sys-cluster/singularity/singularity-3.8.3.ebuild 
b/sys-cluster/singularity/singularity-3.8.3.ebuild
deleted file mode 100644
index 8e297e844c82..
--- a/sys-cluster/singularity/singularity-3.8.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 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://sylabs.io";
-SRC_URI="https://github.com/hpcng/${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.13.0
-   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=/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
-}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2021-11-30 Thread Arthur Zamarin
commit: 735c403884169a1466c58f2c62c7d381e41b7ff8
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Nov 30 11:27:53 2021 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Nov 30 11:28:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=735c4038

sys-cluster/singularity: Stabilize 3.8.5 amd64, #827892

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-cluster/singularity/singularity-3.8.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/singularity/singularity-3.8.5.ebuild 
b/sys-cluster/singularity/singularity-3.8.5.ebuild
index 4909a70481fc..a599a0749da3 100644
--- a/sys-cluster/singularity/singularity-3.8.5.ebuild
+++ b/sys-cluster/singularity/singularity-3.8.5.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/hpcng/${PN}/releases/download/v${PV}/${P}.tar.gz";
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+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.



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2021-11-30 Thread Arthur Zamarin
commit: b4688c43da413e178ded00e094b316a4733a976c
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Nov 30 11:27:55 2021 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Nov 30 11:28:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4688c43

sys-cluster/singularity: Stabilize 3.8.5 x86, #827892

Signed-off-by: Arthur Zamarin  gentoo.org>

 sys-cluster/singularity/singularity-3.8.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/singularity/singularity-3.8.5.ebuild 
b/sys-cluster/singularity/singularity-3.8.5.ebuild
index a599a0749da3..8e6b0570d888 100644
--- a/sys-cluster/singularity/singularity-3.8.5.ebuild
+++ b/sys-cluster/singularity/singularity-3.8.5.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/hpcng/${PN}/releases/download/v${PV}/${P}.tar.gz";
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+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.



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2021-11-30 Thread Marek Szuba
commit: bdf8488a4e06a6a3c4728638d06882c3cc18b21f
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Nov 30 10:55:35 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Nov 30 10:55:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdf8488a

sys-cluster/singularity: add 3.8.5, drop 3.8.4

Signed-off-by: Marek Szuba  gentoo.org>

 sys-cluster/singularity/Manifest| 2 +-
 .../singularity/{singularity-3.8.4.ebuild => singularity-3.8.5.ebuild}  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index 66b4cf996558..6e7f44d42947 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,2 +1,2 @@
 DIST singularity-3.8.3.tar.gz 7948604 BLAKE2B 
67c8f4e52faf46a25c1bc16d4f05100f92cfb67b111898bebaeed827bb545f9d44fc3aaae99cbea020ec934c7dd3412b119a3f7f3f003f3e09a5e86dd2816957
 SHA512 
ede69bfa6602d75f67354afc215a1cf51db769df052662b77a8f1ac88cf580f13683190231452611ba618cda0e63af746dcdf59ab41611a9035bd199f8b50ec5
-DIST singularity-3.8.4.tar.gz 7959412 BLAKE2B 
17786ef9c5a7d3ba0a6494253b5ad5972e89882a5e31aa9da14e62fbc5e8b515e39b22a5832fddb3fbd9cec74caabcb49264541412bc33955643d708ff7a7dc2
 SHA512 
21170fcea6d49edd827b000b7885fd4bd4a35fc4367a68f1358f45f181fe6b09eae6336bb02007948c20841483c1b74831faca8408cd3f2982be780712967c55
+DIST singularity-3.8.5.tar.gz 7898598 BLAKE2B 
3cf76734d6208340d8562f3d3d67f95c507bad3fad6797d82aed39aa39288385ca02d62854f3dddcfc1a1e3056e7485f27e6081c152b853c682ca8e3a587cf3a
 SHA512 
857761f47528a841a3cf11b49583ab7e8a2d137703e1826ff194011abba3334ed06859219e0c457f352304e7b18f1c493a8b337cc5df67981eb428c567d0ac5f

diff --git a/sys-cluster/singularity/singularity-3.8.4.ebuild 
b/sys-cluster/singularity/singularity-3.8.5.ebuild
similarity index 98%
rename from sys-cluster/singularity/singularity-3.8.4.ebuild
rename to sys-cluster/singularity/singularity-3.8.5.ebuild
index 1875b1b03824..4909a70481fc 100644
--- a/sys-cluster/singularity/singularity-3.8.4.ebuild
+++ b/sys-cluster/singularity/singularity-3.8.5.ebuild
@@ -20,7 +20,7 @@ QA_FLAGS_IGNORED='.*'
 COMMON="sys-libs/libseccomp"
 BDEPEND="virtual/pkgconfig"
 DEPEND="${COMMON}
-   >=dev-lang/go-1.13.0
+   >=dev-lang/go-1.16.0
app-crypt/gpgme
dev-libs/openssl
sys-apps/util-linux



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2021-11-20 Thread Marek Szuba
commit: e3bf78c3af5e07f11f04c29c91fd3bd6bfa2d837
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Nov 20 10:36:00 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Nov 20 10:36:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3bf78c3

sys-cluster/singularity: drop 3.8.0

Signed-off-by: Marek Szuba  gentoo.org>

 sys-cluster/singularity/Manifest |  1 -
 sys-cluster/singularity/singularity-3.8.0.ebuild | 71 
 2 files changed, 72 deletions(-)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index bbf48ef06e67..66b4cf996558 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,3 +1,2 @@
-DIST singularity-3.8.0.tar.gz 7892955 BLAKE2B 
a75c9a5646cf5bfcc906bdda0e72e062787f6694322ca62ff329c63dfad051edc6c751e4e58cf01476a133947d87ad6230ba60e2d7b7da75ba654486a6c8d48c
 SHA512 
b1e3dc673fbf58d8fa13bea4c67114d1abf0f17e86f1958f585795374107f6b18dd854899b4a574dc3e4d8d4abf4177c26e63c7c3436ae1d35c66331f1630272
 DIST singularity-3.8.3.tar.gz 7948604 BLAKE2B 
67c8f4e52faf46a25c1bc16d4f05100f92cfb67b111898bebaeed827bb545f9d44fc3aaae99cbea020ec934c7dd3412b119a3f7f3f003f3e09a5e86dd2816957
 SHA512 
ede69bfa6602d75f67354afc215a1cf51db769df052662b77a8f1ac88cf580f13683190231452611ba618cda0e63af746dcdf59ab41611a9035bd199f8b50ec5
 DIST singularity-3.8.4.tar.gz 7959412 BLAKE2B 
17786ef9c5a7d3ba0a6494253b5ad5972e89882a5e31aa9da14e62fbc5e8b515e39b22a5832fddb3fbd9cec74caabcb49264541412bc33955643d708ff7a7dc2
 SHA512 
21170fcea6d49edd827b000b7885fd4bd4a35fc4367a68f1358f45f181fe6b09eae6336bb02007948c20841483c1b74831faca8408cd3f2982be780712967c55

diff --git a/sys-cluster/singularity/singularity-3.8.0.ebuild 
b/sys-cluster/singularity/singularity-3.8.0.ebuild
deleted file mode 100644
index e0cda2b957ce..
--- a/sys-cluster/singularity/singularity-3.8.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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";
-
-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"
-
-src_configure() {
-   local myconfargs=(
-   -c "$(tc-getBUILD_CC)" \
-   -x "$(tc-getBUILD_CXX)" \
-   -C "$(tc-getCC)" \
-   -X "$(tc-getCXX)" \
-   --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
-}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2021-11-19 Thread Agostino Sarubbo
commit: 0718427ea68c16bb7091984e4829ece307d4e138
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Nov 20 07:28:45 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Nov 20 07:28:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0718427e

sys-cluster/singularity: x86 stable wrt bug #824814

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-cluster/singularity/singularity-3.8.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/singularity/singularity-3.8.3.ebuild 
b/sys-cluster/singularity/singularity-3.8.3.ebuild
index 23381b24b7b0..8e297e844c82 100644
--- a/sys-cluster/singularity/singularity-3.8.3.ebuild
+++ b/sys-cluster/singularity/singularity-3.8.3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/hpcng/${PN}/releases/download/v${PV}/${P}.tar.gz";
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+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.



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2021-11-19 Thread Jakov Smolić
commit: 2edefda721531c68cbd81cb52f05955995f06cc2
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri Nov 19 13:39:20 2021 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Nov 19 13:39:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2edefda7

sys-cluster/singularity: Stabilize 3.8.3 amd64, #824814

Signed-off-by: Jakov Smolić  gentoo.org>

 sys-cluster/singularity/singularity-3.8.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/singularity/singularity-3.8.3.ebuild 
b/sys-cluster/singularity/singularity-3.8.3.ebuild
index 1875b1b03824..23381b24b7b0 100644
--- a/sys-cluster/singularity/singularity-3.8.3.ebuild
+++ b/sys-cluster/singularity/singularity-3.8.3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/hpcng/${PN}/releases/download/v${PV}/${P}.tar.gz";
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+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.



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2021-11-11 Thread Marek Szuba
commit: 5c1fd184fda1bdc519dcaef5ab3ef4cd06ab97b6
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Nov 10 18:33:37 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Nov 11 20:15:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c1fd184

sys-cluster/singularity: add 3.8.4

Signed-off-by: Marek Szuba  gentoo.org>

 sys-cluster/singularity/Manifest |  1 +
 sys-cluster/singularity/singularity-3.8.4.ebuild | 71 
 2 files changed, 72 insertions(+)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index d7884bd0636..bbf48ef06e6 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,2 +1,3 @@
 DIST singularity-3.8.0.tar.gz 7892955 BLAKE2B 
a75c9a5646cf5bfcc906bdda0e72e062787f6694322ca62ff329c63dfad051edc6c751e4e58cf01476a133947d87ad6230ba60e2d7b7da75ba654486a6c8d48c
 SHA512 
b1e3dc673fbf58d8fa13bea4c67114d1abf0f17e86f1958f585795374107f6b18dd854899b4a574dc3e4d8d4abf4177c26e63c7c3436ae1d35c66331f1630272
 DIST singularity-3.8.3.tar.gz 7948604 BLAKE2B 
67c8f4e52faf46a25c1bc16d4f05100f92cfb67b111898bebaeed827bb545f9d44fc3aaae99cbea020ec934c7dd3412b119a3f7f3f003f3e09a5e86dd2816957
 SHA512 
ede69bfa6602d75f67354afc215a1cf51db769df052662b77a8f1ac88cf580f13683190231452611ba618cda0e63af746dcdf59ab41611a9035bd199f8b50ec5
+DIST singularity-3.8.4.tar.gz 7959412 BLAKE2B 
17786ef9c5a7d3ba0a6494253b5ad5972e89882a5e31aa9da14e62fbc5e8b515e39b22a5832fddb3fbd9cec74caabcb49264541412bc33955643d708ff7a7dc2
 SHA512 
21170fcea6d49edd827b000b7885fd4bd4a35fc4367a68f1358f45f181fe6b09eae6336bb02007948c20841483c1b74831faca8408cd3f2982be780712967c55

diff --git a/sys-cluster/singularity/singularity-3.8.4.ebuild 
b/sys-cluster/singularity/singularity-3.8.4.ebuild
new file mode 100644
index 000..1875b1b0382
--- /dev/null
+++ b/sys-cluster/singularity/singularity-3.8.4.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 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://sylabs.io";
+SRC_URI="https://github.com/hpcng/${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.13.0
+   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=/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
+}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2021-10-10 Thread Marek Szuba
commit: 487f44de1691474652ca4677059e16a75a740f06
Author: Marek Szuba  gentoo  org>
AuthorDate: Sun Oct 10 17:55:55 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sun Oct 10 20:44:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=487f44de

sys-cluster/singularity: keyword 3.8.3 for ~riscv

Signed-off-by: Marek Szuba  gentoo.org>

 sys-cluster/singularity/singularity-3.8.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/singularity/singularity-3.8.3.ebuild 
b/sys-cluster/singularity/singularity-3.8.3.ebuild
index f65b278b703..1875b1b0382 100644
--- a/sys-cluster/singularity/singularity-3.8.3.ebuild
+++ b/sys-cluster/singularity/singularity-3.8.3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/hpcng/${PN}/releases/download/v${PV}/${P}.tar.gz";
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+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.



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2021-09-20 Thread Marek Szuba
commit: 87546309feff3dd8007a76479ea1c3d1dfa68fee
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Sep 20 09:33:24 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Sep 20 09:40:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87546309

sys-cluster/singularity: drop 3.8.1

Signed-off-by: Marek Szuba  gentoo.org>

 sys-cluster/singularity/Manifest |  1 -
 sys-cluster/singularity/singularity-3.8.1.ebuild | 71 
 2 files changed, 72 deletions(-)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index 63d1d26fe06..d7884bd0636 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,3 +1,2 @@
 DIST singularity-3.8.0.tar.gz 7892955 BLAKE2B 
a75c9a5646cf5bfcc906bdda0e72e062787f6694322ca62ff329c63dfad051edc6c751e4e58cf01476a133947d87ad6230ba60e2d7b7da75ba654486a6c8d48c
 SHA512 
b1e3dc673fbf58d8fa13bea4c67114d1abf0f17e86f1958f585795374107f6b18dd854899b4a574dc3e4d8d4abf4177c26e63c7c3436ae1d35c66331f1630272
-DIST singularity-3.8.1.tar.gz 7935330 BLAKE2B 
112e04936086b5c068730f8ef52927f4c6c5257b5057828f80946e1a9a5fd83aa657ab55d55c270351835500ca9c0fccc22695cc0c3012d69f411f1b6c5152ab
 SHA512 
7303f82c0ac821f30aab301eb7cb60bc3a56ccef3e21d881f2facc87805ac4b9cf9d776f502766512e91de59863e693189a7509296494fcf028f8453459758a8
 DIST singularity-3.8.3.tar.gz 7948604 BLAKE2B 
67c8f4e52faf46a25c1bc16d4f05100f92cfb67b111898bebaeed827bb545f9d44fc3aaae99cbea020ec934c7dd3412b119a3f7f3f003f3e09a5e86dd2816957
 SHA512 
ede69bfa6602d75f67354afc215a1cf51db769df052662b77a8f1ac88cf580f13683190231452611ba618cda0e63af746dcdf59ab41611a9035bd199f8b50ec5

diff --git a/sys-cluster/singularity/singularity-3.8.1.ebuild 
b/sys-cluster/singularity/singularity-3.8.1.ebuild
deleted file mode 100644
index 2c112879880..000
--- a/sys-cluster/singularity/singularity-3.8.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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";
-
-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"
-
-src_configure() {
-   local myconfargs=(
-   -c "$(tc-getBUILD_CC)" \
-   -x "$(tc-getBUILD_CXX)" \
-   -C "$(tc-getCC)" \
-   -X "$(tc-getCXX)" \
-   --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
-}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2021-09-09 Thread Marek Szuba
commit: cd1c5046d95441e49e002122422adc395f9a16b3
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Sep  9 11:17:07 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Sep  9 11:20:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd1c5046

sys-cluster/singularity: add 3.8.3

Signed-off-by: Marek Szuba  gentoo.org>

 sys-cluster/singularity/Manifest |  1 +
 sys-cluster/singularity/singularity-3.8.3.ebuild | 71 
 2 files changed, 72 insertions(+)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index 25b0446840e..63d1d26fe06 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,2 +1,3 @@
 DIST singularity-3.8.0.tar.gz 7892955 BLAKE2B 
a75c9a5646cf5bfcc906bdda0e72e062787f6694322ca62ff329c63dfad051edc6c751e4e58cf01476a133947d87ad6230ba60e2d7b7da75ba654486a6c8d48c
 SHA512 
b1e3dc673fbf58d8fa13bea4c67114d1abf0f17e86f1958f585795374107f6b18dd854899b4a574dc3e4d8d4abf4177c26e63c7c3436ae1d35c66331f1630272
 DIST singularity-3.8.1.tar.gz 7935330 BLAKE2B 
112e04936086b5c068730f8ef52927f4c6c5257b5057828f80946e1a9a5fd83aa657ab55d55c270351835500ca9c0fccc22695cc0c3012d69f411f1b6c5152ab
 SHA512 
7303f82c0ac821f30aab301eb7cb60bc3a56ccef3e21d881f2facc87805ac4b9cf9d776f502766512e91de59863e693189a7509296494fcf028f8453459758a8
+DIST singularity-3.8.3.tar.gz 7948604 BLAKE2B 
67c8f4e52faf46a25c1bc16d4f05100f92cfb67b111898bebaeed827bb545f9d44fc3aaae99cbea020ec934c7dd3412b119a3f7f3f003f3e09a5e86dd2816957
 SHA512 
ede69bfa6602d75f67354afc215a1cf51db769df052662b77a8f1ac88cf580f13683190231452611ba618cda0e63af746dcdf59ab41611a9035bd199f8b50ec5

diff --git a/sys-cluster/singularity/singularity-3.8.3.ebuild 
b/sys-cluster/singularity/singularity-3.8.3.ebuild
new file mode 100644
index 000..f65b278b703
--- /dev/null
+++ b/sys-cluster/singularity/singularity-3.8.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 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://sylabs.io";
+SRC_URI="https://github.com/hpcng/${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"
+
+src_configure() {
+   local myconfargs=(
+   -c "$(tc-getBUILD_CC)" \
+   -x "$(tc-getBUILD_CXX)" \
+   -C "$(tc-getCC)" \
+   -X "$(tc-getCXX)" \
+   --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
+}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2021-08-17 Thread Marek Szuba
commit: 490564fecf64665398ce45dc60d4f9b0ed8769ce
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Aug 17 11:08:52 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Aug 17 11:31:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=490564fe

sys-cluster/singularity: add 3.8.1

Signed-off-by: Marek Szuba  gentoo.org>

 sys-cluster/singularity/Manifest |  1 +
 sys-cluster/singularity/singularity-3.8.1.ebuild | 71 
 2 files changed, 72 insertions(+)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index e9cea8f5ad0..25b0446840e 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1 +1,2 @@
 DIST singularity-3.8.0.tar.gz 7892955 BLAKE2B 
a75c9a5646cf5bfcc906bdda0e72e062787f6694322ca62ff329c63dfad051edc6c751e4e58cf01476a133947d87ad6230ba60e2d7b7da75ba654486a6c8d48c
 SHA512 
b1e3dc673fbf58d8fa13bea4c67114d1abf0f17e86f1958f585795374107f6b18dd854899b4a574dc3e4d8d4abf4177c26e63c7c3436ae1d35c66331f1630272
+DIST singularity-3.8.1.tar.gz 7935330 BLAKE2B 
112e04936086b5c068730f8ef52927f4c6c5257b5057828f80946e1a9a5fd83aa657ab55d55c270351835500ca9c0fccc22695cc0c3012d69f411f1b6c5152ab
 SHA512 
7303f82c0ac821f30aab301eb7cb60bc3a56ccef3e21d881f2facc87805ac4b9cf9d776f502766512e91de59863e693189a7509296494fcf028f8453459758a8

diff --git a/sys-cluster/singularity/singularity-3.8.1.ebuild 
b/sys-cluster/singularity/singularity-3.8.1.ebuild
new file mode 100644
index 000..2c112879880
--- /dev/null
+++ b/sys-cluster/singularity/singularity-3.8.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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";
+
+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"
+
+src_configure() {
+   local myconfargs=(
+   -c "$(tc-getBUILD_CC)" \
+   -x "$(tc-getBUILD_CXX)" \
+   -C "$(tc-getCC)" \
+   -X "$(tc-getCXX)" \
+   --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
+}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2021-07-17 Thread Marek Szuba
commit: 01b85257c07aa573774f25de910e9c36d1c099d5
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Jul 17 21:18:29 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Jul 17 21:19:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01b85257

sys-cluster/singularity: drop 3.7.4

Signed-off-by: Marek Szuba  gentoo.org>

 sys-cluster/singularity/Manifest |  1 -
 sys-cluster/singularity/singularity-3.7.4.ebuild | 73 
 2 files changed, 74 deletions(-)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index 63856210d8c..e9cea8f5ad0 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,2 +1 @@
-DIST singularity-3.7.4.tar.gz 6446703 BLAKE2B 
f9263a18c138cffa116ab06d59533948e48500fad69917598adc36b47fb0b8bf81e868ea924d1cd0e39ca6345a2fdc38a1c9788944729a43c4c8b63bbe82a184
 SHA512 
a02d8e5c3c229e454c7736173cbe3709ccaafb0ffedcf537501eb091cd3ee54899542e0c6e1221f35dcffbaf48d27be7e91a9bd510bdaacfd8a2285ea41e6f3d
 DIST singularity-3.8.0.tar.gz 7892955 BLAKE2B 
a75c9a5646cf5bfcc906bdda0e72e062787f6694322ca62ff329c63dfad051edc6c751e4e58cf01476a133947d87ad6230ba60e2d7b7da75ba654486a6c8d48c
 SHA512 
b1e3dc673fbf58d8fa13bea4c67114d1abf0f17e86f1958f585795374107f6b18dd854899b4a574dc3e4d8d4abf4177c26e63c7c3436ae1d35c66331f1630272

diff --git a/sys-cluster/singularity/singularity-3.7.4.ebuild 
b/sys-cluster/singularity/singularity-3.7.4.ebuild
deleted file mode 100644
index c018b5042e0..000
--- a/sys-cluster/singularity/singularity-3.7.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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";
-
-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=(
-   -c "$(tc-getBUILD_CC)" \
-   -x "$(tc-getBUILD_CXX)" \
-   -C "$(tc-getCC)" \
-   -X "$(tc-getCXX)" \
-   --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
-}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2021-07-17 Thread Agostino Sarubbo
commit: 6e3aef3337011f4b48d1c38871fc7eb5c47cd801
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Jul 17 07:44:17 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Jul 17 07:44:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e3aef33

sys-cluster/singularity: x86 stable wrt bug #802486

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-cluster/singularity/singularity-3.8.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/singularity/singularity-3.8.0.ebuild 
b/sys-cluster/singularity/singularity-3.8.0.ebuild
index ad68441725d..e0cda2b957c 100644
--- a/sys-cluster/singularity/singularity-3.8.0.ebuild
+++ b/sys-cluster/singularity/singularity-3.8.0.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/hpcng/${PN}/releases/download/v${PV}/${P}.tar.gz";
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples +network +suid"
 
 # Do not complain about CFLAGS etc. since go projects do not use them.



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2021-07-17 Thread Agostino Sarubbo
commit: 1b48fd454da7ad55d64b640f7e267018e917da12
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Jul 17 07:42:30 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Jul 17 07:42:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b48fd45

sys-cluster/singularity: amd64 stable wrt bug #802486

Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sys-cluster/singularity/singularity-3.8.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/singularity/singularity-3.8.0.ebuild 
b/sys-cluster/singularity/singularity-3.8.0.ebuild
index 2c112879880..ad68441725d 100644
--- a/sys-cluster/singularity/singularity-3.8.0.ebuild
+++ b/sys-cluster/singularity/singularity-3.8.0.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/hpcng/${PN}/releases/download/v${PV}/${P}.tar.gz";
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples +network +suid"
 
 # Do not complain about CFLAGS etc. since go projects do not use them.



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2021-06-16 Thread Marek Szuba
commit: 6067bc917cc7364be88abf3b9a8eb979e581a637
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Jun 16 09:47:00 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Jun 16 10:15:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6067bc91

sys-cluster/singularity: add 3.8.0

Signed-off-by: Marek Szuba  gentoo.org>

 sys-cluster/singularity/Manifest |  1 +
 sys-cluster/singularity/singularity-3.8.0.ebuild | 71 
 2 files changed, 72 insertions(+)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index 2e7c05d19b8..63856210d8c 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1 +1,2 @@
 DIST singularity-3.7.4.tar.gz 6446703 BLAKE2B 
f9263a18c138cffa116ab06d59533948e48500fad69917598adc36b47fb0b8bf81e868ea924d1cd0e39ca6345a2fdc38a1c9788944729a43c4c8b63bbe82a184
 SHA512 
a02d8e5c3c229e454c7736173cbe3709ccaafb0ffedcf537501eb091cd3ee54899542e0c6e1221f35dcffbaf48d27be7e91a9bd510bdaacfd8a2285ea41e6f3d
+DIST singularity-3.8.0.tar.gz 7892955 BLAKE2B 
a75c9a5646cf5bfcc906bdda0e72e062787f6694322ca62ff329c63dfad051edc6c751e4e58cf01476a133947d87ad6230ba60e2d7b7da75ba654486a6c8d48c
 SHA512 
b1e3dc673fbf58d8fa13bea4c67114d1abf0f17e86f1958f585795374107f6b18dd854899b4a574dc3e4d8d4abf4177c26e63c7c3436ae1d35c66331f1630272

diff --git a/sys-cluster/singularity/singularity-3.8.0.ebuild 
b/sys-cluster/singularity/singularity-3.8.0.ebuild
new file mode 100644
index 000..2c112879880
--- /dev/null
+++ b/sys-cluster/singularity/singularity-3.8.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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";
+
+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"
+
+src_configure() {
+   local myconfargs=(
+   -c "$(tc-getBUILD_CC)" \
+   -x "$(tc-getBUILD_CXX)" \
+   -C "$(tc-getCC)" \
+   -X "$(tc-getCXX)" \
+   --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
+}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2021-05-28 Thread Marek Szuba
commit: 086e1d23d289498f83d7d321dc39ff1caaa79b9f
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri May 28 08:41:32 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri May 28 08:42:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=086e1d23

sys-cluster/singularity: drop 3.7.3

No versions vulnerable to CVE-2021-32635 left in the tree.

Bug: https://bugs.gentoo.org/792465
Signed-off-by: Marek Szuba  gentoo.org>

 sys-cluster/singularity/Manifest |  1 -
 sys-cluster/singularity/singularity-3.7.3.ebuild | 73 
 2 files changed, 74 deletions(-)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index 15e2478aade..2e7c05d19b8 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,2 +1 @@
-DIST singularity-3.7.3.tar.gz 6444607 BLAKE2B 
eb37944f443e73ad258ba2b0f5e769c0e531fc9adc29ed1241940739b549b1bb409dfd8aff729229515c993ee2f842eb0ee00f0f52fec4d2e406f719c0f6e03c
 SHA512 
56e797eb29a2fafaf6ccd730fb8cc9e35713020dacb4d19be02a7204272894360b0d254bd8066d9f14181b935f7179effbac2dfa776b2ff3e0e201388c372836
 DIST singularity-3.7.4.tar.gz 6446703 BLAKE2B 
f9263a18c138cffa116ab06d59533948e48500fad69917598adc36b47fb0b8bf81e868ea924d1cd0e39ca6345a2fdc38a1c9788944729a43c4c8b63bbe82a184
 SHA512 
a02d8e5c3c229e454c7736173cbe3709ccaafb0ffedcf537501eb091cd3ee54899542e0c6e1221f35dcffbaf48d27be7e91a9bd510bdaacfd8a2285ea41e6f3d

diff --git a/sys-cluster/singularity/singularity-3.7.3.ebuild 
b/sys-cluster/singularity/singularity-3.7.3.ebuild
deleted file mode 100644
index c018b5042e0..000
--- a/sys-cluster/singularity/singularity-3.7.3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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";
-
-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=(
-   -c "$(tc-getBUILD_CC)" \
-   -x "$(tc-getBUILD_CXX)" \
-   -C "$(tc-getCC)" \
-   -X "$(tc-getCXX)" \
-   --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
-}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2021-05-27 Thread Sam James
commit: f067dd2a686818096063b364cc5fba46f6799711
Author: Sam James  gentoo  org>
AuthorDate: Fri May 28 00:27:17 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 28 00:27:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f067dd2a

sys-cluster/singularity: Stabilize 3.7.4 x86, #792465

Signed-off-by: Sam James  gentoo.org>

 sys-cluster/singularity/singularity-3.7.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/singularity/singularity-3.7.4.ebuild 
b/sys-cluster/singularity/singularity-3.7.4.ebuild
index 50873aff393..a6085a30d3c 100644
--- a/sys-cluster/singularity/singularity-3.7.4.ebuild
+++ b/sys-cluster/singularity/singularity-3.7.4.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/hpcng/${PN}/releases/download/v${PV}/${P}.tar.gz";
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples +network +suid"
 
 # Do not complain about CFLAGS etc. since go projects do not use them.



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2021-05-27 Thread Sam James
commit: cc9523fdd50324e4000bb3cf89d7e22045f28e93
Author: Sam James  gentoo  org>
AuthorDate: Fri May 28 00:27:29 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 28 00:27:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc9523fd

sys-cluster/singularity: Stabilize 3.7.4 amd64, #792465

Signed-off-by: Sam James  gentoo.org>

 sys-cluster/singularity/singularity-3.7.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/singularity/singularity-3.7.4.ebuild 
b/sys-cluster/singularity/singularity-3.7.4.ebuild
index a6085a30d3c..c018b5042e0 100644
--- a/sys-cluster/singularity/singularity-3.7.4.ebuild
+++ b/sys-cluster/singularity/singularity-3.7.4.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/hpcng/${PN}/releases/download/v${PV}/${P}.tar.gz";
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples +network +suid"
 
 # Do not complain about CFLAGS etc. since go projects do not use them.



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2021-05-27 Thread Marek Szuba
commit: 0cd4c10d4020370628d2f0938f856a65db8b672e
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu May 27 10:41:08 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu May 27 10:41:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cd4c10d

sys-cluster/singularity: add 3.7.4

Security release addressing CVE-2021-32635.

Signed-off-by: Marek Szuba  gentoo.org>

 sys-cluster/singularity/Manifest |  1 +
 sys-cluster/singularity/singularity-3.7.4.ebuild | 73 
 2 files changed, 74 insertions(+)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index adefc22ab8e..15e2478aade 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1 +1,2 @@
 DIST singularity-3.7.3.tar.gz 6444607 BLAKE2B 
eb37944f443e73ad258ba2b0f5e769c0e531fc9adc29ed1241940739b549b1bb409dfd8aff729229515c993ee2f842eb0ee00f0f52fec4d2e406f719c0f6e03c
 SHA512 
56e797eb29a2fafaf6ccd730fb8cc9e35713020dacb4d19be02a7204272894360b0d254bd8066d9f14181b935f7179effbac2dfa776b2ff3e0e201388c372836
+DIST singularity-3.7.4.tar.gz 6446703 BLAKE2B 
f9263a18c138cffa116ab06d59533948e48500fad69917598adc36b47fb0b8bf81e868ea924d1cd0e39ca6345a2fdc38a1c9788944729a43c4c8b63bbe82a184
 SHA512 
a02d8e5c3c229e454c7736173cbe3709ccaafb0ffedcf537501eb091cd3ee54899542e0c6e1221f35dcffbaf48d27be7e91a9bd510bdaacfd8a2285ea41e6f3d

diff --git a/sys-cluster/singularity/singularity-3.7.4.ebuild 
b/sys-cluster/singularity/singularity-3.7.4.ebuild
new file mode 100644
index 000..50873aff393
--- /dev/null
+++ b/sys-cluster/singularity/singularity-3.7.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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";
+
+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=(
+   -c "$(tc-getBUILD_CC)" \
+   -x "$(tc-getBUILD_CXX)" \
+   -C "$(tc-getCC)" \
+   -X "$(tc-getCXX)" \
+   --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
+}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2021-05-13 Thread Sam James
commit: 5679c121185ee67a5ef309e97b97138c6752d885
Author: Sam James  gentoo  org>
AuthorDate: Thu May 13 21:04:54 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 13 21:04:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5679c121

sys-cluster/singularity: Stabilize 3.7.3 x86, #789993

Signed-off-by: Sam James  gentoo.org>

 sys-cluster/singularity/singularity-3.7.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/singularity/singularity-3.7.3.ebuild 
b/sys-cluster/singularity/singularity-3.7.3.ebuild
index ee33551c399..c018b5042e0 100644
--- a/sys-cluster/singularity/singularity-3.7.3.ebuild
+++ b/sys-cluster/singularity/singularity-3.7.3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/hpcng/${PN}/releases/download/v${PV}/${P}.tar.gz";
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples +network +suid"
 
 # Do not complain about CFLAGS etc. since go projects do not use them.



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2021-05-13 Thread Sam James
commit: 028241f44c325a8b16a7ab84ae58bf4b53a87cfb
Author: Sam James  gentoo  org>
AuthorDate: Thu May 13 18:54:47 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 13 18:54:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=028241f4

sys-cluster/singularity: Stabilize 3.7.3 amd64, #789993

Signed-off-by: Sam James  gentoo.org>

 sys-cluster/singularity/singularity-3.7.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/singularity/singularity-3.7.3.ebuild 
b/sys-cluster/singularity/singularity-3.7.3.ebuild
index 50873aff393..ee33551c399 100644
--- a/sys-cluster/singularity/singularity-3.7.3.ebuild
+++ b/sys-cluster/singularity/singularity-3.7.3.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/hpcng/${PN}/releases/download/v${PV}/${P}.tar.gz";
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples +network +suid"
 
 # Do not complain about CFLAGS etc. since go projects do not use them.



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2021-04-16 Thread Marek Szuba
commit: 2c2363259cf287bfac215e3e37736eea208d0656
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri Apr 16 16:07:25 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri Apr 16 18:24:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c236325

sys-cluster/singularity: bump to 3.7.3

Addresses CVE-2021-29136.

Signed-off-by: Marek Szuba  gentoo.org>

 sys-cluster/singularity/Manifest| 2 +-
 .../singularity/{singularity-3.7.2.ebuild => singularity-3.7.3.ebuild}  | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index b06871e9fce..adefc22ab8e 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1 +1 @@
-DIST singularity-3.7.2.tar.gz 6268044 BLAKE2B 
d5a316046037dcb9c386f2d3b45204b77394cae273d0daa561282a354a463823c4be3c56e0935ff0a8dc9671cb841ad8cb75364b7652dce93ce099ede3e12ee3
 SHA512 
f31e383e645d394cc29e5b38da84ca805545e3226b069c696e667e7dde1569fa2373613f624c739482459a938e76e4e513062c19474685ccbfa5bd6162244466
+DIST singularity-3.7.3.tar.gz 6444607 BLAKE2B 
eb37944f443e73ad258ba2b0f5e769c0e531fc9adc29ed1241940739b549b1bb409dfd8aff729229515c993ee2f842eb0ee00f0f52fec4d2e406f719c0f6e03c
 SHA512 
56e797eb29a2fafaf6ccd730fb8cc9e35713020dacb4d19be02a7204272894360b0d254bd8066d9f14181b935f7179effbac2dfa776b2ff3e0e201388c372836

diff --git a/sys-cluster/singularity/singularity-3.7.2.ebuild 
b/sys-cluster/singularity/singularity-3.7.3.ebuild
similarity index 100%
rename from sys-cluster/singularity/singularity-3.7.2.ebuild
rename to sys-cluster/singularity/singularity-3.7.3.ebuild



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2021-04-16 Thread Marek Szuba
commit: 8f16ce52d8f6136f260a08a3c1294990014e779a
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri Apr 16 16:05:56 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri Apr 16 18:24:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f16ce52

sys-cluster/singularity: remove old

Signed-off-by: Marek Szuba  gentoo.org>

 sys-cluster/singularity/Manifest |  1 -
 sys-cluster/singularity/singularity-3.7.1.ebuild | 73 
 2 files changed, 74 deletions(-)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index 9da8ead5740..b06871e9fce 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,2 +1 @@
-DIST singularity-3.7.1.tar.gz 6121297 BLAKE2B 
10399692559dbaf1a855229f4d3ff845af5b923d9a5b959638481ba58fd5bd04035fb751e5000aa44f816947d88ead85fbdceb8ad5cdb94aa54b0986cb922044
 SHA512 
ed87bd13bb4bbdcb49981cc02bf37e1db9a5d8fab3ef4314a15cfa391cb2210b55b2e54500fb03811eda8f31499ea7cead9a368a486da0cea0ac71037908c7cc
 DIST singularity-3.7.2.tar.gz 6268044 BLAKE2B 
d5a316046037dcb9c386f2d3b45204b77394cae273d0daa561282a354a463823c4be3c56e0935ff0a8dc9671cb841ad8cb75364b7652dce93ce099ede3e12ee3
 SHA512 
f31e383e645d394cc29e5b38da84ca805545e3226b069c696e667e7dde1569fa2373613f624c739482459a938e76e4e513062c19474685ccbfa5bd6162244466

diff --git a/sys-cluster/singularity/singularity-3.7.1.ebuild 
b/sys-cluster/singularity/singularity-3.7.1.ebuild
deleted file mode 100644
index 437a7301250..000
--- a/sys-cluster/singularity/singularity-3.7.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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";
-
-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=(
-   -c "$(tc-getBUILD_CC)" \
-   -x "$(tc-getBUILD_CXX)" \
-   -C "$(tc-getCC)" \
-   -X "$(tc-getCXX)" \
-   --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
-}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2021-03-11 Thread Marek Szuba
commit: f53452be5fd68d13ca949a10cf91b333840f22ef
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Mar 11 12:31:05 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Mar 11 13:44:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f53452be

sys-cluster/singularity: remove old

Signed-off-by: Marek Szuba  gentoo.org>

 sys-cluster/singularity/Manifest |  2 -
 sys-cluster/singularity/singularity-3.6.4.ebuild | 73 
 sys-cluster/singularity/singularity-3.7.0.ebuild | 73 
 3 files changed, 148 deletions(-)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index 95ff7a825fb..8f1c19fd5b3 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,3 +1 @@
-DIST singularity-3.6.4.tar.gz 6183277 BLAKE2B 
9fe9b28828149268506e4db895767528a9397c347905c170e96d8e0d7b9d715e4c5f212bf04a2418689f448e8045e52a16c8cc4e93a8066d4d651f1eeb918e92
 SHA512 
c12cdc6baba6089576396c4391367451a264d6bfe7dd9a4b582d21ee5bd49aeea79372f3d008a4f2f535af307e0890a8d1a72773bb2c0898872eed8c82e48991
-DIST singularity-3.7.0.tar.gz 6097313 BLAKE2B 
2fa8472bea80fec2613d1598d89354c3655eadee2292f0a4921d680300bc5793c5721f9640aeb398eba6cc91540f132b9d9b2afa175e74ac9f53c8847ff21e13
 SHA512 
25faadd9b1ec4b9751534cf1176f294696c9afde50adbc42f67d86584a5122fc78500e4ac6c502e5d90a66a9b44b9097a4d0231afcc2615b25d95feab8a3c967
 DIST singularity-3.7.1.tar.gz 6121297 BLAKE2B 
10399692559dbaf1a855229f4d3ff845af5b923d9a5b959638481ba58fd5bd04035fb751e5000aa44f816947d88ead85fbdceb8ad5cdb94aa54b0986cb922044
 SHA512 
ed87bd13bb4bbdcb49981cc02bf37e1db9a5d8fab3ef4314a15cfa391cb2210b55b2e54500fb03811eda8f31499ea7cead9a368a486da0cea0ac71037908c7cc

diff --git a/sys-cluster/singularity/singularity-3.6.4.ebuild 
b/sys-cluster/singularity/singularity-3.6.4.ebuild
deleted file mode 100644
index 23232305c17..000
--- a/sys-cluster/singularity/singularity-3.6.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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";
-
-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=(
-   -c "$(tc-getBUILD_CC)" \
-   -x "$(tc-getBUILD_CXX)" \
-   -C "$(tc-getCC)" \
-   -X "$(tc-getCXX)" \
-   --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.7.0.ebuild 
b/sys-cluster/singularity/singularity-3.7.0.ebuild
deleted file mode 100644
index 23232305c17..000
--- a/sys-cluster/singularity/singularity-3.7.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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";
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples +network +suid"
-
-

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2021-03-11 Thread Marek Szuba
commit: 7407d736d6ad94cd8b9ef2aea1f90f418e8e5918
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Mar 11 12:51:00 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Mar 11 13:44:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7407d736

sys-cluster/singularity: bump to 3.7.2

Signed-off-by: Marek Szuba  gentoo.org>

 sys-cluster/singularity/Manifest |  1 +
 sys-cluster/singularity/singularity-3.7.2.ebuild | 73 
 2 files changed, 74 insertions(+)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index 8f1c19fd5b3..9da8ead5740 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1 +1,2 @@
 DIST singularity-3.7.1.tar.gz 6121297 BLAKE2B 
10399692559dbaf1a855229f4d3ff845af5b923d9a5b959638481ba58fd5bd04035fb751e5000aa44f816947d88ead85fbdceb8ad5cdb94aa54b0986cb922044
 SHA512 
ed87bd13bb4bbdcb49981cc02bf37e1db9a5d8fab3ef4314a15cfa391cb2210b55b2e54500fb03811eda8f31499ea7cead9a368a486da0cea0ac71037908c7cc
+DIST singularity-3.7.2.tar.gz 6268044 BLAKE2B 
d5a316046037dcb9c386f2d3b45204b77394cae273d0daa561282a354a463823c4be3c56e0935ff0a8dc9671cb841ad8cb75364b7652dce93ce099ede3e12ee3
 SHA512 
f31e383e645d394cc29e5b38da84ca805545e3226b069c696e667e7dde1569fa2373613f624c739482459a938e76e4e513062c19474685ccbfa5bd6162244466

diff --git a/sys-cluster/singularity/singularity-3.7.2.ebuild 
b/sys-cluster/singularity/singularity-3.7.2.ebuild
new file mode 100644
index 000..50873aff393
--- /dev/null
+++ b/sys-cluster/singularity/singularity-3.7.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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";
+
+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=(
+   -c "$(tc-getBUILD_CC)" \
+   -x "$(tc-getBUILD_CXX)" \
+   -C "$(tc-getCC)" \
+   -X "$(tc-getCXX)" \
+   --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
+}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2021-01-18 Thread Marek Szuba
commit: dad2a20f0130ba87b0b21527bec78bc5cfbcdb08
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Jan 18 13:54:05 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Jan 18 13:54:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dad2a20f

sys-cluster/singularity: bump to 3.7.1

Signed-off-by: Marek Szuba  gentoo.org>

 sys-cluster/singularity/Manifest |  1 +
 sys-cluster/singularity/singularity-3.7.1.ebuild | 73 
 2 files changed, 74 insertions(+)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index 11ad8bcaf3e..95ff7a825fb 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,2 +1,3 @@
 DIST singularity-3.6.4.tar.gz 6183277 BLAKE2B 
9fe9b28828149268506e4db895767528a9397c347905c170e96d8e0d7b9d715e4c5f212bf04a2418689f448e8045e52a16c8cc4e93a8066d4d651f1eeb918e92
 SHA512 
c12cdc6baba6089576396c4391367451a264d6bfe7dd9a4b582d21ee5bd49aeea79372f3d008a4f2f535af307e0890a8d1a72773bb2c0898872eed8c82e48991
 DIST singularity-3.7.0.tar.gz 6097313 BLAKE2B 
2fa8472bea80fec2613d1598d89354c3655eadee2292f0a4921d680300bc5793c5721f9640aeb398eba6cc91540f132b9d9b2afa175e74ac9f53c8847ff21e13
 SHA512 
25faadd9b1ec4b9751534cf1176f294696c9afde50adbc42f67d86584a5122fc78500e4ac6c502e5d90a66a9b44b9097a4d0231afcc2615b25d95feab8a3c967
+DIST singularity-3.7.1.tar.gz 6121297 BLAKE2B 
10399692559dbaf1a855229f4d3ff845af5b923d9a5b959638481ba58fd5bd04035fb751e5000aa44f816947d88ead85fbdceb8ad5cdb94aa54b0986cb922044
 SHA512 
ed87bd13bb4bbdcb49981cc02bf37e1db9a5d8fab3ef4314a15cfa391cb2210b55b2e54500fb03811eda8f31499ea7cead9a368a486da0cea0ac71037908c7cc

diff --git a/sys-cluster/singularity/singularity-3.7.1.ebuild 
b/sys-cluster/singularity/singularity-3.7.1.ebuild
new file mode 100644
index 000..437a7301250
--- /dev/null
+++ b/sys-cluster/singularity/singularity-3.7.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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";
+
+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=(
+   -c "$(tc-getBUILD_CC)" \
+   -x "$(tc-getBUILD_CXX)" \
+   -C "$(tc-getCC)" \
+   -X "$(tc-getCXX)" \
+   --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
+}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2020-11-27 Thread Marek Szuba
commit: 042c5518208622a434f1574067e1249b856c5a8f
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri Nov 27 19:16:21 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri Nov 27 19:17:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=042c5518

sys-cluster/singularity: bump to 3.7.0

Signed-off-by: Marek Szuba  gentoo.org>

 sys-cluster/singularity/Manifest |  1 +
 sys-cluster/singularity/singularity-3.7.0.ebuild | 73 
 2 files changed, 74 insertions(+)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index 11c8215ef1e..11ad8bcaf3e 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1 +1,2 @@
 DIST singularity-3.6.4.tar.gz 6183277 BLAKE2B 
9fe9b28828149268506e4db895767528a9397c347905c170e96d8e0d7b9d715e4c5f212bf04a2418689f448e8045e52a16c8cc4e93a8066d4d651f1eeb918e92
 SHA512 
c12cdc6baba6089576396c4391367451a264d6bfe7dd9a4b582d21ee5bd49aeea79372f3d008a4f2f535af307e0890a8d1a72773bb2c0898872eed8c82e48991
+DIST singularity-3.7.0.tar.gz 6097313 BLAKE2B 
2fa8472bea80fec2613d1598d89354c3655eadee2292f0a4921d680300bc5793c5721f9640aeb398eba6cc91540f132b9d9b2afa175e74ac9f53c8847ff21e13
 SHA512 
25faadd9b1ec4b9751534cf1176f294696c9afde50adbc42f67d86584a5122fc78500e4ac6c502e5d90a66a9b44b9097a4d0231afcc2615b25d95feab8a3c967

diff --git a/sys-cluster/singularity/singularity-3.7.0.ebuild 
b/sys-cluster/singularity/singularity-3.7.0.ebuild
new file mode 100644
index 000..23232305c17
--- /dev/null
+++ b/sys-cluster/singularity/singularity-3.7.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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";
+
+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=(
+   -c "$(tc-getBUILD_CC)" \
+   -x "$(tc-getBUILD_CXX)" \
+   -C "$(tc-getCC)" \
+   -X "$(tc-getCXX)" \
+   --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
+}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2020-10-16 Thread Marek Szuba
commit: c14e1fe381f9427ea537f4be3b2229d5c38281d7
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri Oct 16 11:03:50 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri Oct 16 11:20:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c14e1fe3

sys-cluster/singularity: bump to 3.6.4

Fixes CVE-2020-15229.

Signed-off-by: Marek Szuba  gentoo.org>

 sys-cluster/singularity/Manifest| 2 +-
 .../singularity/{singularity-3.6.3.ebuild => singularity-3.6.4.ebuild}  | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index 7d08c7edc68..11c8215ef1e 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1 +1 @@
-DIST singularity-3.6.3.tar.gz 5935146 BLAKE2B 
ff5c572c016fac36032e595765319dcdff65975f2036da1222b7b74911def0bc85a2cc86ad50cb0994397251e35d629b52b59f9d6894608448d23ceba808db5c
 SHA512 
2c3342197a5075b89eb37bdf9127f9abaf3676f67dae0d164813f94e84f12b9f51f22eafd2e81a82e686622d93f90bcdf6f62c051903a2f122f960d0c116d5b1
+DIST singularity-3.6.4.tar.gz 6183277 BLAKE2B 
9fe9b28828149268506e4db895767528a9397c347905c170e96d8e0d7b9d715e4c5f212bf04a2418689f448e8045e52a16c8cc4e93a8066d4d651f1eeb918e92
 SHA512 
c12cdc6baba6089576396c4391367451a264d6bfe7dd9a4b582d21ee5bd49aeea79372f3d008a4f2f535af307e0890a8d1a72773bb2c0898872eed8c82e48991

diff --git a/sys-cluster/singularity/singularity-3.6.3.ebuild 
b/sys-cluster/singularity/singularity-3.6.4.ebuild
similarity index 100%
rename from sys-cluster/singularity/singularity-3.6.3.ebuild
rename to sys-cluster/singularity/singularity-3.6.4.ebuild



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2020-10-05 Thread Marek Szuba
commit: 48b50da8ccd7882fffb3a9239b7ac9cab6b6cbdc
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Oct  5 12:03:43 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Oct  5 12:03:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48b50da8

sys-cluster/singularity: remove old

Bug: https://bugs.gentoo.org/746431
Signed-off-by: Marek Szuba  gentoo.org>

 sys-cluster/singularity/Manifest |  1 -
 sys-cluster/singularity/singularity-3.6.2.ebuild | 73 
 2 files changed, 74 deletions(-)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index a7981fc7923..7d08c7edc68 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,2 +1 @@
-DIST singularity-3.6.2.tar.gz 5933938 BLAKE2B 
86b79687ef7591a255d01b83e857d87b7ab45aa9a84c40a7c90b493c0fc04cb33ff4f1616f38c5178e22ff1b19d390ab3b96f0fb05d6c66534e60d9ef2d7ea33
 SHA512 
fed2ebd286a3f250d8f4a7677e4bc0b13ec9b2e2eacff91c9a7f6efe6abc766a2d1b713bc291f0239585d5dacd5d4657309ef81eceb77f849f01be934a76499f
 DIST singularity-3.6.3.tar.gz 5935146 BLAKE2B 
ff5c572c016fac36032e595765319dcdff65975f2036da1222b7b74911def0bc85a2cc86ad50cb0994397251e35d629b52b59f9d6894608448d23ceba808db5c
 SHA512 
2c3342197a5075b89eb37bdf9127f9abaf3676f67dae0d164813f94e84f12b9f51f22eafd2e81a82e686622d93f90bcdf6f62c051903a2f122f960d0c116d5b1

diff --git a/sys-cluster/singularity/singularity-3.6.2.ebuild 
b/sys-cluster/singularity/singularity-3.6.2.ebuild
deleted file mode 100644
index 23232305c17..000
--- a/sys-cluster/singularity/singularity-3.6.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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";
-
-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=(
-   -c "$(tc-getBUILD_CC)" \
-   -x "$(tc-getBUILD_CXX)" \
-   -C "$(tc-getCC)" \
-   -X "$(tc-getCXX)" \
-   --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
-}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2020-09-21 Thread Marek Szuba
commit: 915750670aaa9a4fa4d868057e2232b958b8642f
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Sep 21 19:49:35 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Sep 21 20:09:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91575067

sys-cluster/singularity: bump to 3.6.3

Signed-off-by: Marek Szuba  gentoo.org>

 sys-cluster/singularity/Manifest |  1 +
 sys-cluster/singularity/singularity-3.6.3.ebuild | 73 
 2 files changed, 74 insertions(+)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index f7800e563b4..a7981fc7923 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1 +1,2 @@
 DIST singularity-3.6.2.tar.gz 5933938 BLAKE2B 
86b79687ef7591a255d01b83e857d87b7ab45aa9a84c40a7c90b493c0fc04cb33ff4f1616f38c5178e22ff1b19d390ab3b96f0fb05d6c66534e60d9ef2d7ea33
 SHA512 
fed2ebd286a3f250d8f4a7677e4bc0b13ec9b2e2eacff91c9a7f6efe6abc766a2d1b713bc291f0239585d5dacd5d4657309ef81eceb77f849f01be934a76499f
+DIST singularity-3.6.3.tar.gz 5935146 BLAKE2B 
ff5c572c016fac36032e595765319dcdff65975f2036da1222b7b74911def0bc85a2cc86ad50cb0994397251e35d629b52b59f9d6894608448d23ceba808db5c
 SHA512 
2c3342197a5075b89eb37bdf9127f9abaf3676f67dae0d164813f94e84f12b9f51f22eafd2e81a82e686622d93f90bcdf6f62c051903a2f122f960d0c116d5b1

diff --git a/sys-cluster/singularity/singularity-3.6.3.ebuild 
b/sys-cluster/singularity/singularity-3.6.3.ebuild
new file mode 100644
index 000..23232305c17
--- /dev/null
+++ b/sys-cluster/singularity/singularity-3.6.3.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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";
+
+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=(
+   -c "$(tc-getBUILD_CC)" \
+   -x "$(tc-getBUILD_CXX)" \
+   -C "$(tc-getCC)" \
+   -X "$(tc-getCXX)" \
+   --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
+}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2020-09-05 Thread Marek Szuba
commit: 8895632584d0d291b170c0efea0599b707163b63
Author: Marek Szuba  gentoo  org>
AuthorDate: Sat Sep  5 19:37:00 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Sat Sep  5 19:43:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88956325

sys-cluster/singularity: remove old

Signed-off-by: Marek Szuba  gentoo.org>

 sys-cluster/singularity/Manifest |  2 -
 sys-cluster/singularity/singularity-3.6.0.ebuild | 69 --
 sys-cluster/singularity/singularity-3.6.1.ebuild | 73 
 3 files changed, 144 deletions(-)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index 8bd83c7f905..f7800e563b4 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,3 +1 @@
-DIST singularity-3.6.0.tar.gz 6169388 BLAKE2B 
ea07da3d586a96625a1016f9b4aa6b99072c89393dcb7c80aab624807e51fc107eee2629020bf3e1c19d6103544b63aad960d2ac27804fa6e03323a806fdf270
 SHA512 
695f3b4c1bd8cc4049fc3e8e296b369f5aadcd6b4717521b9aca68d997fd8a8c0bf349a2851c31b8a22f37fa010b4c7b93562fd6ac24cdc9699230a182f36d29
-DIST singularity-3.6.1.tar.gz 6170806 BLAKE2B 
fa92bf4df3c2a4ab4345ab0022862f19dde240d7275a79c8433164f02bc495f33d44e4c63b39b9bd3de60361e49fec3f2d258a3bafaadeba34b5d4a7cd3f514e
 SHA512 
3037a14fec086e17b42ee8306624af39fd87c80821c73e0e1ab3d8a717dbdad86237f042d97c6a7870fc6beeced67d6cd52c8e445c41c39cdab7ccce1ce6adb5
 DIST singularity-3.6.2.tar.gz 5933938 BLAKE2B 
86b79687ef7591a255d01b83e857d87b7ab45aa9a84c40a7c90b493c0fc04cb33ff4f1616f38c5178e22ff1b19d390ab3b96f0fb05d6c66534e60d9ef2d7ea33
 SHA512 
fed2ebd286a3f250d8f4a7677e4bc0b13ec9b2e2eacff91c9a7f6efe6abc766a2d1b713bc291f0239585d5dacd5d4657309ef81eceb77f849f01be934a76499f

diff --git a/sys-cluster/singularity/singularity-3.6.0.ebuild 
b/sys-cluster/singularity/singularity-3.6.0.ebuild
deleted file mode 100644
index 202258ead7a..000
--- a/sys-cluster/singularity/singularity-3.6.0.ebuild
+++ /dev/null
@@ -1,69 +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/hpcng/${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.6.1.ebuild 
b/sys-cluster/singularity/singularity-3.6.1.ebuild
deleted file mode 100644
index 23232305c17..000
--- a/sys-cluster/singularity/singularity-3.6.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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";
-
-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}

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2020-09-02 Thread Marek Szuba
commit: 06a1a1f1aa62379219229dad9c1eddfc1dc06088
Author: Marek Szuba  gentoo  org>
AuthorDate: Wed Sep  2 12:17:23 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Sep  2 12:17:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06a1a1f1

sys-cluster/singularity: bump to 3.6.2

Signed-off-by: Marek Szuba  gentoo.org>

 sys-cluster/singularity/Manifest |  1 +
 sys-cluster/singularity/singularity-3.6.2.ebuild | 73 
 2 files changed, 74 insertions(+)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index 6c8131d5a0e..8bd83c7f905 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,2 +1,3 @@
 DIST singularity-3.6.0.tar.gz 6169388 BLAKE2B 
ea07da3d586a96625a1016f9b4aa6b99072c89393dcb7c80aab624807e51fc107eee2629020bf3e1c19d6103544b63aad960d2ac27804fa6e03323a806fdf270
 SHA512 
695f3b4c1bd8cc4049fc3e8e296b369f5aadcd6b4717521b9aca68d997fd8a8c0bf349a2851c31b8a22f37fa010b4c7b93562fd6ac24cdc9699230a182f36d29
 DIST singularity-3.6.1.tar.gz 6170806 BLAKE2B 
fa92bf4df3c2a4ab4345ab0022862f19dde240d7275a79c8433164f02bc495f33d44e4c63b39b9bd3de60361e49fec3f2d258a3bafaadeba34b5d4a7cd3f514e
 SHA512 
3037a14fec086e17b42ee8306624af39fd87c80821c73e0e1ab3d8a717dbdad86237f042d97c6a7870fc6beeced67d6cd52c8e445c41c39cdab7ccce1ce6adb5
+DIST singularity-3.6.2.tar.gz 5933938 BLAKE2B 
86b79687ef7591a255d01b83e857d87b7ab45aa9a84c40a7c90b493c0fc04cb33ff4f1616f38c5178e22ff1b19d390ab3b96f0fb05d6c66534e60d9ef2d7ea33
 SHA512 
fed2ebd286a3f250d8f4a7677e4bc0b13ec9b2e2eacff91c9a7f6efe6abc766a2d1b713bc291f0239585d5dacd5d4657309ef81eceb77f849f01be934a76499f

diff --git a/sys-cluster/singularity/singularity-3.6.2.ebuild 
b/sys-cluster/singularity/singularity-3.6.2.ebuild
new file mode 100644
index 000..23232305c17
--- /dev/null
+++ b/sys-cluster/singularity/singularity-3.6.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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";
+
+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=(
+   -c "$(tc-getBUILD_CC)" \
+   -x "$(tc-getBUILD_CXX)" \
+   -C "$(tc-getCC)" \
+   -X "$(tc-getCXX)" \
+   --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
+}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2020-09-01 Thread Marek Szuba
commit: 66c481508b8f80562cbeb6d66a8d2b8966ebc706
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Sep  1 14:01:51 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Sep  1 14:01:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66c48150

sys-cluster/singularity: honour toolchain values of CC and CXX

Closes: https://bugs.gentoo.org/725748
Signed-off-by: Marek Szuba  gentoo.org>

 sys-cluster/singularity/singularity-3.6.1.ebuild | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/sys-cluster/singularity/singularity-3.6.1.ebuild 
b/sys-cluster/singularity/singularity-3.6.1.ebuild
index 202258ead7a..23232305c17 100644
--- a/sys-cluster/singularity/singularity-3.6.1.ebuild
+++ b/sys-cluster/singularity/singularity-3.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit linux-info
+inherit linux-info toolchain-funcs
 
 DESCRIPTION="Application containers for Linux"
 HOMEPAGE="https://sylabs.io";
@@ -34,6 +34,10 @@ S=${WORKDIR}/${PN}
 
 src_configure() {
local myconfargs=(
+   -c "$(tc-getBUILD_CC)" \
+   -x "$(tc-getBUILD_CXX)" \
+   -C "$(tc-getCC)" \
+   -X "$(tc-getCXX)" \
--prefix=/usr \
--sysconfdir=/etc \
--runstatedir=/run \



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2020-08-24 Thread Marek Szuba
commit: 422a92dcaaf3c892865f744ce9c1de22e797a1c6
Author: Marek Szuba  gentoo  org>
AuthorDate: Mon Aug 24 15:54:16 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Mon Aug 24 17:07:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=422a92dc

sys-cluster/singularity: bump to 3.6.1

Signed-off-by: Marek Szuba  gentoo.org>

 sys-cluster/singularity/Manifest |  1 +
 sys-cluster/singularity/singularity-3.6.1.ebuild | 69 
 2 files changed, 70 insertions(+)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index 92b34c1c6a6..6c8131d5a0e 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1 +1,2 @@
 DIST singularity-3.6.0.tar.gz 6169388 BLAKE2B 
ea07da3d586a96625a1016f9b4aa6b99072c89393dcb7c80aab624807e51fc107eee2629020bf3e1c19d6103544b63aad960d2ac27804fa6e03323a806fdf270
 SHA512 
695f3b4c1bd8cc4049fc3e8e296b369f5aadcd6b4717521b9aca68d997fd8a8c0bf349a2851c31b8a22f37fa010b4c7b93562fd6ac24cdc9699230a182f36d29
+DIST singularity-3.6.1.tar.gz 6170806 BLAKE2B 
fa92bf4df3c2a4ab4345ab0022862f19dde240d7275a79c8433164f02bc495f33d44e4c63b39b9bd3de60361e49fec3f2d258a3bafaadeba34b5d4a7cd3f514e
 SHA512 
3037a14fec086e17b42ee8306624af39fd87c80821c73e0e1ab3d8a717dbdad86237f042d97c6a7870fc6beeced67d6cd52c8e445c41c39cdab7ccce1ce6adb5

diff --git a/sys-cluster/singularity/singularity-3.6.1.ebuild 
b/sys-cluster/singularity/singularity-3.6.1.ebuild
new file mode 100644
index 000..202258ead7a
--- /dev/null
+++ b/sys-cluster/singularity/singularity-3.6.1.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/hpcng/${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
+}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2020-07-21 Thread Marek Szuba
commit: 9169d41c1edfb0eac2cacc5002a86a06b6ffdb08
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Jul 21 15:18:24 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Jul 21 15:18:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9169d41c

sys-cluster/singularity: update upstream GitHub URI

Signed-off-by: Marek Szuba  gentoo.org>

 sys-cluster/singularity/metadata.xml | 2 +-
 sys-cluster/singularity/singularity-3.6.0.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-cluster/singularity/metadata.xml 
b/sys-cluster/singularity/metadata.xml
index 99e731f8f12..420e64d5899 100644
--- a/sys-cluster/singularity/metadata.xml
+++ b/sys-cluster/singularity/metadata.xml
@@ -14,6 +14,6 @@
Install SUID helper binary


-   sylabs/singularity
+   hpcng/singularity

 

diff --git a/sys-cluster/singularity/singularity-3.6.0.ebuild 
b/sys-cluster/singularity/singularity-3.6.0.ebuild
index 16834ae083a..202258ead7a 100644
--- a/sys-cluster/singularity/singularity-3.6.0.ebuild
+++ b/sys-cluster/singularity/singularity-3.6.0.ebuild
@@ -7,7 +7,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";
+SRC_URI="https://github.com/hpcng/${PN}/releases/download/v${PV}/${P}.tar.gz";
 
 SLOT="0"
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2020-07-21 Thread Marek Szuba
commit: 68a897be9f042adae4305c25a90ba9e24ada8409
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Jul 21 15:11:14 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Jul 21 15:14:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68a897be

sys-cluster/singularity: bump to 3.6.0

Signed-off-by: Marek Szuba  gentoo.org>

 sys-cluster/singularity/Manifest |  1 +
 sys-cluster/singularity/singularity-3.6.0.ebuild | 69 
 2 files changed, 70 insertions(+)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index 452f0d8dbf6..c5fb4e10a0a 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,2 +1,3 @@
 DIST singularity-2.6.1.tar.gz 835029 BLAKE2B 
4a581e1bc5df9d664d68f17e275f01081c850aa53f8a9bfcceaf5eb2b8f16e3a018f88669674c7427c60ab00ec0f21b4ec5e6ecaab261c16f70a998cb54ff855
 SHA512 
063327c67dae2629d1decebc060c474a72e6741f6dc9b6373734e429ccf11d53ee55c1578c28e74e8f8bcda87f3e0b735a3a0e982c9ea894f03a31eaaadf617c
 DIST singularity-3.5.3.tar.gz 7885009 BLAKE2B 
8afa2223906e7abf5f3d796efe7cf243dd9d91e61c8ca143a755ad772618ed01d20b7f4a030e82767cf9bf2a7431848d8344e30bde38f413ecd2eef0a9bab53e
 SHA512 
b8bb44539e78eaf74c1b97e5bae8fae1f390412456d76b573fffe2a90240b182db1aec60aee80715547c3edfbaa0607506e2727a575bc951223f9a7c3be0a97e
+DIST singularity-3.6.0.tar.gz 6169388 BLAKE2B 
ea07da3d586a96625a1016f9b4aa6b99072c89393dcb7c80aab624807e51fc107eee2629020bf3e1c19d6103544b63aad960d2ac27804fa6e03323a806fdf270
 SHA512 
695f3b4c1bd8cc4049fc3e8e296b369f5aadcd6b4717521b9aca68d997fd8a8c0bf349a2851c31b8a22f37fa010b4c7b93562fd6ac24cdc9699230a182f36d29

diff --git a/sys-cluster/singularity/singularity-3.6.0.ebuild 
b/sys-cluster/singularity/singularity-3.6.0.ebuild
new file mode 100644
index 000..16834ae083a
--- /dev/null
+++ b/sys-cluster/singularity/singularity-3.6.0.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
+}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2020-07-21 Thread Marek Szuba
commit: a1d07d3e6e764fc0cd01b2f09b0c53c734bccab9
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Jul 21 15:13:36 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Jul 21 15:14:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1d07d3e

sys-cluster/singularity: add self as co-maintainer

Approved by jlec by e-mail.

Signed-off-by: Marek Szuba  gentoo.org>

 sys-cluster/singularity/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/sys-cluster/singularity/metadata.xml 
b/sys-cluster/singularity/metadata.xml
index e7f7edb94ed..99e731f8f12 100644
--- a/sys-cluster/singularity/metadata.xml
+++ b/sys-cluster/singularity/metadata.xml
@@ -5,6 +5,10 @@
j...@gentoo.org
Justin Lecher

+   
+   mare...@gentoo.org
+   Marek Szuba
+   

Install network plug-ins
Install SUID helper binary



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2020-07-21 Thread Marek Szuba
commit: 042d44f63a5f66394ffa94e0e904f5437d349d1f
Author: Marek Szuba  gentoo  org>
AuthorDate: Tue Jul 21 15:14:59 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Tue Jul 21 15:14:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=042d44f6

sys-cluster/singularity: remove old

2.6.1 is ancient and doesn't support Python versions newer than 3.6,
3.5.3 has several known security vulnerabilities.

Bug: https://bugs.gentoo.org/733238
Signed-off-by: Marek Szuba  gentoo.org>

 sys-cluster/singularity/Manifest   |  2 -
 sys-cluster/singularity/singularity-2.6.1.ebuild   | 44 --
 .../singularity/singularity-3.5.3-r1.ebuild| 69 --
 3 files changed, 115 deletions(-)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index c5fb4e10a0a..92b34c1c6a6 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,3 +1 @@
-DIST singularity-2.6.1.tar.gz 835029 BLAKE2B 
4a581e1bc5df9d664d68f17e275f01081c850aa53f8a9bfcceaf5eb2b8f16e3a018f88669674c7427c60ab00ec0f21b4ec5e6ecaab261c16f70a998cb54ff855
 SHA512 
063327c67dae2629d1decebc060c474a72e6741f6dc9b6373734e429ccf11d53ee55c1578c28e74e8f8bcda87f3e0b735a3a0e982c9ea894f03a31eaaadf617c
-DIST singularity-3.5.3.tar.gz 7885009 BLAKE2B 
8afa2223906e7abf5f3d796efe7cf243dd9d91e61c8ca143a755ad772618ed01d20b7f4a030e82767cf9bf2a7431848d8344e30bde38f413ecd2eef0a9bab53e
 SHA512 
b8bb44539e78eaf74c1b97e5bae8fae1f390412456d76b573fffe2a90240b182db1aec60aee80715547c3edfbaa0607506e2727a575bc951223f9a7c3be0a97e
 DIST singularity-3.6.0.tar.gz 6169388 BLAKE2B 
ea07da3d586a96625a1016f9b4aa6b99072c89393dcb7c80aab624807e51fc107eee2629020bf3e1c19d6103544b63aad960d2ac27804fa6e03323a806fdf270
 SHA512 
695f3b4c1bd8cc4049fc3e8e296b369f5aadcd6b4717521b9aca68d997fd8a8c0bf349a2851c31b8a22f37fa010b4c7b93562fd6ac24cdc9699230a182f36d29

diff --git a/sys-cluster/singularity/singularity-2.6.1.ebuild 
b/sys-cluster/singularity/singularity-2.6.1.ebuild
deleted file mode 100644
index 0ae3cb4ae91..000
--- a/sys-cluster/singularity/singularity-2.6.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools eutils python-single-r1
-
-DESCRIPTION="Application containers for Linux"
-HOMEPAGE="https://sylabs.io";
-SRC_URI="https://github.com/${PN}ware/${PN}/releases/download/${PV}/${P}.tar.gz";
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples static-libs +suid"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   sys-fs/squashfs-tools:0
-"
-DEPEND=${PYTHON_DEPS}
-
-src_prepare() {
-   default
-   # automake version hardcoding
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   --with-userns \
-   $(usex suid "" "--disable-suid") \
-   $(use_enable static-libs static)
-}
-
-src_install() {
-   MAKEOPTS+=" -j1"
-   default
-   dodoc README.md CONTRIBUTORS.md CONTRIBUTING.md
-   use examples && dodoc -r examples
-}

diff --git a/sys-cluster/singularity/singularity-3.5.3-r1.ebuild 
b/sys-cluster/singularity/singularity-3.5.3-r1.ebuild
deleted file mode 100644
index 16834ae083a..000
--- a/sys-cluster/singularity/singularity-3.5.3-r1.ebuild
+++ /dev/null
@@ -1,69 +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
-
-   # As of version 3.5.3 this seems to be very much broken, affecting
-   # commands which have got nothing to do with singularity (example:
-   # co

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2020-05-07 Thread Michał Górny
commit: c81305372abefb75f5efdada92815fdfd42c7a43
Author: Michał Górny  gentoo  org>
AuthorDate: Thu May  7 15:19:53 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu May  7 17:58:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8130537

sys-cluster/singularity: Remove py2.7

Signed-off-by: Michał Górny  gentoo.org>

 sys-cluster/singularity/singularity-2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/singularity/singularity-2.6.1.ebuild 
b/sys-cluster/singularity/singularity-2.6.1.ebuild
index 34a5b5315e3..0ae3cb4ae91 100644
--- a/sys-cluster/singularity/singularity-2.6.1.ebuild
+++ b/sys-cluster/singularity/singularity-2.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit autotools eutils python-single-r1
 



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2020-04-24 Thread Marek Szuba
commit: 2c94ad560187ec2a882d9d5805a396e0919e93de
Author: Marek Szuba  gentoo  org>
AuthorDate: Fri Apr 24 14:22:56 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Fri Apr 24 14:25:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c94ad56

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  gentoo.org>

 .../{singularity-3.5.3.ebuild => singularity-3.5.3-r1.ebuild}  | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/sys-cluster/singularity/singularity-3.5.3.ebuild 
b/sys-cluster/singularity/singularity-3.5.3-r1.ebuild
similarity index 69%
rename from sys-cluster/singularity/singularity-3.5.3.ebuild
rename to sys-cluster/singularity/singularity-3.5.3-r1.ebuild
index 2a51a4074fc..16834ae083a 100644
--- a/sys-cluster/singularity/singularity-3.5.3.ebuild
+++ b/sys-cluster/singularity/singularity-3.5.3-r1.ebuild
@@ -52,6 +52,16 @@ 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



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2020-04-16 Thread Marek Szuba
commit: e5faf5a00819f65078cbd18aa6c51f8ddfed55fa
Author: Marek Szuba  gentoo  org>
AuthorDate: Thu Apr 16 16:08:40 2020 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Thu Apr 16 16:35:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5faf5a0

sys-cluster/singularity: bump to 3.5.3

Invoking maintainer time-out on this one, on the one hand we have been
LONG overdue for a bump to major version 3 and on the other 2.6.2 has
apparently got problems with squashfs on newer kernels.

Discussion of dependencies, given some of them are not obvious and
official "install from source" documentation seems to include packages
which are not in fact needed:
 - sys-libs/libseccomp - looked for by mconfig, moreover at least on my
   system singularity binaries end up linked *dynamically* against it;
 - virtual/pkgconfig - used by mconfig while looking for libseccomp;
 - go-1.13+ - this version number is requested in mconfig;
 - app-crypt/gpgme - NOT looked for by mconfig but Singularity does use
   gpgme bindings for Go;
 - dev-libs/openssl - looked for by mconfig;
 - sys-apps/util-linux - libuuid and its header files looked for by mconfig;
 - sys-fs/cryptsetup - looked for by mconfig;
 - sys-fs/squashfs-tools - various tools from this package (e.g. unsquash)
   are invoked at run time, that said I have experimentally confirmed that
   Singularity builds fine without it.

Closes: https://bugs.gentoo.org/694048
Signed-off-by: Marek Szuba  gentoo.org>

 sys-cluster/singularity/Manifest |  1 +
 sys-cluster/singularity/metadata.xml |  6 ++-
 sys-cluster/singularity/singularity-3.5.3.ebuild | 59 
 3 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index db1918daa9c..452f0d8dbf6 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1 +1,2 @@
 DIST singularity-2.6.1.tar.gz 835029 BLAKE2B 
4a581e1bc5df9d664d68f17e275f01081c850aa53f8a9bfcceaf5eb2b8f16e3a018f88669674c7427c60ab00ec0f21b4ec5e6ecaab261c16f70a998cb54ff855
 SHA512 
063327c67dae2629d1decebc060c474a72e6741f6dc9b6373734e429ccf11d53ee55c1578c28e74e8f8bcda87f3e0b735a3a0e982c9ea894f03a31eaaadf617c
+DIST singularity-3.5.3.tar.gz 7885009 BLAKE2B 
8afa2223906e7abf5f3d796efe7cf243dd9d91e61c8ca143a755ad772618ed01d20b7f4a030e82767cf9bf2a7431848d8344e30bde38f413ecd2eef0a9bab53e
 SHA512 
b8bb44539e78eaf74c1b97e5bae8fae1f390412456d76b573fffe2a90240b182db1aec60aee80715547c3edfbaa0607506e2727a575bc951223f9a7c3be0a97e

diff --git a/sys-cluster/singularity/metadata.xml 
b/sys-cluster/singularity/metadata.xml
index f4750025819..e7f7edb94ed 100644
--- a/sys-cluster/singularity/metadata.xml
+++ b/sys-cluster/singularity/metadata.xml
@@ -5,7 +5,11 @@
j...@gentoo.org
Justin Lecher

+   
+   Install network plug-ins
+   Install SUID helper binary
+   

-   singularityware/singularity
+   sylabs/singularity

 

diff --git a/sys-cluster/singularity/singularity-3.5.3.ebuild 
b/sys-cluster/singularity/singularity-3.5.3.ebuild
new file mode 100644
index 000..2a51a4074fc
--- /dev/null
+++ b/sys-cluster/singularity/singularity-3.5.3.ebuild
@@ -0,0 +1,59 @@
+# 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
+}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2019-08-13 Thread Michał Górny
commit: 471af535670373feadf80c45324c8d5319a4d349
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Aug 13 07:33:38 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Aug 13 07:33:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=471af535

sys-cluster/singularity: Add missing PYTHON_*

Signed-off-by: Michał Górny  gentoo.org>

 sys-cluster/singularity/singularity-2.6.1.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sys-cluster/singularity/singularity-2.6.1.ebuild 
b/sys-cluster/singularity/singularity-2.6.1.ebuild
index bdcaaff53b5..a9de088a657 100644
--- a/sys-cluster/singularity/singularity-2.6.1.ebuild
+++ b/sys-cluster/singularity/singularity-2.6.1.ebuild
@@ -15,10 +15,13 @@ SLOT="0"
 LICENSE="BSD"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples static-libs +suid"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="
+   ${PYTHON_DEPS}
sys-fs/squashfs-tools:0
 "
+DEPEND=${PYTHON_DEPS}
 
 src_prepare() {
default



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/files/, sys-cluster/singularity/

2019-07-08 Thread Justin Lecher
commit: e5282d8147687f9785ac63d6d050995492cebaad
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Jul  8 12:23:22 2019 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Jul  8 19:35:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5282d81

sys-cluster/singularity: Version Bump & drop vulnerable version

https://bugs.gentoo.org/657020

Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Justin Lecher  gentoo.org>

 sys-cluster/singularity/Manifest   |  4 +-
 .../files/singularity-2.3.1-slurm.patch| 54 --
 sys-cluster/singularity/metadata.xml   |  5 --
 sys-cluster/singularity/singularity-2.3.1.ebuild   | 48 ---
 sys-cluster/singularity/singularity-2.4.ebuild | 42 -
 ...arity-2.4.2.ebuild => singularity-2.6.1.ebuild} |  7 ++-
 6 files changed, 4 insertions(+), 156 deletions(-)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index 75ba6269d6f..db1918daa9c 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,3 +1 @@
-DIST singularity-2.3.1.tar.gz 643021 BLAKE2B 
4c5648330005af22515435d5daf4a27e39b79cfa52de36bdc48b63877b703329f36c81f782c1e9d8394b6668e8503961ef682d5bd71f48f665b3691df8f70a93
 SHA512 
36c581e8dba57d133013c2fcfea26886b54a1a9a9165b011d2cebacb2a6249fe0f8e5aa91ed90f7a18855c658300682436c431a226629408f31422cc8a036600
-DIST singularity-2.4.2.tar.gz 691214 BLAKE2B 
c82f48d20d0a0b6e8086e275fa1621b0e3cae5ecd515719543d69f0ba286f3c09d9fc479e8be3b78921ef32014325dcb5482d2ce813e4388db683a408d27e3a7
 SHA512 
2c26af6cd092bc030113cdb2a79430d82d51b7438330a6cd0706e46438296feed4d86b08d57efff0b7df148ca0e08f706b8a214f03439bccd7d196714cd06dbc
-DIST singularity-2.4.tar.gz 689760 BLAKE2B 
03ec88405bb1316ae3098c8ec9620f7e0dac8417b10c7d20cf0411983f0089e8e32e58a4e2ca5c4c40aeebaf044cc3d45261d5635146de6b043f33f92871a227
 SHA512 
b445e73d9794f344ab72ce17d8f802390d0c0c153791b837f416254eadabf19365f1abd29f0b498be5486b600f32cd7fe53e5dc131eee3465ab890c9d6b171f4
+DIST singularity-2.6.1.tar.gz 835029 BLAKE2B 
4a581e1bc5df9d664d68f17e275f01081c850aa53f8a9bfcceaf5eb2b8f16e3a018f88669674c7427c60ab00ec0f21b4ec5e6ecaab261c16f70a998cb54ff855
 SHA512 
063327c67dae2629d1decebc060c474a72e6741f6dc9b6373734e429ccf11d53ee55c1578c28e74e8f8bcda87f3e0b735a3a0e982c9ea894f03a31eaaadf617c

diff --git a/sys-cluster/singularity/files/singularity-2.3.1-slurm.patch 
b/sys-cluster/singularity/files/singularity-2.3.1-slurm.patch
deleted file mode 100644
index 71a8d9972b7..000
--- a/sys-cluster/singularity/files/singularity-2.3.1-slurm.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From e858cfaf73eadb4cf4076a754c4836816c908d44 Mon Sep 17 00:00:00 2001
-From: Petr Votava 
-Date: Thu, 29 Jun 2017 16:53:48 +
-Subject: [PATCH] A patch for slurm plugin build
-

- src/slurm/Makefile.am   | 2 +-
- src/slurm/singularity.c | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/slurm/Makefile.am b/src/slurm/Makefile.am
-index 860c7667d..152e41450 100644
 a/src/slurm/Makefile.am
-+++ b/src/slurm/Makefile.am
-@@ -4,7 +4,7 @@ plugindir = $(libdir)/slurm
- if WITH_SLURM
- plugin_LTLIBRARIES = singularity_spank.la
- singularity_spank_la_SOURCES = singularity.c
--singularity_spank_la_LIBADD = ../lib/libsingularity_internal.la
-+singularity_spank_la_LIBADD = ../lib/runtime/libinternal.la
- singularity_spank_la_LDFLAGS = -module -no-undefined -avoid-version 
-export-symbols-regex '^slurm_spank_|^plugin_'
- endif
- 
-diff --git a/src/slurm/singularity.c b/src/slurm/singularity.c
-index acfd1..3509f4d8e 100644
 a/src/slurm/singularity.c
-+++ b/src/slurm/singularity.c
-@@ -22,6 +22,7 @@
- 
- #define _GNU_SOURCE 1
- 
-+#include 
- #include 
- #include 
- #include 
-@@ -29,9 +30,9 @@
- #include 
- 
- #include "config.h"
--#include "lib/singularity.h"
- #include "util/util.h"
- #include "util/file.h"
-+#include "util/registry.h"
- 
- #include "slurm/spank.h"
- 
-@@ -169,7 +170,6 @@ static int setup_container(spank_t spank)
- }
- 
- 
--char *image;
- if ( ( image = singularity_registry_get("IMAGE") ) == NULL ) {
- singularity_message(ERROR, "SINGULARITY_CONTAINER not defined!\n");
- }

diff --git a/sys-cluster/singularity/metadata.xml 
b/sys-cluster/singularity/metadata.xml
index bb97aa8832e..f4750025819 100644
--- a/sys-cluster/singularity/metadata.xml
+++ b/sys-cluster/singularity/metadata.xml
@@ -8,9 +8,4 @@

singularityware/singularity

-   
-   
-   Compile spank plugin for sys-cluster/slurm
-   
-   
 

diff --git a/sys-cluster/singularity/singularity-2.3.1.ebuild 
b/sys-cluster/singularity/singularity-2.3.1.ebuild
deleted file mode 100644
index c072830a2c1..000
--- a/sys-cluster/singularity/singularity-2.3.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distri

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2018-01-06 Thread Justin Lecher
commit: bae8b4030885dd66f48979f20f8a4cbd3b14deda
Author: Bertrand Néron  gmail  com>
AuthorDate: Sat Jan  6 18:52:12 2018 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Jan  6 21:28:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bae8b403

sys-cluster/singularity: version bump to 2.4.2

Package-Manager: Portage-2.3.13, Repoman-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/6773
Signed-off-by: Justin Lecher  gentoo.org>

 sys-cluster/singularity/Manifest |  1 +
 sys-cluster/singularity/singularity-2.4.2.ebuild | 42 
 2 files changed, 43 insertions(+)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index c7ff31c7111..75ba6269d6f 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,2 +1,3 @@
 DIST singularity-2.3.1.tar.gz 643021 BLAKE2B 
4c5648330005af22515435d5daf4a27e39b79cfa52de36bdc48b63877b703329f36c81f782c1e9d8394b6668e8503961ef682d5bd71f48f665b3691df8f70a93
 SHA512 
36c581e8dba57d133013c2fcfea26886b54a1a9a9165b011d2cebacb2a6249fe0f8e5aa91ed90f7a18855c658300682436c431a226629408f31422cc8a036600
+DIST singularity-2.4.2.tar.gz 691214 BLAKE2B 
c82f48d20d0a0b6e8086e275fa1621b0e3cae5ecd515719543d69f0ba286f3c09d9fc479e8be3b78921ef32014325dcb5482d2ce813e4388db683a408d27e3a7
 SHA512 
2c26af6cd092bc030113cdb2a79430d82d51b7438330a6cd0706e46438296feed4d86b08d57efff0b7df148ca0e08f706b8a214f03439bccd7d196714cd06dbc
 DIST singularity-2.4.tar.gz 689760 BLAKE2B 
03ec88405bb1316ae3098c8ec9620f7e0dac8417b10c7d20cf0411983f0089e8e32e58a4e2ca5c4c40aeebaf044cc3d45261d5635146de6b043f33f92871a227
 SHA512 
b445e73d9794f344ab72ce17d8f802390d0c0c153791b837f416254eadabf19365f1abd29f0b498be5486b600f32cd7fe53e5dc131eee3465ab890c9d6b171f4

diff --git a/sys-cluster/singularity/singularity-2.4.2.ebuild 
b/sys-cluster/singularity/singularity-2.4.2.ebuild
new file mode 100644
index 000..458dfc186eb
--- /dev/null
+++ b/sys-cluster/singularity/singularity-2.4.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit autotools eutils python-single-r1
+
+DESCRIPTION="Application containers for Linux"
+HOMEPAGE="http://singularity.lbl.gov/";
+SRC_URI="https://github.com/${PN}ware/${PN}/releases/download/${PV}/${P}.tar.gz";
+
+SLOT="0"
+LICENSE="cctbx-2.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples static-libs +suid"
+
+RDEPEND="
+   sys-fs/squashfs-tools:0
+"
+
+src_prepare() {
+   default
+   # automake version hardcoding
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   --with-userns \
+   $(usex suid "" "--disable-suid") \
+   $(use_enable static-libs static)
+}
+
+src_install() {
+   MAKEOPTS+=" -j1"
+   default
+   prune_libtool_files
+   dodoc README.md CONTRIBUTORS.md CONTRIBUTING.md
+   use examples && dodoc -r examples
+}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/files/

2017-12-12 Thread Patrice Clement
commit: 6d59aa48b236a8016d8c601b89b252e55c917378
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sat Dec  2 08:04:53 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Dec 12 20:14:52 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d59aa48

sys-cluster/singularity: remove unused patch.

 .../files/singularity-2.2.1-glibc-2.25.patch   | 28 --
 1 file changed, 28 deletions(-)

diff --git a/sys-cluster/singularity/files/singularity-2.2.1-glibc-2.25.patch 
b/sys-cluster/singularity/files/singularity-2.2.1-glibc-2.25.patch
deleted file mode 100644
index e550811dc67..000
--- a/sys-cluster/singularity/files/singularity-2.2.1-glibc-2.25.patch
+++ /dev/null
@@ -1,28 +0,0 @@
- src/lib/loop-control.c  | 1 +
- src/lib/mount/dev/dev.c | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/lib/loop-control.c b/src/lib/loop-control.c
-index f9ab2d6f..4bfed843 100644
 a/src/lib/loop-control.c
-+++ b/src/lib/loop-control.c
-@@ -26,6 +26,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include  
- #include 
- #include 
-diff --git a/src/lib/mount/dev/dev.c b/src/lib/mount/dev/dev.c
-index 547157a4..c994c264 100644
 a/src/lib/mount/dev/dev.c
-+++ b/src/lib/mount/dev/dev.c
-@@ -25,6 +25,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- 



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2017-10-29 Thread Justin Lecher
commit: 74c578313c84b190b77409d1619f6659e2b22d43
Author: Justin Lecher  gentoo  org>
AuthorDate: Sun Oct 29 11:45:06 2017 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Oct 29 12:03:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74c57831

sys-cluster/singularity: Add missing runtime dep

Closes: https://bugs.gentoo.org/635342
Package-Manager: Portage-2.3.12, Repoman-2.3.3
Signed-off-by: Justin Lecher  gentoo.org>

 sys-cluster/singularity/singularity-2.4.ebuild | 4 
 1 file changed, 4 insertions(+)

diff --git a/sys-cluster/singularity/singularity-2.4.ebuild 
b/sys-cluster/singularity/singularity-2.4.ebuild
index 904c3ca6693..b897f939dd0 100644
--- a/sys-cluster/singularity/singularity-2.4.ebuild
+++ b/sys-cluster/singularity/singularity-2.4.ebuild
@@ -16,6 +16,10 @@ LICENSE="cctbx-2.0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples static-libs +suid"
 
+RDEPEND="
+   sys-fs/squashfs-tools:0
+"
+
 src_prepare() {
default
# automake version hardcoding



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2017-10-22 Thread Justin Lecher
commit: bdd723ce13376fd82c3e01e89225e0abe3e92324
Author: Justin Lecher  gentoo  org>
AuthorDate: Sat Oct 21 11:31:50 2017 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Oct 22 11:23:53 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdd723ce

sys-cluster/singularity: Drop vulnerable version

Package-Manager: Portage-2.3.10, Repoman-2.3.3
Signed-off-by: Justin Lecher  gentoo.org>

 sys-cluster/singularity/Manifest |  1 -
 sys-cluster/singularity/singularity-2.2.1.ebuild | 31 
 2 files changed, 32 deletions(-)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index 9778f42b461..dd9f2e52a62 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,3 +1,2 @@
-DIST singularity-2.2.1.tar.gz 493368 SHA256 
0e2a0b0cf6c8d4dc041365f715b2df157e0d8d89986e4eb111c61716df031c8a SHA512 
b1195e98254957cd8d80b35b13d4f11060c5836f05ed450d242544fc30f8c298b837ba8986b1184288bc9a5ff2ebb5b1f56dc55a0686b540242b0042a152f902
 WHIRLPOOL 
3d3c5cb0928bd5beb683c4075c88453d076795c0e41ad30676f7169ccbd6d71a70ad64104833925913138f47b8fc318e90366af79259a05bad41bb0a42703b05
 DIST singularity-2.3.1.tar.gz 643021 SHA256 
dcccae9ff67a550d142c94e932c0fb59442dd59ae69ce1deeb7ba45829ef2cd7 SHA512 
36c581e8dba57d133013c2fcfea26886b54a1a9a9165b011d2cebacb2a6249fe0f8e5aa91ed90f7a18855c658300682436c431a226629408f31422cc8a036600
 WHIRLPOOL 
d9bb8604ce2afb6bb2b5b257eb88276a93987916cd4c08ecc800d98761f5d1ae54e48ed615d77b1c992bcc8bb6202e9bf5e04637d10d1126fba6d1c2619cb98c
 DIST singularity-2.4.tar.gz 689760 SHA256 
34ca94250f15354819587364b21b0fdf7eebcff05110f8443caae8ed6961d7da SHA512 
b445e73d9794f344ab72ce17d8f802390d0c0c153791b837f416254eadabf19365f1abd29f0b498be5486b600f32cd7fe53e5dc131eee3465ab890c9d6b171f4
 WHIRLPOOL 
5434f8da66b3863a0c45d17dbe716231b4f04587907ecd608f92d5becb2e34ae599cfebce2a6768a0745fc00ca70297ba7ca9e7370e7080139c8e3eca2b5428d

diff --git a/sys-cluster/singularity/singularity-2.2.1.ebuild 
b/sys-cluster/singularity/singularity-2.2.1.ebuild
deleted file mode 100644
index 0d679f703fe..000
--- a/sys-cluster/singularity/singularity-2.2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="Application containers for Linux"
-HOMEPAGE="http://singularity.lbl.gov/";
-SRC_URI="https://github.com/${PN}ware/${PN}/releases/download/${PV}/${P}.tar.gz";
-
-SLOT="0"
-LICENSE="cctbx-2.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-glibc-2.25.patch
-)
-
-src_configure() {
-   econf --with-userns
-}
-
-src_install() {
-   MAKEOPTS+=" -j1"
-   default
-   prune_libtool_files
-   dodoc ChangeLog
-   use examples && dodoc -r examples
-}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2017-10-21 Thread Justin Lecher
commit: 47d9c615fd8f300d8c2c2b1576a2a268e4c6bdc7
Author: Justin Lecher  gentoo  org>
AuthorDate: Sat Oct 21 08:35:16 2017 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sat Oct 21 08:41:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47d9c615

sys-cluster/singularity: Version Bump

Closes: https://bugs.gentoo.org/631504
Package-Manager: Portage-2.3.10, Repoman-2.3.3
Signed-off-by: Justin Lecher  gentoo.org>

 sys-cluster/singularity/Manifest   |  1 +
 sys-cluster/singularity/singularity-2.4.ebuild | 38 ++
 2 files changed, 39 insertions(+)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index a5f4dc4fadc..9778f42b461 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1,2 +1,3 @@
 DIST singularity-2.2.1.tar.gz 493368 SHA256 
0e2a0b0cf6c8d4dc041365f715b2df157e0d8d89986e4eb111c61716df031c8a SHA512 
b1195e98254957cd8d80b35b13d4f11060c5836f05ed450d242544fc30f8c298b837ba8986b1184288bc9a5ff2ebb5b1f56dc55a0686b540242b0042a152f902
 WHIRLPOOL 
3d3c5cb0928bd5beb683c4075c88453d076795c0e41ad30676f7169ccbd6d71a70ad64104833925913138f47b8fc318e90366af79259a05bad41bb0a42703b05
 DIST singularity-2.3.1.tar.gz 643021 SHA256 
dcccae9ff67a550d142c94e932c0fb59442dd59ae69ce1deeb7ba45829ef2cd7 SHA512 
36c581e8dba57d133013c2fcfea26886b54a1a9a9165b011d2cebacb2a6249fe0f8e5aa91ed90f7a18855c658300682436c431a226629408f31422cc8a036600
 WHIRLPOOL 
d9bb8604ce2afb6bb2b5b257eb88276a93987916cd4c08ecc800d98761f5d1ae54e48ed615d77b1c992bcc8bb6202e9bf5e04637d10d1126fba6d1c2619cb98c
+DIST singularity-2.4.tar.gz 689760 SHA256 
34ca94250f15354819587364b21b0fdf7eebcff05110f8443caae8ed6961d7da SHA512 
b445e73d9794f344ab72ce17d8f802390d0c0c153791b837f416254eadabf19365f1abd29f0b498be5486b600f32cd7fe53e5dc131eee3465ab890c9d6b171f4
 WHIRLPOOL 
5434f8da66b3863a0c45d17dbe716231b4f04587907ecd608f92d5becb2e34ae599cfebce2a6768a0745fc00ca70297ba7ca9e7370e7080139c8e3eca2b5428d

diff --git a/sys-cluster/singularity/singularity-2.4.ebuild 
b/sys-cluster/singularity/singularity-2.4.ebuild
new file mode 100644
index 000..904c3ca6693
--- /dev/null
+++ b/sys-cluster/singularity/singularity-2.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit autotools eutils python-single-r1
+
+DESCRIPTION="Application containers for Linux"
+HOMEPAGE="http://singularity.lbl.gov/";
+SRC_URI="https://github.com/${PN}ware/${PN}/releases/download/${PV}/${P}.tar.gz";
+
+SLOT="0"
+LICENSE="cctbx-2.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples static-libs +suid"
+
+src_prepare() {
+   default
+   # automake version hardcoding
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   --with-userns \
+   $(usex suid "" "--disable-suid") \
+   $(use_enable static-libs static)
+}
+
+src_install() {
+   MAKEOPTS+=" -j1"
+   default
+   prune_libtool_files
+   dodoc ChangeLog CONTRIBUTORS.md CONTRIBUTING.md
+   use examples && dodoc -r examples
+}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2017-07-10 Thread Justin Lecher
commit: 4d709fa18d84fbd45e72fc635069d2f9172851e7
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Jul 10 19:07:05 2017 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Jul 10 19:07:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d709fa1

sys-cluster/singularity: Conditionally depend on slurm

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=624386
Package-Manager: Portage-2.3.6-prefix, Repoman-2.3.2
Signed-off-by: Justin Lecher  gentoo.org>

 sys-cluster/singularity/singularity-2.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/singularity/singularity-2.3.1.ebuild 
b/sys-cluster/singularity/singularity-2.3.1.ebuild
index 235fb892343..68fad22fedf 100644
--- a/sys-cluster/singularity/singularity-2.3.1.ebuild
+++ b/sys-cluster/singularity/singularity-2.3.1.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples slurm static-libs +suid"
 
 RDEPEND="
-   sys-cluster/slurm
+   slurm? ( sys-cluster/slurm )
 "
 DEPEND="${RDEPEND}"
 



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/files/, sys-cluster/singularity/

2017-07-09 Thread Justin Lecher
commit: e48d15c0567348bce2ea174432a066ddfc4f3de5
Author: Justin Lecher  gentoo  org>
AuthorDate: Sun Jul  9 18:48:16 2017 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Jul  9 18:48:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e48d15c0

sys-cluster/singularity: Version Bump

Closes: https://github.com/gentoo/gentoo/pull/5005

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=621248
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Signed-off-by: Justin Lecher  gentoo.org>

 sys-cluster/singularity/Manifest   |  1 +
 .../files/singularity-2.3.1-slurm.patch| 54 ++
 sys-cluster/singularity/metadata.xml   |  5 ++
 sys-cluster/singularity/singularity-2.3.1.ebuild   | 48 +++
 4 files changed, 108 insertions(+)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index 8ac63cfcb31..a5f4dc4fadc 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1 +1,2 @@
 DIST singularity-2.2.1.tar.gz 493368 SHA256 
0e2a0b0cf6c8d4dc041365f715b2df157e0d8d89986e4eb111c61716df031c8a SHA512 
b1195e98254957cd8d80b35b13d4f11060c5836f05ed450d242544fc30f8c298b837ba8986b1184288bc9a5ff2ebb5b1f56dc55a0686b540242b0042a152f902
 WHIRLPOOL 
3d3c5cb0928bd5beb683c4075c88453d076795c0e41ad30676f7169ccbd6d71a70ad64104833925913138f47b8fc318e90366af79259a05bad41bb0a42703b05
+DIST singularity-2.3.1.tar.gz 643021 SHA256 
dcccae9ff67a550d142c94e932c0fb59442dd59ae69ce1deeb7ba45829ef2cd7 SHA512 
36c581e8dba57d133013c2fcfea26886b54a1a9a9165b011d2cebacb2a6249fe0f8e5aa91ed90f7a18855c658300682436c431a226629408f31422cc8a036600
 WHIRLPOOL 
d9bb8604ce2afb6bb2b5b257eb88276a93987916cd4c08ecc800d98761f5d1ae54e48ed615d77b1c992bcc8bb6202e9bf5e04637d10d1126fba6d1c2619cb98c

diff --git a/sys-cluster/singularity/files/singularity-2.3.1-slurm.patch 
b/sys-cluster/singularity/files/singularity-2.3.1-slurm.patch
new file mode 100644
index 000..71a8d9972b7
--- /dev/null
+++ b/sys-cluster/singularity/files/singularity-2.3.1-slurm.patch
@@ -0,0 +1,54 @@
+From e858cfaf73eadb4cf4076a754c4836816c908d44 Mon Sep 17 00:00:00 2001
+From: Petr Votava 
+Date: Thu, 29 Jun 2017 16:53:48 +
+Subject: [PATCH] A patch for slurm plugin build
+
+---
+ src/slurm/Makefile.am   | 2 +-
+ src/slurm/singularity.c | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/slurm/Makefile.am b/src/slurm/Makefile.am
+index 860c7667d..152e41450 100644
+--- a/src/slurm/Makefile.am
 b/src/slurm/Makefile.am
+@@ -4,7 +4,7 @@ plugindir = $(libdir)/slurm
+ if WITH_SLURM
+ plugin_LTLIBRARIES = singularity_spank.la
+ singularity_spank_la_SOURCES = singularity.c
+-singularity_spank_la_LIBADD = ../lib/libsingularity_internal.la
++singularity_spank_la_LIBADD = ../lib/runtime/libinternal.la
+ singularity_spank_la_LDFLAGS = -module -no-undefined -avoid-version 
-export-symbols-regex '^slurm_spank_|^plugin_'
+ endif
+ 
+diff --git a/src/slurm/singularity.c b/src/slurm/singularity.c
+index acfd1..3509f4d8e 100644
+--- a/src/slurm/singularity.c
 b/src/slurm/singularity.c
+@@ -22,6 +22,7 @@
+ 
+ #define _GNU_SOURCE 1
+ 
++#include 
+ #include 
+ #include 
+ #include 
+@@ -29,9 +30,9 @@
+ #include 
+ 
+ #include "config.h"
+-#include "lib/singularity.h"
+ #include "util/util.h"
+ #include "util/file.h"
++#include "util/registry.h"
+ 
+ #include "slurm/spank.h"
+ 
+@@ -169,7 +170,6 @@ static int setup_container(spank_t spank)
+ }
+ 
+ 
+-char *image;
+ if ( ( image = singularity_registry_get("IMAGE") ) == NULL ) {
+ singularity_message(ERROR, "SINGULARITY_CONTAINER not defined!\n");
+ }

diff --git a/sys-cluster/singularity/metadata.xml 
b/sys-cluster/singularity/metadata.xml
index f4750025819..bb97aa8832e 100644
--- a/sys-cluster/singularity/metadata.xml
+++ b/sys-cluster/singularity/metadata.xml
@@ -8,4 +8,9 @@

singularityware/singularity

+   
+   
+   Compile spank plugin for sys-cluster/slurm
+   
+   
 

diff --git a/sys-cluster/singularity/singularity-2.3.1.ebuild 
b/sys-cluster/singularity/singularity-2.3.1.ebuild
new file mode 100644
index 000..235fb892343
--- /dev/null
+++ b/sys-cluster/singularity/singularity-2.3.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit autotools eutils python-single-r1
+
+DESCRIPTION="Application containers for Linux"
+HOMEPAGE="http://singularity.lbl.gov/";
+SRC_URI="https://github.com/${PN}ware/${PN}/releases/download/${PV}/${P}.tar.gz";
+
+SLOT="0"
+LICENSE="cctbx-2.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples slurm static-libs +suid"
+
+RDEPEND="
+   sys-cluster/slurm
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-slurm.patch
+)
+
+src_prepa

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/files/, sys-cluster/singularity/

2017-04-30 Thread Justin Lecher
commit: 57ccd5f44dfedde8cbbff4637205d6d9c6667680
Author: Justin Lecher  gentoo  org>
AuthorDate: Sun Apr 30 11:00:58 2017 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Apr 30 11:01:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57ccd5f4

sys-cluster/singularity: Version Bump

Fix for glibc-2.25

https://github.com/singularityware/singularity/pull/648
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=617082
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Signed-off-by: Justin Lecher  gentoo.org>

 sys-cluster/singularity/Manifest   |  2 +-
 .../files/singularity-2.2.1-glibc-2.25.patch   | 28 ++
 sys-cluster/singularity/metadata.xml   |  2 +-
 ...ularity-2.2.ebuild => singularity-2.2.1.ebuild} |  6 -
 4 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index 19aacc06202..8ac63cfcb31 100644
--- a/sys-cluster/singularity/Manifest
+++ b/sys-cluster/singularity/Manifest
@@ -1 +1 @@
-DIST singularity-2.2.tar.gz 492273 SHA256 
3dcb23300d6a5a248659880cbcd98a073bc4a49d19c279ba0460256ed480f3e9 SHA512 
ae22a2a33dd7d013f4fd12e751d83aeaf3b0acfe98d79d4f827e1380703cc17e624b67afde1f8af6e5a762d493a8748d073570133207b82db8f8e3483055379b
 WHIRLPOOL 
d7f5eed1515599086082c3877648ef1bacfa5e88441cc5f20736a56065f8b4f60778b3c4f2fef035cb00339a8a4cd8cba05ae6e1dc76fde8eae16b07ecd34952
+DIST singularity-2.2.1.tar.gz 493368 SHA256 
0e2a0b0cf6c8d4dc041365f715b2df157e0d8d89986e4eb111c61716df031c8a SHA512 
b1195e98254957cd8d80b35b13d4f11060c5836f05ed450d242544fc30f8c298b837ba8986b1184288bc9a5ff2ebb5b1f56dc55a0686b540242b0042a152f902
 WHIRLPOOL 
3d3c5cb0928bd5beb683c4075c88453d076795c0e41ad30676f7169ccbd6d71a70ad64104833925913138f47b8fc318e90366af79259a05bad41bb0a42703b05

diff --git a/sys-cluster/singularity/files/singularity-2.2.1-glibc-2.25.patch 
b/sys-cluster/singularity/files/singularity-2.2.1-glibc-2.25.patch
new file mode 100644
index 000..e550811dc67
--- /dev/null
+++ b/sys-cluster/singularity/files/singularity-2.2.1-glibc-2.25.patch
@@ -0,0 +1,28 @@
+ src/lib/loop-control.c  | 1 +
+ src/lib/mount/dev/dev.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/lib/loop-control.c b/src/lib/loop-control.c
+index f9ab2d6f..4bfed843 100644
+--- a/src/lib/loop-control.c
 b/src/lib/loop-control.c
+@@ -26,6 +26,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include  
+ #include 
+ #include 
+diff --git a/src/lib/mount/dev/dev.c b/src/lib/mount/dev/dev.c
+index 547157a4..c994c264 100644
+--- a/src/lib/mount/dev/dev.c
 b/src/lib/mount/dev/dev.c
+@@ -25,6 +25,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ 

diff --git a/sys-cluster/singularity/metadata.xml 
b/sys-cluster/singularity/metadata.xml
index e06fcd257fe..f4750025819 100644
--- a/sys-cluster/singularity/metadata.xml
+++ b/sys-cluster/singularity/metadata.xml
@@ -1,4 +1,4 @@
-
+
 http://www.gentoo.org/dtd/metadata.dtd";>
 


diff --git a/sys-cluster/singularity/singularity-2.2.ebuild 
b/sys-cluster/singularity/singularity-2.2.1.ebuild
similarity index 85%
rename from sys-cluster/singularity/singularity-2.2.ebuild
rename to sys-cluster/singularity/singularity-2.2.1.ebuild
index 4ffbb268f80..0d679f703fe 100644
--- a/sys-cluster/singularity/singularity-2.2.ebuild
+++ b/sys-cluster/singularity/singularity-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,6 +14,10 @@ LICENSE="cctbx-2.0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
+PATCHES=(
+   "${FILESDIR}"/${P}-glibc-2.25.patch
+)
+
 src_configure() {
econf --with-userns
 }



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2016-11-13 Thread Justin Lecher
commit: ab7f4ea5a5ecae6e232866a46d49c1b6c6ffc5e7
Author: Justin Lecher  gentoo  org>
AuthorDate: Sun Nov 13 09:42:30 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Sun Nov 13 18:15:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab7f4ea5

sys-cluster/singularity: Correct license

Package-Manager: portage-2.3.2
Signed-off-by: Justin Lecher  gentoo.org>

 sys-cluster/singularity/singularity-2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-cluster/singularity/singularity-2.2.ebuild 
b/sys-cluster/singularity/singularity-2.2.ebuild
index 011f063..adf27e4 100644
--- a/sys-cluster/singularity/singularity-2.2.ebuild
+++ b/sys-cluster/singularity/singularity-2.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://singularity.lbl.gov/";
 
SRC_URI="https://github.com/${PN}ware/${PN}/releases/download/${PV}/${P}.tar.gz";
 
 SLOT="0"
-LICENSE="BSD"
+LICENSE="cctbx-2.0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2016-11-11 Thread Justin Lecher
commit: 1089e25a13c2c425ad3fbb9b0a72619b567462a9
Author: Justin Lecher  gentoo  org>
AuthorDate: Fri Nov 11 08:46:44 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Fri Nov 11 08:46:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1089e25a

sys-cluster/singularity: New package, ebuild written by me

Package-Manager: portage-2.3.2
Signed-off-by: Justin Lecher  gentoo.org>

 sys-cluster/singularity/Manifest   |  1 +
 sys-cluster/singularity/metadata.xml   |  8 
 sys-cluster/singularity/singularity-2.2.ebuild | 25 +
 3 files changed, 34 insertions(+)

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
new file mode 100644
index ..19aacc0
--- /dev/null
+++ b/sys-cluster/singularity/Manifest
@@ -0,0 +1 @@
+DIST singularity-2.2.tar.gz 492273 SHA256 
3dcb23300d6a5a248659880cbcd98a073bc4a49d19c279ba0460256ed480f3e9 SHA512 
ae22a2a33dd7d013f4fd12e751d83aeaf3b0acfe98d79d4f827e1380703cc17e624b67afde1f8af6e5a762d493a8748d073570133207b82db8f8e3483055379b
 WHIRLPOOL 
d7f5eed1515599086082c3877648ef1bacfa5e88441cc5f20736a56065f8b4f60778b3c4f2fef035cb00339a8a4cd8cba05ae6e1dc76fde8eae16b07ecd34952

diff --git a/sys-cluster/singularity/metadata.xml 
b/sys-cluster/singularity/metadata.xml
new file mode 100644
index ..b7595a3
--- /dev/null
+++ b/sys-cluster/singularity/metadata.xml
@@ -0,0 +1,8 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+   
+   j...@gentoo.org
+   Justin Lecher
+   
+

diff --git a/sys-cluster/singularity/singularity-2.2.ebuild 
b/sys-cluster/singularity/singularity-2.2.ebuild
new file mode 100644
index ..7fb0f7c
--- /dev/null
+++ b/sys-cluster/singularity/singularity-2.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Application containers for Linux"
+HOMEPAGE="http://singularity.lbl.gov/";
+SRC_URI="https://github.com/${PN}ware/${PN}/releases/download/${PV}/${P}.tar.gz";
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+src_configure() {
+   econf --with-userns
+}
+
+src_install() {
+   default
+   prune_libtool_files
+}



[gentoo-commits] repo/gentoo:master commit in: sys-cluster/singularity/

2016-11-11 Thread Justin Lecher
commit: 76e59488b537220c9bb52ac28c898c4a492308a4
Author: Justin Lecher  gentoo  org>
AuthorDate: Fri Nov 11 09:05:42 2016 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Fri Nov 11 09:05:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76e59488

sys-cluster/singularity: Work around parallel install problem

install examples

Package-Manager: portage-2.3.2
Signed-off-by: Justin Lecher  gentoo.org>

 sys-cluster/singularity/singularity-2.2.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sys-cluster/singularity/singularity-2.2.ebuild 
b/sys-cluster/singularity/singularity-2.2.ebuild
index 7fb0f7c..011f063 100644
--- a/sys-cluster/singularity/singularity-2.2.ebuild
+++ b/sys-cluster/singularity/singularity-2.2.ebuild
@@ -13,13 +13,16 @@ 
SRC_URI="https://github.com/${PN}ware/${PN}/releases/download/${PV}/${P}.tar.gz";
 SLOT="0"
 LICENSE="BSD"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
+IUSE="examples"
 
 src_configure() {
econf --with-userns
 }
 
 src_install() {
+   MAKEOPTS+=" -j1"
default
prune_libtool_files
+   dodoc ChangeLog
+   use examples && dodoc -r examples
 }