commit: 6e979d2e3db43135ff4d34ea07b3db02c4798ac9 Author: Marek Szuba <marecki <AT> gentoo <DOT> org> AuthorDate: Wed Jul 13 15:32:31 2022 +0000 Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> CommitDate: Wed Jul 13 15:55:31 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e979d2e
sys-cluster/singularity: treeclean Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> profiles/package.mask | 5 -- sys-cluster/singularity/Manifest | 1 - sys-cluster/singularity/metadata.xml | 15 ----- sys-cluster/singularity/singularity-3.8.7.ebuild | 72 ------------------------ 4 files changed, 93 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 41d0ba723e77..e8eac638ef9e 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -357,11 +357,6 @@ dev-ml/core_bench:0/0.15 dev-ml/patience_diff:0/0.15 dev-util/patdiff:0/0.15 -# Marek Szuba <mare...@gentoo.org> (2022-04-14) -# Singularity has been renamed upstream to Apptainer. Therefore, up-to-date -# versions of this software are now available as app-containers/apptainer. -sys-cluster/singularity - # Sam James <s...@gentoo.org> (2022-04-13) # 2.35.2 was a quick release to mitigate a security issue (bug #838127), but # introduces problems of its own with e.g. Portage. bug #838223. Pending diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest deleted file mode 100644 index f3dad2760ccf..000000000000 --- a/sys-cluster/singularity/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST singularity-3.8.7.tar.gz 8185470 BLAKE2B afa1b0b5b3096e0f3634ce7b61bc19a9d5435a213e241220d2fb19cdb65e93b05e4d8a27db89eeaed6af6b4ab5e09a8914d21a3ff0be88a7c6c8d6245dce9e30 SHA512 5649264c15414b90bab47d1958ec61681fa0b9e37ee445a5059f78f3d822aa27f5b9c5c4f4010d053ec9d03e0215c67e2de8e315f74de7d3cd16b8399f40ee59 diff --git a/sys-cluster/singularity/metadata.xml b/sys-cluster/singularity/metadata.xml deleted file mode 100644 index 3c7e20e8fc7a..000000000000 --- a/sys-cluster/singularity/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>mare...@gentoo.org</email> - <name>Marek Szuba</name> - </maintainer> - <use> - <flag name="network">Install network plug-ins</flag> - <flag name="suid">Install SUID helper binary</flag> - </use> - <upstream> - <remote-id type="github">apptainer/singularity</remote-id> - </upstream> -</pkgmetadata> diff --git a/sys-cluster/singularity/singularity-3.8.7.ebuild b/sys-cluster/singularity/singularity-3.8.7.ebuild deleted file mode 100644 index 2fe146707d54..000000000000 --- a/sys-cluster/singularity/singularity-3.8.7.ebuild +++ /dev/null @@ -1,72 +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.12 - app-crypt/gpgme - dev-libs/openssl - sys-apps/util-linux - sys-fs/cryptsetup" -RDEPEND="${COMMON} - sys-fs/squashfs-tools - !app-containers/apptainer" - -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 -}
