From 5a9f7505c409bf1d5fee13ef77c19db6591c2511 Mon Sep 17 00:00:00 2001
From: Oliver Freyermuth <o.freyermuth@googlemail.com>
Date: Thu, 22 Oct 2020 01:05:22 +0200
Subject: [PATCH] sys-cluster/charliecloud: Drop old.

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Oliver Freyermuth <o.freyermuth@googlemail.com>
Closes: https://github.com/gentoo/gentoo/pull/17996
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
---
 sys-cluster/charliecloud/Manifest             |  1 -
 .../charliecloud/charliecloud-0.18.ebuild     | 79 -------------------
 sys-cluster/charliecloud/metadata.xml         |  1 -
 3 files changed, 81 deletions(-)
 delete mode 100644 sys-cluster/charliecloud/charliecloud-0.18.ebuild

diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest
index 9fd80c5676dfa..d85b2af172265 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -1,3 +1,2 @@
-DIST charliecloud-0.18.tar.gz 366210 BLAKE2B 0da9542cccc39ff6f3ce97532e8576b8eb91c9d7f104fb31c1fe47ca88b3eb0150370fe7585c96a3f9ac3eee28e853866cf9a2c4bfc03b6dd1961d3731ae5439 SHA512 0b23db2348fb1fd491e450fa8684c47dae5acbbdac10fc3b12b5019e1db5f7024d259b43d082e0a4a202b5e79e042e408460d4b52f1e634eff3d4a7f4e68c50b
 DIST charliecloud-0.19.tar.gz 370553 BLAKE2B a87fc00a88528dfaf5a0a666ff92b98ee4bc7d37c5eaaa7c5029e4269b497d280e1e84757bf882f94480b618ac2430b0cc0550406317e8247155e1b380d30c8b SHA512 e2a000155ac2cc5bd40e1f2a7c2d873e4860bd5ef28a362ce5a04a1f4152b2ad1124055755c288e6ae5d40067661dfacbb77a528e3c071aa189765e0d29addb5
 DIST charliecloud-0.20.tar.gz 372770 BLAKE2B a5e6ad3fc93aa7219ec8d35ae112fc7320befc909d2cc805f5d67a356840112c245581c18d790a4fc755e70240e6444059cab8b9531eaedb3e3b941cf756aa55 SHA512 e3269bbf667462214ba88f8fc4651396c9621cd315a798113b66e8be0d4367ce1c18b8b956f325bd07049d644b46fd6837c5b712ced4bdf20a42bcc9aaafd8b7
diff --git a/sys-cluster/charliecloud/charliecloud-0.18.ebuild b/sys-cluster/charliecloud/charliecloud-0.18.ebuild
deleted file mode 100644
index b35d7def4f935..0000000000000
--- a/sys-cluster/charliecloud/charliecloud-0.18.ebuild
+++ /dev/null
@@ -1,79 +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 autotools optfeature 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 ~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="ch-grow doc examples +pv +squashfs 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 )
-	squashfs? ( sys-fs/squashfs-tools )
-	squashfuse? ( sys-fs/squashfuse )"
-DEPEND="
-	ch-grow? (
-		$(python_gen_cond_dep '
-			dev-python/lark-parser[${PYTHON_MULTI_USEDEP}]
-			dev-python/requests[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	doc? (
-		$(python_gen_cond_dep '
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-			dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}]
-		')
-		net-misc/rsync
-	)"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local econf_args=()
-	econf_args+=(
-		$(use_enable doc html)
-		$(use_enable ch-grow)
-		# Libdir is used as a libexec-style destination.
-		--libdir="${EPREFIX}"/usr/lib
-		# Attempts to call python-exec directly otherwise.
-		--with-sphinx-python=${PYTHON}
-		# This disables -Werror, see also: https://github.com/hpc/charliecloud/pull/808
-		--enable-buggy-build
-	)
-	econf "${econf_args[@]}"
-}
-
-pkg_postinst() {
-	elog "Various builders are supported, as alternative "
-	elog "to the internal ch-grow. The following packages "
-	elog "can be installed to get the corresponding support."
-
-	optfeature "Building with Buildah" app-emulation/buildah
-	optfeature "Building with Docker" app-emulation/docker
-}
diff --git a/sys-cluster/charliecloud/metadata.xml b/sys-cluster/charliecloud/metadata.xml
index 85cf8536faf37..5abb0dbdbf542 100644
--- a/sys-cluster/charliecloud/metadata.xml
+++ b/sys-cluster/charliecloud/metadata.xml
@@ -14,7 +14,6 @@
   </upstream>
   <use>
     <flag name='ch-grow'>Build the internal builder ch-grow</flag>
-    <flag name='pv'>Use sys-apps/pv to enable progress bar functionality</flag>
     <flag name='squashfs'>Use sys-fs/squashfs-tools for creating SquashFS images</flag>
     <flag name='squashfuse'>Use sys-fs/squashfuse for the SquashFS workflow</flag>
   </use>