reinit the tree, so we can have metadata

6 files changed, 185 insertions, 0 deletions

diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest
new file mode 100644
index 000000000000..9014873c0759
--- /dev/null
+++ b/sys-cluster/singularity/Manifest
@@ -0,0 +1,8 @@
+AUX singularity-2.2.1-glibc-2.25.patch 742 SHA256 836cd7544d3ee88003ea032b2b7def8b09aae5b2515c372c22bf3f2e2caf776d SHA512 745fe14112e72fb06b5956516a3ad37fd18b96e024d80444b7e6844019e7a0c7ab1adc0887cb6591c1fba01484e659be50dc1a3cf03e6feb1065d98ecd4ac5c1 WHIRLPOOL 7e6afa455881605c75110ab392f8aebac024a2b545405d2d825a46086bffe4f8238fc906263c8c4b2d15ee25a70b7a5364f8147cae8fb211d1e2e58934f34e7e
+AUX singularity-2.3.1-slurm.patch 1597 SHA256 85e1995332f2589859de6cc590c06a04c0eeb11ef7a75911d33b951dd4f82ef8 SHA512 174dc15dcd5bff0a0b6796d4623f829fb4b7d0e8483308cafe179beb6321d31cf3ee9913decd91aebac0689a62181096cc0ac3a283f8c88927c00e113a476224 WHIRLPOOL 538a295dff1e92252696d54e054ae1578d2180bd594afbdaea808f1b9609ad7390e1b85b9d64ce8c26bbb51955a748d790a93dc7ca8237c74df002ac3b031d51
+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
+EBUILD singularity-2.2.1.ebuild 603 SHA256 284ddda57f6ab272b912705b7bfb5f4e601864b8878e75c96aed805a9807bbf3 SHA512 030a1a39ea1915d75ef5ebdaa8b6b6d4b0eb0c45222a1d4492cb3a3b41cb4e6ad50c1fa6b85d13413d34bb232b62db14f12f4db48ea9876127d0fe32fdbff5d0 WHIRLPOOL 4afd0755887fe98ccf3fdbafacb61f7a0874590a2c7256323ffca8da1e2b7f33d4657ccf006c28a2ae270569937b5a21447f4ef48f6a94d9d1ae5e1dcd68c035
+EBUILD singularity-2.3.1.ebuild 952 SHA256 b45c03e3a2ca5de21b14144967c2da9727f477709332a9c32bc357c3de9dc815 SHA512 60ed34f1ab7543ae5f728b51595640dc671ebb514028dce2fb82c72f1d192ca896c761fe38b4c786641f1df678adfd45d855eac262b68ee00c2b1048072e6d2c WHIRLPOOL 07f332ecdc9de4af06a10941cec0db76c20b04695e6ecde0f11cbd02edaeffa134ff7188e595e8dab5f44849fad32403c246bc355f23ec1c645c0e6c9ad12bc4
+MISC ChangeLog 771 SHA256 37adb96a35be0b0dcb6bc1c64e47203bc7836c7d6cb944ca69db79007b0bd446 SHA512 1e6fb03f5d3c4329a3c22c8274610ee940406c8bfcdf0e0ec9b3c3caed4b51f2ff1e34079c76e27940eab7470c8c1447bf02fa5d3f9ff985006ec65f0be76536 WHIRLPOOL dcbfd8b7040b56025c5567b78237aeb14bda64684dc6995a9cef05c6da392d5c6fb5f56bdee89c720dec3c0f67e3b745105f0fc3ca1e0e55477725ce1df28627
+MISC metadata.xml 440 SHA256 f01b881c69a798ee1e24df0d25e7deef12e41a1bbad55dc9440e9f8c733fcc91 SHA512 d8363de6994afc68b776ee6330a56b6a5e6d3156f440633c01160a9e9967654e4a564e235fc126be9400f436ec099fb05bd7754739cf8221666913b244d3b559 WHIRLPOOL 012b025cbbb9a777ba198613d872d47cbc82336424d1eef7b15fdbb0f479b5f5d1617cfe734aad27d6b1c73a366f268355283d6e82f3f36d2fb2977bd79da5b8
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 000000000000..e550811dc676
--- /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 <sys/file.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <errno.h> 
+ #include <string.h>
+ #include <fcntl.h>
+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 <sys/mount.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+ 
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 000000000000..71a8d9972b75
--- /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 <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
new file mode 100644
index 000000000000..bb97aa8832e8
--- /dev/null
+++ b/sys-cluster/singularity/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jlec@gentoo.org</email>
+		<name>Justin Lecher</name>
+	</maintainer>
+	<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.2.1.ebuild b/sys-cluster/singularity/singularity-2.2.1.ebuild
new file mode 100644
index 000000000000..0d679f703fed
--- /dev/null
+++ b/sys-cluster/singularity/singularity-2.2.1.ebuild
@@ -0,0 +1,31 @@
+# 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
+}
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 000000000000..68fad22fedfe
--- /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="
+	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
+}