From 3e17f8b5b798f756f723c61eb437c6bf11d7b6d5 Mon Sep 17 00:00:00 2001 From: Oliver Freyermuth Date: Sun, 6 Mar 2022 18:42:04 +0100 Subject: sys-cluster/charliecloud: Fix Python shebang. Previously, /usr/bin/env python3 was used (upstream default), which is generic and hence should not be used on Gentoo. Package-Manager: Portage-3.0.30, Repoman-3.0.3 Closes: https://github.com/gentoo/gentoo/pull/24425 Signed-off-by: Oliver Freyermuth Signed-off-by: Nicolas Bock --- .../charliecloud/charliecloud-0.26-r1.ebuild | 82 ++++++++++++++++++++++ sys-cluster/charliecloud/charliecloud-0.26.ebuild | 80 --------------------- sys-cluster/charliecloud/charliecloud-9999.ebuild | 4 +- 3 files changed, 85 insertions(+), 81 deletions(-) create mode 100644 sys-cluster/charliecloud/charliecloud-0.26-r1.ebuild delete mode 100644 sys-cluster/charliecloud/charliecloud-0.26.ebuild (limited to 'sys-cluster') diff --git a/sys-cluster/charliecloud/charliecloud-0.26-r1.ebuild b/sys-cluster/charliecloud/charliecloud-0.26-r1.ebuild new file mode 100644 index 000000000000..14f8aa4a1aa5 --- /dev/null +++ b/sys-cluster/charliecloud/charliecloud-0.26-r1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8,9,10} ) + +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-parser[${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=${PYTHON} + # This disables -Werror, see also: https://github.com/hpc/charliecloud/pull/808 + --enable-buggy-build + # Do not use bundled version of dev-python/lark-parser. + --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 +} diff --git a/sys-cluster/charliecloud/charliecloud-0.26.ebuild b/sys-cluster/charliecloud/charliecloud-0.26.ebuild deleted file mode 100644 index 8ce74691fe62..000000000000 --- a/sys-cluster/charliecloud/charliecloud-0.26.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8,9,10} ) - -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-parser[${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=${PYTHON} - # This disables -Werror, see also: https://github.com/hpc/charliecloud/pull/808 - --enable-buggy-build - # Do not use bundled version of dev-python/lark-parser. - --disable-bundled-lark - ) - 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 -} diff --git a/sys-cluster/charliecloud/charliecloud-9999.ebuild b/sys-cluster/charliecloud/charliecloud-9999.ebuild index 8a596e2fb8a1..14f8aa4a1aa5 100644 --- a/sys-cluster/charliecloud/charliecloud-9999.ebuild +++ b/sys-cluster/charliecloud/charliecloud-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -66,6 +66,8 @@ src_configure() { --enable-buggy-build # Do not use bundled version of dev-python/lark-parser. --disable-bundled-lark + # Use correct shebang. + --with-python=${PYTHON} ) econf "${econf_args[@]}" } -- cgit v1.2.3-65-gdbad