gentoo auto-resync : 04:04:2023 - 05:21:44

3 files changed, 93 insertions, 1 deletions

diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest
index d2c301f969db..9de2a486baf9 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -2,7 +2,9 @@ AUX charliecloud-0.30-dash.patch 1669 BLAKE2B 4e68576d20800c0682b38f6fd5a1a391b8
 AUX charliecloud-0.31-realpath_return.patch 972 BLAKE2B fa3db3892339f1476ef7e8e7d29cafee04bf02eb0f995196b80dbd4ecab8b0caa27fccec5a2b5f32cb28f37d09b5ec97337742987600ecda0b3be3a682c48dbc SHA512 d782863c4b1c76a5516431634b23ae8f1faed388f7585915a641b0c614fb29d42a12b1466d048804f3441fd7c5061537b81a10ddd0444b4d66da8e7b8d2171a7
 DIST charliecloud-0.30.tar.gz 524870 BLAKE2B 0eadb4abda47554117aa657c3335d0ad95c71a3ccae67af000beeb8e375058002821783824142208ab58dcf7a62141d1eee45ac4241fe53cd2b206bbbbbb10b4 SHA512 a7188594482b712521930b141e10a981f7536b979f14c3a206f02895f8404a9095b17fc6764f937bdb466624ca6074cc0cbc84f33d59b4453b55be5691f4fbd4
 DIST charliecloud-0.31.tar.gz 534662 BLAKE2B 08f95f4e37e4de3590344f14cf1ce6e502af414806cc625b8b4be454c1e1e9611d40e599828033a08dfba8ff6fa6fbcee107f19c38ce247addace6a91876dea8 SHA512 9fdcabbf533ab42556bcd8552c42dce3096dffd1f863e2a7a2e87a4596e1df601d55e56fde48cfd88fac62b31bad4257d1b1cdbb9a82df3e32ad4b5f1842307e
+DIST charliecloud-0.32.tar.gz 549184 BLAKE2B 5d574ccf2fb36b0acf4f436099ba8344b5d9058d5f79abb8d56082d86b2f9e7207052009b2d49ed50eaede7411796804944fbe11c0d7bcf21f2d62ba01b2c28f SHA512 c32362a219fbe7ec298ac314f58a17e0e6972a3436f66a0243a77c8c05007e6fea3ac8d4ddc15274737eacf3ba32601c0198fc5a39bccb4017d675a149366aee
 EBUILD charliecloud-0.30.ebuild 2317 BLAKE2B b50cd22bdff025153fa6e9ce7e53dc4928bdb397f0b6c928bac6406a8db3c0d88e2f4451c13de18a221f90757355a2b85057cf0c23fd7d4304911bd606a36d54 SHA512 d153dec41317fa65c85e348a6bd845f8db4e7eec5df882e7d0a97262e02cb920a577a5eab3c1eb5d65a60ba766683be70d81f81e07f1fbaf4c6b2b5d17d17587
 EBUILD charliecloud-0.31-r1.ebuild 2415 BLAKE2B 628ecf4468bb234a2cc025f8a399766c799c3b993aabd5849975a8a06576176d4f5929438a4206e45484818b961d1b110ddb3bd075ed861f793d78aab60105a7 SHA512 38c7fb1ac49eff6890c02f36245015401e73cc9f5be2fff1794451cab68d6b08a2c46f51ec65acaf6c1e29e54b606171e37dffecd9cc6f33d5706fb4aabdb24f
-EBUILD charliecloud-9999.ebuild 2360 BLAKE2B 62ee7feb58dccf45ee70c79fda2ef5090eb113bce833c698d6b5ba2eb47299ef360a5fe49070a6140dbaae63ec5bbadb37c5a3964d6bf9d903eb9974c7b12277 SHA512 6157553076847b8cf0ff500f6f3e92d48fc9a64ea775f72c4245cb924dabffad35bcb7d916585a9949f4bfa8d70d11f76a2fd6ac3052308ffb9dc76d47709a24
+EBUILD charliecloud-0.32.ebuild 2417 BLAKE2B eb92fbf5ded6f827c9748263fa6d921254f7c9a2bf196ef7c69814e74e33032976d7ee5de2531f544f1d37fabacab5319aa0ea13c72cf463207c3bcba49801eb SHA512 15518863a6618c0145a08d832a180af4edac26c1cac45ae4153d27b4c4e7312927077541689f083e88ef5efaa370bce2349ddcd6f0c0df3c09f2643214865ca5
+EBUILD charliecloud-9999.ebuild 2417 BLAKE2B eb92fbf5ded6f827c9748263fa6d921254f7c9a2bf196ef7c69814e74e33032976d7ee5de2531f544f1d37fabacab5319aa0ea13c72cf463207c3bcba49801eb SHA512 15518863a6618c0145a08d832a180af4edac26c1cac45ae4153d27b4c4e7312927077541689f083e88ef5efaa370bce2349ddcd6f0c0df3c09f2643214865ca5
 MISC metadata.xml 618 BLAKE2B 5f7dbfdb8a940a534ed97b4bd47b05a271d6454b0584ac29db1c2fb533044a2c6d48b8425399866abd8d2ebea1f41199ea4cf23af1c6f2646d4c35b5b4c104a4 SHA512 df1b817bbabc6b227c9a779677d345b9df259444b943b1ab58d55c860cd79ad8f9d4b382dc6c4de0c5daa955fd694990217a559e897a3b11f7e954c7b54d4678
diff --git a/sys-cluster/charliecloud/charliecloud-0.32.ebuild b/sys-cluster/charliecloud/charliecloud-0.32.ebuild
new file mode 100644
index 000000000000..7e84cbf18286
--- /dev/null
+++ b/sys-cluster/charliecloud/charliecloud-0.32.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+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-image doc"
+
+# 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}
+	elibc_musl? ( sys-libs/argp-standalone )
+"
+DEPEND="
+	ch-image? (
+		$(python_gen_cond_dep '
+			dev-python/lark[${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+		')
+	)
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
+		')
+		net-misc/rsync
+	)"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local econf_args=()
+	econf_args+=(
+		$(use_enable doc html)
+		$(use_enable ch-image)
+		# Libdir is used as a libexec-style destination.
+		--libdir="${EPREFIX}"/usr/lib
+		# Attempts to call python-exec directly otherwise.
+		--with-sphinx-python="${EPYTHON}"
+		# This disables -Werror, see also: https://github.com/hpc/charliecloud/pull/808
+		--enable-buggy-build
+		# Do not use bundled version of dev-python/lark.
+		--disable-bundled-lark
+		# Use correct shebang.
+		--with-python="${PYTHON}"
+	)
+	econf "${econf_args[@]}"
+}
+
+src_install() {
+	docompress -x "${EPREFIX}"/usr/share/doc/"${PF}"/examples
+	default
+}
+
+pkg_postinst() {
+	elog "Various builders are supported, as alternative to the internal ch-image."
+	optfeature "Building with Buildah" app-containers/buildah
+	optfeature "Building with Docker" app-containers/docker
+	optfeature "Building with Podman" app-containers/podman
+	optfeature "Progress bars during long operations" sys-apps/pv
+	optfeature "Pack and unpack squashfs images" sys-fs/squashfs-tools
+	optfeature "Mount and umount squashfs images" sys-fs/squashfuse
+	optfeature "Build versioning with ch-image" dev-vcs/git
+}
diff --git a/sys-cluster/charliecloud/charliecloud-9999.ebuild b/sys-cluster/charliecloud/charliecloud-9999.ebuild
index b0763f12b55c..7e84cbf18286 100644
--- a/sys-cluster/charliecloud/charliecloud-9999.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-9999.ebuild
@@ -81,6 +81,7 @@ pkg_postinst() {
 	elog "Various builders are supported, as alternative to the internal ch-image."
 	optfeature "Building with Buildah" app-containers/buildah
 	optfeature "Building with Docker" app-containers/docker
+	optfeature "Building with Podman" app-containers/podman
 	optfeature "Progress bars during long operations" sys-apps/pv
 	optfeature "Pack and unpack squashfs images" sys-fs/squashfs-tools
 	optfeature "Mount and umount squashfs images" sys-fs/squashfuse