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

6 files changed, 4 insertions, 156 deletions

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
index 75ba6269d6f0..db1918daa9c4 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 71a8d9972b75..000000000000
--- 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 <votava.petr@gene.com>
-Date: Thu, 29 Jun 2017 16:53:48 +0000
-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 acddddfd1..3509f4d8e 100644
---- a/src/slurm/singularity.c
-+++ b/src/slurm/singularity.c
-@@ -22,6 +22,7 @@
- 
- #define _GNU_SOURCE 1
- 
-+#include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
- #include <sys/types.h>
-@@ -29,9 +30,9 @@
- #include <string.h>
- 
- #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 bb97aa8832e8..f47500258195 100644
--- a/sys-cluster/singularity/metadata.xml
+++ b/sys-cluster/singularity/metadata.xml
@@ -8,9 +8,4 @@
 	<upstream>
 		<remote-id type="github">singularityware/singularity</remote-id>
 	</upstream>
-	<use>
-		<flag name="slurm">
-			Compile spank plugin for <pkg>sys-cluster/slurm</pkg>
-		</flag>
-	</use>
 </pkgmetadata>
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 c072830a2c10..000000000000
--- a/sys-cluster/singularity/singularity-2.3.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{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="
-	slurm? ( sys-cluster/slurm )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-slurm.patch
-)
-
-src_prepare() {
-	default
-	# automake version hardcoding
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-userns \
-		$(use_with slurm) \
-		$(usex suid "" "--disable-suid") \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	MAKEOPTS+=" -j1"
-	default
-	prune_libtool_files
-	dodoc ChangeLog AUTHORS.md CONTRIBUTING.md
-	use examples && dodoc -r examples
-}
diff --git a/sys-cluster/singularity/singularity-2.4.ebuild b/sys-cluster/singularity/singularity-2.4.ebuild
deleted file mode 100644
index 9d664bc225ed..000000000000
--- a/sys-cluster/singularity/singularity-2.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{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 ChangeLog CONTRIBUTORS.md CONTRIBUTING.md
-	use examples && dodoc -r examples
-}
diff --git a/sys-cluster/singularity/singularity-2.4.2.ebuild b/sys-cluster/singularity/singularity-2.6.1.ebuild
index 181c726fd2ca..bdcaaff53b5f 100644
--- a/sys-cluster/singularity/singularity-2.4.2.ebuild
+++ b/sys-cluster/singularity/singularity-2.6.1.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 
 inherit autotools eutils python-single-r1
 
 DESCRIPTION="Application containers for Linux"
-HOMEPAGE="http://singularity.lbl.gov/"
+HOMEPAGE="https://sylabs.io"
 SRC_URI="https://github.com/${PN}ware/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 SLOT="0"
-LICENSE="cctbx-2.0"
+LICENSE="BSD"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples static-libs +suid"
 
@@ -36,7 +36,6 @@ src_configure() {
 src_install() {
 	MAKEOPTS+=" -j1"
 	default
-	prune_libtool_files
 	dodoc README.md CONTRIBUTORS.md CONTRIBUTING.md
 	use examples && dodoc -r examples
 }