summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Freyermuth <o.freyermuth@googlemail.com>2020-05-23 19:22:21 +0200
committerJoonas Niilola <juippis@gentoo.org>2020-06-14 17:05:14 +0300
commit8902aacc01f97569d832e9d294e7a1932387def8 (patch)
tree79de8b5f909a73dc6398260c84407c3e8f6e7f54 /sys-cluster
parentsys-cluster/charliecloud: Version bump to 0.16. (diff)
downloadgentoo-8902aacc01f97569d832e9d294e7a1932387def8.tar.gz
gentoo-8902aacc01f97569d832e9d294e7a1932387def8.tar.bz2
gentoo-8902aacc01f97569d832e9d294e7a1932387def8.zip
sys-cluster/charliecloud: Drop old.
Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Oliver Freyermuth <o.freyermuth@googlemail.com> Closes: https://github.com/gentoo/gentoo/pull/15933 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/charliecloud/Manifest2
-rw-r--r--sys-cluster/charliecloud/charliecloud-0.9.10.ebuild66
-rw-r--r--sys-cluster/charliecloud/charliecloud-0.9.6.ebuild67
-rw-r--r--sys-cluster/charliecloud/files/charliecloud-0.9.10-fix-flags.patch37
-rw-r--r--sys-cluster/charliecloud/files/charliecloud-0.9.10-fix-hardcoded-gcc.patch21
5 files changed, 0 insertions, 193 deletions
diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest
index b9b8507c4b56..058daaccdd37 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -1,5 +1,3 @@
DIST charliecloud-0.10.tar.gz 301083 BLAKE2B be0c650bebc12fd047b1afc61588b4b9cfc0d0addfddb808765d8e125c70329d6c06a86144b4167e5abaf64392ad1891319aabd2ba8fb528de2d9789d040fc0c SHA512 681e2f30f730b42b55b4097dba78e41924b17990354b866e04e09e6d2e4bb584211c130f9a04619dcdd38f2a3eaaad7615ee5ec20a266ee2332b0a512492331f
DIST charliecloud-0.15.tar.gz 346718 BLAKE2B a3710814864904c5db282d092f64faf9a11aeea016c788ee4be62f11257b5b5200d0c1887150b93f18446034d7919df933d3badcf33907a81c0b33e65a5e9f78 SHA512 70f6c9a18f613d05396eda5d41044ec699cf6366ae1bf43839275e62ac317231bb1c3278469040faa03af007260d84e2d718c0fb3fb45e6ace8fb733c6275a84
DIST charliecloud-0.16.tar.gz 356118 BLAKE2B 72e7640feb23fbc55c515fd841cf90562b7800a83673b6a786c8162229b6714ed6a98d3c5066e42ce75a58935e085e86e42ae927cd5f14e6e54ffe6e9863629e SHA512 bf37b5ea2d139635f3207475497bd90595ce625ce9ad05eef5fcd19ec3252e4843eba2bd457587cd9c4ab860aa1e40ec01ac5cd073414bb5a4f89b5c4488bceb
-DIST charliecloud-0.9.10.tar.gz 275687 BLAKE2B e03c3358dd4e5eb88f9c5a3002366c79563e15d5d7792dd55f2800a001b847c13443fce0689a850aa7e6a0aa510c3f6b53d93a88a6f79326eac27acc9cbe2c57 SHA512 93a6f0c6bcceb54fabbc179b960a0d03f1b3547786ce8d502552ddc571475ea2110d6aa290ce5c245be6e2c7cdc47d3f23ff7e74558f684b4a27358aa0971a61
-DIST charliecloud-0.9.6.tar.gz 205380 BLAKE2B 2e95f5486ea6d2306512378290cd29114bc688717741436ae9cc8c1dd2679c22ab21059574d62222cd14063bacecc6a7005b216cd9e2ed01fe1593a3b69871b0 SHA512 55af3e57ef6c2b81ae10bd50d149872af50d508392b271bdaa75cf3b655659ec7da5016a9deeea15aaa20e265e8066d1ed982c122cb5e62ee6d47f25d367410f
diff --git a/sys-cluster/charliecloud/charliecloud-0.9.10.ebuild b/sys-cluster/charliecloud/charliecloud-0.9.10.ebuild
deleted file mode 100644
index 042093fc1081..000000000000
--- a/sys-cluster/charliecloud/charliecloud-0.9.10.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit python-single-r1
-
-if [[ ${PV} == "9999" ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/hpc/${PN}.git"
- S="${WORKDIR}/${P}"
-else
- SRC_URI="https://github.com/hpc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Lightweight user-defined software stacks for high-performance computing"
-HOMEPAGE="https://hpc.github.io/charliecloud/"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-IUSE="doc examples +pv"
-
-# Extensive test suite exists, but downloads container images
-# directly and via Docker and installs packages inside using apt/yum.
-# Additionally, clashes with portage namespacing and sandbox.
-RESTRICT="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- pv? ( sys-apps/pv )
-"
-DEPEND="
- doc? (
- $(python_gen_cond_dep '
- dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
- dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}]
- ')
- net-misc/rsync
- )"
-
-PATCHES=(
- "${FILESDIR}"/"${PN}-${PV}"-fix-flags.patch
- "${FILESDIR}"/"${PN}-${PV}"-fix-hardcoded-gcc.patch
-)
-
-src_compile() {
- emake
- use doc && emake -C doc-src
-}
-
-src_install() {
- emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}" LIBEXEC_DIR="libexec/${PF}"
- if use doc; then
- local HTML_DOCS=(doc/.)
- fi
- if use examples; then
- docompress -x "/usr/share/doc/${PF}/examples"
- dodoc -r examples
- fi
- rm -rf "${ED}/usr/share/doc/charliecloud" || die
- einstalldocs
-}
diff --git a/sys-cluster/charliecloud/charliecloud-0.9.6.ebuild b/sys-cluster/charliecloud/charliecloud-0.9.6.ebuild
deleted file mode 100644
index 3fd8f0d7646a..000000000000
--- a/sys-cluster/charliecloud/charliecloud-0.9.6.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# User namespaces don't play well with the sandbox.
-RESTRICT="test"
-
-if [[ ${PV} == "9999" ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/hpc/${PN}.git"
- S="${WORKDIR}/${P}"
-else
- SRC_URI="https://github.com/hpc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Lightweight user-defined software stacks for high-performance computing"
-HOMEPAGE="https://hpc.github.io/charliecloud/"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-IUSE="doc examples +pv test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- pv? ( sys-apps/pv )
- doc? ( dev-python/sphinx
- dev-python/sphinx_rtd_theme
- net-misc/rsync )
- test? ( app-arch/pigz )"
-
-DOCS=(
- README.rst
-)
-
-src_compile() {
- emake
- use doc && emake -C doc-src
-}
-
-src_install() {
- emake install PREFIX="${EPREFIX}/usr" DESTDIR="${ED}"
- if use doc; then
- mv doc html || die
- local HTML_DOCS=(html/.)
- fi
- if use examples; then
- docompress -x "${EPREFIX}/usr/share/doc/${PF}/examples"
- DOCS+=(examples)
- fi
- rm -rf "${ED}/usr/share/doc/charliecloud" || die
- einstalldocs
-}
-
-src_test() {
- cd "${S}/test" || die
- export CH_TEST_TARDIR="${T}/tarballs"
- export CH_TEST_IMGDIR="${T}/images"
-
- # Do not run tests requiring root.
- export CH_TEST_PERMDIRS="skip"
- export CH_TEST_SKIP_DOCKER=yes
- sed -i 's/CHTEST_HAVE_SUDO=yes/CHTEST_HAVE_SUDO=no/' "${S}/test/common.bash" || die
-
- emake test-quick
-}
diff --git a/sys-cluster/charliecloud/files/charliecloud-0.9.10-fix-flags.patch b/sys-cluster/charliecloud/files/charliecloud-0.9.10-fix-flags.patch
deleted file mode 100644
index 24f2f2d72532..000000000000
--- a/sys-cluster/charliecloud/files/charliecloud-0.9.10-fix-flags.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From f0b867bb3bb527150e86a891c0c84dff3acc39e8 Mon Sep 17 00:00:00 2001
-From: Peter Wienemann <wienemann@physik.uni-bonn.de>
-Date: Mon, 1 Jul 2019 19:17:25 +0200
-Subject: [PATCH] PR #462 from @wiene: Add missing compiler flags for examples
-
-This patch ensures that CFLAGS, CPPFLAGS and LDFLAGS settings are
-respected when compiling/linking (lib)sotest, pivot_root and userns.
----
- examples/syscalls/Makefile | 2 +-
- test/Makefile | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/examples/syscalls/Makefile b/examples/syscalls/Makefile
-index 4dbef21b..177ab42a 100644
---- a/examples/syscalls/Makefile
-+++ b/examples/syscalls/Makefile
-@@ -10,4 +10,4 @@ clean:
- $(BINS): Makefile
-
- %: %.c
-- gcc $(CFLAGS) $< -o $@
-+ gcc $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< -o $@
-diff --git a/test/Makefile b/test/Makefile
-index 50f24596..97a9316b 100644
---- a/test/Makefile
-+++ b/test/Makefile
-@@ -81,8 +81,8 @@ sotest/lib/libsotest.so.1.0: sotest/libsotest.so.1.0
- # the container. (Issue #227.)
-
- sotest/sotest: sotest/sotest.c sotest/libsotest.so.1.0
-- gcc -o $@ -L./sotest -lsotest $^
-+ gcc -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -L./sotest -lsotest $^
- sotest/libsotest.so.1.0: sotest/libsotest.c
-- gcc -o $@ -shared -fPIC -Wl,-soname,libsotest.so.1 -lc $^
-+ gcc -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fPIC -Wl,-soname,libsotest.so.1 -lc $^
- ln -f -s libsotest.so.1.0 sotest/libsotest.so
- ln -f -s libsotest.so.1.0 sotest/libsotest.so.1
diff --git a/sys-cluster/charliecloud/files/charliecloud-0.9.10-fix-hardcoded-gcc.patch b/sys-cluster/charliecloud/files/charliecloud-0.9.10-fix-hardcoded-gcc.patch
deleted file mode 100644
index 5654e71da5ad..000000000000
--- a/sys-cluster/charliecloud/files/charliecloud-0.9.10-fix-hardcoded-gcc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From d42f3201bb91c582d4533c732e167961030091f9 Mon Sep 17 00:00:00 2001
-From: Oliver Freyermuth <o.freyermuth@googlemail.com>
-Date: Sat, 6 Jul 2019 17:01:06 +0200
-Subject: [PATCH] examples/syscall/Makefile: Fix hardcoded call to gcc.
-
-To be open for choice of different C compilers,
-honour CC variable.
----
- examples/syscalls/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/examples/syscalls/Makefile b/examples/syscalls/Makefile
-index 177ab42a..7dc9a4b8 100644
---- a/examples/syscalls/Makefile
-+++ b/examples/syscalls/Makefile
-@@ -10,4 +10,4 @@ clean:
- $(BINS): Makefile
-
- %: %.c
-- gcc $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< -o $@
-+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< -o $@