commit: a0e54d6e11198e5f0ee5b0ea54a35c14c4dd03a8 Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com> AuthorDate: Fri Jun 9 21:20:42 2023 +0000 Commit: Nicolas Bock <nicolasbock <AT> gentoo <DOT> org> CommitDate: Tue Jun 13 20:50:31 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0e54d6e
sys-cluster/charliecloud: drop 0.30, 0.31-r1 Closes: https://github.com/gentoo/gentoo/pull/31368 Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com> Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org> sys-cluster/charliecloud/Manifest | 2 - sys-cluster/charliecloud/charliecloud-0.30.ebuild | 87 -------------------- .../charliecloud/charliecloud-0.31-r1.ebuild | 92 ---------------------- .../files/charliecloud-0.30-dash.patch | 48 ----------- .../files/charliecloud-0.31-realpath_return.patch | 32 -------- 5 files changed, 261 deletions(-) diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest index 9f2cee84c677..739845db48d5 100644 --- a/sys-cluster/charliecloud/Manifest +++ b/sys-cluster/charliecloud/Manifest @@ -1,4 +1,2 @@ -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 DIST charliecloud-0.33.tar.gz 559786 BLAKE2B 46e8a488af5a27e6b52ae41118cea663cd6c01f8a24566576dbdc7bac99bd94ac50c0559da07a204c2e68ed46edb8c5a5e0bd26986b5bc960901457af632e134 SHA512 d6854873bdfca5512c54ba28ff70721442241a00cbec6d67c9693e946c6925d030773382c8ba9fc3ebcdfd52da56580e6c4e3ad7080d51d9844ad6f216f15e70 diff --git a/sys-cluster/charliecloud/charliecloud-0.30.ebuild b/sys-cluster/charliecloud/charliecloud-0.30.ebuild deleted file mode 100644 index f57bb46d685e..000000000000 --- a/sys-cluster/charliecloud/charliecloud-0.30.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# 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 - )" - -PATCHES=( - "${FILESDIR}"/${P}-dash.patch -) - -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[@]}" -} - -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 "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-0.31-r1.ebuild b/sys-cluster/charliecloud/charliecloud-0.31-r1.ebuild deleted file mode 100644 index 3478b9b51f7d..000000000000 --- a/sys-cluster/charliecloud/charliecloud-0.31-r1.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# 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 - )" - -PATCHES=( - "${FILESDIR}"/${P}-realpath_return.patch -) - -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 "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/files/charliecloud-0.30-dash.patch b/sys-cluster/charliecloud/files/charliecloud-0.30-dash.patch deleted file mode 100644 index ba76e3fee59f..000000000000 --- a/sys-cluster/charliecloud/files/charliecloud-0.30-dash.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 1fb019b26d54f777ea7a2781f96adec369a25cbc Mon Sep 17 00:00:00 2001 -From: Oliver Freyermuth <o.freyerm...@googlemail.com> -Date: Tue, 17 Jan 2023 19:00:11 +0100 -Subject: [PATCH] PR #1538: configure: Remove bashisms, fix dash compatibility -Bug: https://bugs.gentoo.org/890873 -Bug: https://github.com/hpc/charliecloud/pull/1538 - -+= and |& are not supported by systems using dash as shell. ---- - configure.ac | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 683a532..1c878d7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -216,15 +216,15 @@ AC_PROG_CC - # Set up CFLAGS. - ch_cflags='-std=c99 -Wall' - AS_IF([test -n "$lib_libsquashfuse"], -- [ch_cflags+=" -I$inc_libsquashfuse -L$lib_libsquashfuse" -+ [ch_cflags="$ch_cflags -I$inc_libsquashfuse -L$lib_libsquashfuse" - # Without this, clang fails with "error: argument unused during - # compilation" on the -L. GCC ignores it. -- ch_cflags+=' -Wno-unused-command-line-argument']) -+ ch_cflags="$ch_cflags -Wno-unused-command-line-argument"]) - AS_IF([test $use_werror = yes], -- [ch_cflags+=' -Werror']) -+ [ch_cflags="$ch_cflags -Werror"]) - - AX_CHECK_COMPILE_FLAG([$ch_cflags], [ -- CFLAGS+=" $ch_cflags" -+ CFLAGS="$CFLAGS $ch_cflags" - ], [ - AC_MSG_ERROR([no suitable C99 compiler found]) - ]) -@@ -434,7 +434,7 @@ CH_CHECK_VERSION([GIT], [$vmin_git], [--version | cut -d' ' -f3]) - # DOT - vmin_dot=2.30.1 - AC_CHECK_PROG([DOT], [dot], [dot]) --CH_CHECK_VERSION([DOT], [$vmin_dot], [dot -V |& cut -d' ' -f5]) -+CH_CHECK_VERSION([DOT], [$vmin_dot], [dot -V 2>&1 | cut -d' ' -f5]) - - # git2dot - vmin_git2dot=0.8.3 --- -2.38.2 - diff --git a/sys-cluster/charliecloud/files/charliecloud-0.31-realpath_return.patch b/sys-cluster/charliecloud/files/charliecloud-0.31-realpath_return.patch deleted file mode 100644 index 7b320fa9dbab..000000000000 --- a/sys-cluster/charliecloud/files/charliecloud-0.31-realpath_return.patch +++ /dev/null @@ -1,32 +0,0 @@ -From e6d25474fcd326ae657c08d7b49606aeabc98b51 Mon Sep 17 00:00:00 2001 -From: Oliver Freyermuth <o.freyerm...@googlemail.com> -Date: Sat, 28 Jan 2023 21:25:09 +0100 -Subject: [PATCH] ch-misc: Do not check errno in realpath_ unless realpath - returns NULL -Bug: https://github.com/hpc/charliecloud/pull/1550 - -glibc's realpath may set errno also on success, as POSIX specifies -errno should only be checked after realpath if the return value is not NULL. - -See for example: - https://bugzilla.redhat.com/show_bug.cgi?id=1916968 ---- - bin/ch_misc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bin/ch_misc.c b/bin/ch_misc.c -index 04ac52a..93a3339 100644 ---- a/bin/ch_misc.c -+++ b/bin/ch_misc.c -@@ -589,7 +589,7 @@ char *realpath_(const char *path, bool fail_ok) - errno = 0; - pathc = realpath(path, NULL); - -- if (errno != 0) { -+ if (pathc == NULL && errno != 0) { - if (fail_ok) { - T_ (pathc = strdup(path)); - } else { --- -2.39.1 -
