From 573ebe4677679173557b56576a024f1faaed7459 Mon Sep 17 00:00:00 2001 From: Oliver Freyermuth Date: Sat, 11 Jul 2020 18:11:26 +0200 Subject: sys-cluster/charliecloud: Drop old. This drops the oldest version which still used a handmande build system. Package-Manager: Portage-2.3.99, Repoman-2.3.23 Signed-off-by: Oliver Freyermuth Signed-off-by: Christoph Junghans --- sys-cluster/charliecloud/Manifest | 1 - .../charliecloud/charliecloud-0.10-r1.ebuild | 63 ---------------------- .../charliecloud-0.10-fix-hardcoded-gcc.patch | 45 ---------------- 3 files changed, 109 deletions(-) delete mode 100644 sys-cluster/charliecloud/charliecloud-0.10-r1.ebuild delete mode 100644 sys-cluster/charliecloud/files/charliecloud-0.10-fix-hardcoded-gcc.patch (limited to 'sys-cluster') diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest index 058daaccdd37..3b195292bc24 100644 --- a/sys-cluster/charliecloud/Manifest +++ b/sys-cluster/charliecloud/Manifest @@ -1,3 +1,2 @@ -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 diff --git a/sys-cluster/charliecloud/charliecloud-0.10-r1.ebuild b/sys-cluster/charliecloud/charliecloud-0.10-r1.ebuild deleted file mode 100644 index b1560f0ec968..000000000000 --- a/sys-cluster/charliecloud/charliecloud-0.10-r1.ebuild +++ /dev/null @@ -1,63 +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 squashfuse" - -# 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 ) - squashfuse? ( sys-fs/squashfuse ) -" -DEPEND=" - doc? ( - $(python_gen_cond_dep ' - dev-python/sphinx[${PYTHON_MULTI_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}] - ') - net-misc/rsync - )" - -PATCHES=( - # See upstream bug: https://github.com/hpc/charliecloud/pull/481/ - "${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}" DOCDIR="${ED}/usr/share/doc/${PF}" LIBEXEC_DIR="libexec/${PF}" - if use examples; then - docompress -x "/usr/share/doc/${PF}/examples" - dodoc -r examples - fi - einstalldocs -} diff --git a/sys-cluster/charliecloud/files/charliecloud-0.10-fix-hardcoded-gcc.patch b/sys-cluster/charliecloud/files/charliecloud-0.10-fix-hardcoded-gcc.patch deleted file mode 100644 index 07e72b2fbd3e..000000000000 --- a/sys-cluster/charliecloud/files/charliecloud-0.10-fix-hardcoded-gcc.patch +++ /dev/null @@ -1,45 +0,0 @@ -From bae9f01ed5ad0ef5d6c0b48cbc1a7fde73ae45ae Mon Sep 17 00:00:00 2001 -From: Oliver Freyermuth -Date: Mon, 15 Jul 2019 18:36:24 +0200 -Subject: [PATCH] test/Makefile: Remove hardcoded call to gcc, error out if - CC=icc. - ---- - test/Makefile | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) - -diff --git a/test/Makefile b/test/Makefile -index 97a9316b..7c28ce2a 100644 ---- a/test/Makefile -+++ b/test/Makefile -@@ -10,7 +10,7 @@ images_eg := $(sort $(wildcard ../examples/*/*/Build)) \ - $(sort $(wildcard ../examples/*/*/Docker_Pull)) \ - $(sort $(wildcard ../examples/*/*/Docker_Pull.*)) - images := $(images_ch) $(images_eg) --sotests := sotest/bin/sotest sotest/lib/libsotest.so.1.0 -+sotests := check-no-icc sotest/bin/sotest sotest/lib/libsotest.so.1.0 - - # Favor embedded Bats, if installed, over system Bats. - export PATH := $(CURDIR)/bats/bin:$(PATH) -@@ -76,13 +76,18 @@ sotest/bin/sotest: sotest/sotest - sotest/lib/libsotest.so.1.0: sotest/libsotest.so.1.0 - cp -a $^ $@ - --# We hardcode gcc here because some other compilers (hello, Intel) link the -+# We exclude icc here because it links the - # resulting binaries with extra shared libraries that are then not copied into - # the container. (Issue #227.) - -+check-no-icc: -+ifeq ($(patsubst %icc,,$(lastword $(CC))),) -+ $(error ICC not supported since it overlinks extra shared libraries) -+endif -+ - sotest/sotest: sotest/sotest.c sotest/libsotest.so.1.0 -- gcc -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -L./sotest -lsotest $^ -+ $(CC) -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -L./sotest -lsotest $^ - sotest/libsotest.so.1.0: sotest/libsotest.c -- gcc -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fPIC -Wl,-soname,libsotest.so.1 -lc $^ -+ $(CC) -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 -- cgit v1.2.3-65-gdbad