From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- sys-cluster/singularity/Manifest | 10 ++-- sys-cluster/singularity/metadata.xml | 6 +- sys-cluster/singularity/singularity-2.6.1.ebuild | 44 -------------- .../singularity/singularity-3.5.3-r1.ebuild | 69 ---------------------- sys-cluster/singularity/singularity-3.6.0.ebuild | 69 ++++++++++++++++++++++ sys-cluster/singularity/singularity-3.6.1.ebuild | 69 ++++++++++++++++++++++ 6 files changed, 146 insertions(+), 121 deletions(-) delete mode 100644 sys-cluster/singularity/singularity-2.6.1.ebuild delete mode 100644 sys-cluster/singularity/singularity-3.5.3-r1.ebuild create mode 100644 sys-cluster/singularity/singularity-3.6.0.ebuild create mode 100644 sys-cluster/singularity/singularity-3.6.1.ebuild (limited to 'sys-cluster/singularity') diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest index d44ceae3fbf5..ec54d4b30639 100644 --- a/sys-cluster/singularity/Manifest +++ b/sys-cluster/singularity/Manifest @@ -1,5 +1,5 @@ -DIST singularity-2.6.1.tar.gz 835029 BLAKE2B 4a581e1bc5df9d664d68f17e275f01081c850aa53f8a9bfcceaf5eb2b8f16e3a018f88669674c7427c60ab00ec0f21b4ec5e6ecaab261c16f70a998cb54ff855 SHA512 063327c67dae2629d1decebc060c474a72e6741f6dc9b6373734e429ccf11d53ee55c1578c28e74e8f8bcda87f3e0b735a3a0e982c9ea894f03a31eaaadf617c -DIST singularity-3.5.3.tar.gz 7885009 BLAKE2B 8afa2223906e7abf5f3d796efe7cf243dd9d91e61c8ca143a755ad772618ed01d20b7f4a030e82767cf9bf2a7431848d8344e30bde38f413ecd2eef0a9bab53e SHA512 b8bb44539e78eaf74c1b97e5bae8fae1f390412456d76b573fffe2a90240b182db1aec60aee80715547c3edfbaa0607506e2727a575bc951223f9a7c3be0a97e -EBUILD singularity-2.6.1.ebuild 881 BLAKE2B 3c1a3b59fb1634c196d83745cd7085cbc76374c9d4ee4aee1fbe8a35207e47b465faf49e62a5a593a79570f1a39a4fbc5ad9101ecaa2232317db71d76fa9893a SHA512 805828fb0ed5528782d656c170b3fdb66c64ebcda387c7ede5b8c805ae442e7039254e572b3e1326579f0ef587676e57d00ab7e81798c0306f30fc960d9bfb74 -EBUILD singularity-3.5.3-r1.ebuild 1808 BLAKE2B 423f260e996e91b4666e03c27ed038af1b587dfb787054a62d7c1903b0b514acdaba6b7feec7c1230568881191596f98a6ab7653e06ed7f6c30e8c70654e7aa0 SHA512 b2532538e7102ef908cb61b1aa8b4271da412ed80e5a2ed50d83a5e1c25a7f7a4908fd94581231eca8224b5e22321b9895d66ed34b4a620e9d4bbd8afb991915 -MISC metadata.xml 451 BLAKE2B d68571ca2f95ec8c3212a64b8fd77056ee933ddb4c4789899bacb590e6c52d4fee2b2a53cb7dbd8a109c616ae5464d97b37fc4dbb094b68cdf4abbba8def7c70 SHA512 88105dac9813ba9f7126adae945898ad15e79b7abcea6eda8b6231de72bc48392fd8029b9d6bcb2ec9b0f4dfb0b2d14d90096ac0080f2da200b9802a77ccf38a +DIST singularity-3.6.0.tar.gz 6169388 BLAKE2B ea07da3d586a96625a1016f9b4aa6b99072c89393dcb7c80aab624807e51fc107eee2629020bf3e1c19d6103544b63aad960d2ac27804fa6e03323a806fdf270 SHA512 695f3b4c1bd8cc4049fc3e8e296b369f5aadcd6b4717521b9aca68d997fd8a8c0bf349a2851c31b8a22f37fa010b4c7b93562fd6ac24cdc9699230a182f36d29 +DIST singularity-3.6.1.tar.gz 6170806 BLAKE2B fa92bf4df3c2a4ab4345ab0022862f19dde240d7275a79c8433164f02bc495f33d44e4c63b39b9bd3de60361e49fec3f2d258a3bafaadeba34b5d4a7cd3f514e SHA512 3037a14fec086e17b42ee8306624af39fd87c80821c73e0e1ab3d8a717dbdad86237f042d97c6a7870fc6beeced67d6cd52c8e445c41c39cdab7ccce1ce6adb5 +EBUILD singularity-3.6.0.ebuild 1807 BLAKE2B 1a5c5680acf25ba25d2482882a94c61d5760e3799c4098e8dfc143854b75c5c71f8e24b39d129be298c16865f8a7f9266a7a9661312617b02854d14eccd843c0 SHA512 0f9ac71c473ceed3a3c679b5a85d20834059a9c0bf26c258e76d05a49a7c980e5932181291b7336aa0313054eba413c26b8698c16038430bd0ac3e40b9fe5a3b +EBUILD singularity-3.6.1.ebuild 1807 BLAKE2B 1a5c5680acf25ba25d2482882a94c61d5760e3799c4098e8dfc143854b75c5c71f8e24b39d129be298c16865f8a7f9266a7a9661312617b02854d14eccd843c0 SHA512 0f9ac71c473ceed3a3c679b5a85d20834059a9c0bf26c258e76d05a49a7c980e5932181291b7336aa0313054eba413c26b8698c16038430bd0ac3e40b9fe5a3b +MISC metadata.xml 451 BLAKE2B 0cca32721561e4100348cd884b88edad067a426736df27d4be6926525f9dd1315387dbefff84b983e69ab1972a44cd3a3a2c643bae676b413dab3482005d4ceb SHA512 da6f640f7df71bfe98fdabfe8ea69b1929b80b3c23d869dc496515a76d3f76c5d89d38843faf850184ddd7f624dd1e821dd50103f92e81aeb620a4bcd7151609 diff --git a/sys-cluster/singularity/metadata.xml b/sys-cluster/singularity/metadata.xml index e7f7edb94ed6..d861fc51f09b 100644 --- a/sys-cluster/singularity/metadata.xml +++ b/sys-cluster/singularity/metadata.xml @@ -2,14 +2,14 @@ - jlec@gentoo.org - Justin Lecher + marecki@gentoo.org + Marek Szuba Install network plug-ins Install SUID helper binary - sylabs/singularity + hpcng/singularity 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 0ae3cb4ae918..000000000000 --- 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 16834ae083a3..000000000000 --- 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: - # 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.0.ebuild b/sys-cluster/singularity/singularity-3.6.0.ebuild new file mode 100644 index 000000000000..202258ead7a6 --- /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/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 new file mode 100644 index 000000000000..202258ead7a6 --- /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 +} -- cgit v1.2.3