[gentoo-commits] repo/gentoo:master commit in: sys-cluster/charliecloud/, sys-cluster/charliecloud/files/
commit: e266e13009ebe1786bb496bc346dd5b6a2ca947e
Author: Oliver Freyermuth googlemail com>
AuthorDate: Sat Jan 28 20:43:36 2023 +
Commit: Nicolas Bock gentoo org>
CommitDate: Mon Jan 30 21:58:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e266e130
sys-cluster/charliecloud: multiple fixes
- backport patch for readpath from recent glibc [1, 2]
- drop 0.31
- do not compress installed examples
[1] https://github.com/hpc/charliecloud/pull/1550
[2] https://bugzilla.redhat.com/show_bug.cgi?id=1916968
Closes: https://github.com/gentoo/gentoo/pull/29323
Signed-off-by: Oliver Freyermuth googlemail.com>
Signed-off-by: Nicolas Bock gentoo.org>
...oud-0.31.ebuild => charliecloud-0.31-r1.ebuild} | 9 ++
sys-cluster/charliecloud/charliecloud-.ebuild | 5
.../files/charliecloud-0.31-realpath_return.patch | 32 ++
3 files changed, 46 insertions(+)
diff --git a/sys-cluster/charliecloud/charliecloud-0.31.ebuild
b/sys-cluster/charliecloud/charliecloud-0.31-r1.ebuild
similarity index 94%
rename from sys-cluster/charliecloud/charliecloud-0.31.ebuild
rename to sys-cluster/charliecloud/charliecloud-0.31-r1.ebuild
index db6df71719a9..2efd4a83f907 100644
--- a/sys-cluster/charliecloud/charliecloud-0.31.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.31-r1.ebuild
@@ -48,6 +48,10 @@ DEPEND="
net-misc/rsync
)"
+PATCHES=(
+ "${FILESDIR}"/${P}-realpath_return.patch
+)
+
src_prepare() {
default
eautoreconf
@@ -72,6 +76,11 @@ src_configure() {
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
diff --git a/sys-cluster/charliecloud/charliecloud-.ebuild
b/sys-cluster/charliecloud/charliecloud-.ebuild
index db6df71719a9..3e5a83f42d7e 100644
--- a/sys-cluster/charliecloud/charliecloud-.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-.ebuild
@@ -72,6 +72,11 @@ src_configure() {
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
diff --git
a/sys-cluster/charliecloud/files/charliecloud-0.31-realpath_return.patch
b/sys-cluster/charliecloud/files/charliecloud-0.31-realpath_return.patch
new file mode 100644
index ..7b320fa9dbab
--- /dev/null
+++ b/sys-cluster/charliecloud/files/charliecloud-0.31-realpath_return.patch
@@ -0,0 +1,32 @@
+From e6d25474fcd326ae657c08d7b49606aeabc98b51 Mon Sep 17 00:00:00 2001
+From: Oliver Freyermuth
+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
+
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/charliecloud/, sys-cluster/charliecloud/files/
commit: d92d7dda74c29c49a54d819b3d716d5fa43eb033
Author: Oliver Freyermuth googlemail com>
AuthorDate: Thu Mar 31 17:03:50 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Fri Apr 8 12:16:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d92d7dda
sys-cluster/charliecloud: Drop old.
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Oliver Freyermuth googlemail.com>
Signed-off-by: Joonas Niilola gentoo.org>
sys-cluster/charliecloud/Manifest | 1 -
sys-cluster/charliecloud/charliecloud-0.25.ebuild | 84 --
.../files/charliecloud-0.24-musl-argp.patch| 43 ---
3 files changed, 128 deletions(-)
diff --git a/sys-cluster/charliecloud/Manifest
b/sys-cluster/charliecloud/Manifest
index 7cd7af9f381b..f94ed53bd21e 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -1,3 +1,2 @@
-DIST charliecloud-0.25.tar.gz 454041 BLAKE2B
3a071f3b9fb06ca1db6d3b85a577943fe76440d395fdf1415d5085110db665fb75ee09dc14768d326e7e280e6c20096479e5f62290f7dee46821c356f5f18535
SHA512
a7a35b584dbdd6c6e27188d3555173c44f90c0e44fa685a15a47f47c94f9d76aa46ab80054a7c53e10a7f56bef87696f1db2a0eb8c49a388dbb0da0fe9112a60
DIST charliecloud-0.26.tar.gz 472324 BLAKE2B
2b4b8f44f05a497e9367e97e49de255170b610880ef5d7909f7837bc54962f2c2de929d8381b99dc3f4b6124583744993b59839f8f1481cdbd5dc32334d3da9f
SHA512
a8638db42a5563723b62ba0e9b9861b41e76b9246b94887d57a8d4c421d9dd2e8c0965b62af166e47859b72a50a2e01ec6775ef13f79c52696a6b2fd95134174
DIST charliecloud-0.27.tar.gz 471754 BLAKE2B
b683847a79dd55a4bb79458e94e03988acdff0a1e6a24e7f67d56758bdbc3754cc3609e97bfc778f5cb6ce35d6f4df773235314c2ed642ac796b28b824ecadf6
SHA512
cfa5b1ac923008b9a38fc0228562b31551ea941bf222c9b9e12d8dce4c83ca896893e3509773a5ebc02d6b374d08dc049797226cf1432099aae7174c2bc5ee2b
diff --git a/sys-cluster/charliecloud/charliecloud-0.25.ebuild
b/sys-cluster/charliecloud/charliecloud-0.25.ebuild
deleted file mode 100644
index f54e49ec426d..
--- a/sys-cluster/charliecloud/charliecloud-0.25.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 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} == "" ]] ; 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
- )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.24-musl-argp.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=${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/files/charliecloud-0.24-musl-argp.patch
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/charliecloud/, sys-cluster/charliecloud/files/
commit: 0912889954b3ea00b83344da77c5ff1655312a3b
Author: Oliver Freyermuth googlemail com>
AuthorDate: Sat Sep 18 17:38:02 2021 +
Commit: Joonas Niilola gentoo org>
CommitDate: Tue Sep 21 07:03:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09128899
sys-cluster/charliecloud: Drop old.
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Oliver Freyermuth googlemail.com>
Closes: https://github.com/gentoo/gentoo/pull/22327
Signed-off-by: Joonas Niilola gentoo.org>
sys-cluster/charliecloud/Manifest | 1 -
sys-cluster/charliecloud/charliecloud-0.23.ebuild | 81 --
.../files/charliecloud-0.22-sphinx-4.patch | 25 ---
3 files changed, 107 deletions(-)
diff --git a/sys-cluster/charliecloud/Manifest
b/sys-cluster/charliecloud/Manifest
index 861b1cca2fe..ad49af5ee1d 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -1,3 +1,2 @@
-DIST charliecloud-0.23.tar.gz 403281 BLAKE2B
f7a6824782e7bf3bdb51ae791fdca2f5929f5c713590ff49cc8a7e1e1c1758e83bdd429a99497dd15e565d01f0f66f2873f64edddacf24ea78f68c2326669db7
SHA512
35543ed3d838b80fbb64fe3e658993fe9f7ded2d1dfd92e0e9a7725fab6d872503a790964c0f3fabb6438c8bd872b5b00cdf31a028f26588b318b9d0dc568119
DIST charliecloud-0.24.tar.gz 420852 BLAKE2B
ca55231c74012a678c24133b28e341392865a562653086766e6b5e570744f31ce69d1afa2bbb2cc85d5e52b6ed6e9f42f67187d9998afd3852a10fd4a8ff29d3
SHA512
41f44ef5f12dc35d7972923a84044b7255801705d4fcabf76e675dcb70a9f25422e7d584a7b49135ef2ae5dc1751a39efd84f8eb719653a769b41f46bd558fd2
DIST charliecloud-0.25.tar.gz 454041 BLAKE2B
3a071f3b9fb06ca1db6d3b85a577943fe76440d395fdf1415d5085110db665fb75ee09dc14768d326e7e280e6c20096479e5f62290f7dee46821c356f5f18535
SHA512
a7a35b584dbdd6c6e27188d3555173c44f90c0e44fa685a15a47f47c94f9d76aa46ab80054a7c53e10a7f56bef87696f1db2a0eb8c49a388dbb0da0fe9112a60
diff --git a/sys-cluster/charliecloud/charliecloud-0.23.ebuild
b/sys-cluster/charliecloud/charliecloud-0.23.ebuild
deleted file mode 100644
index b514ad3c817..000
--- a/sys-cluster/charliecloud/charliecloud-0.23.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit autotools optfeature python-single-r1
-
-if [[ ${PV} == "" ]] ; 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}"
-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
- )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.22-sphinx-4.patch
- "${FILESDIR}"/${PN}-0.24-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=${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 to the internal
ch-image."
- optfeature "Building with Buildah" app-emulation/buildah
- optfeature "Building with Docker" app-emulation/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/files/charliecloud-0.22-sphinx-4.patch
b/sys-cluster/charliecloud/files/charliecloud-0.22-sphinx-4.patch
deleted file mode 100644
index
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/charliecloud/, sys-cluster/charliecloud/files/
commit: c9827ae2965e07be294903a4790b5a9c161ca8ad
Author: Oliver Freyermuth googlemail com>
AuthorDate: Wed Jun 30 19:48:56 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Jul 8 12:42:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9827ae2
sys-cluster/charliecloud: Fix configure with dash shell.
Closes: https://bugs.gentoo.org/799377
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Oliver Freyermuth googlemail.com>
Closes: https://github.com/gentoo/gentoo/pull/21489
Signed-off-by: Ionen Wolkens gentoo.org>
sys-cluster/charliecloud/charliecloud-0.23.ebuild | 1 +
sys-cluster/charliecloud/charliecloud-0.24.ebuild | 4
.../charliecloud/files/charliecloud-0.24-dash.patch | 17 +
3 files changed, 22 insertions(+)
diff --git a/sys-cluster/charliecloud/charliecloud-0.23.ebuild
b/sys-cluster/charliecloud/charliecloud-0.23.ebuild
index a210608743e..612b89ec615 100644
--- a/sys-cluster/charliecloud/charliecloud-0.23.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.23.ebuild
@@ -48,6 +48,7 @@ DEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-0.22-sphinx-4.patch
+ "${FILESDIR}"/${PN}-0.24-dash.patch
)
src_prepare() {
diff --git a/sys-cluster/charliecloud/charliecloud-0.24.ebuild
b/sys-cluster/charliecloud/charliecloud-0.24.ebuild
index ae43a8ed107..d7ab23b9539 100644
--- a/sys-cluster/charliecloud/charliecloud-0.24.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.24.ebuild
@@ -46,6 +46,10 @@ DEPEND="
net-misc/rsync
)"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.24-dash.patch
+)
+
src_prepare() {
default
eautoreconf
diff --git a/sys-cluster/charliecloud/files/charliecloud-0.24-dash.patch
b/sys-cluster/charliecloud/files/charliecloud-0.24-dash.patch
new file mode 100644
index 000..f03dc5e5b1a
--- /dev/null
+++ b/sys-cluster/charliecloud/files/charliecloud-0.24-dash.patch
@@ -0,0 +1,17 @@
+https://github.com/hpc/charliecloud/pull/
+
+From e540ad8148ba451349f4c4a7f983096ff0f6e60c Mon Sep 17 00:00:00 2001
+From: Oliver Freyermuth
+Date: Wed, 30 Jun 2021 21:38:54 +0200
+Subject: [PATCH] configure: Remove bashism from squashfuse version check.
+--- a/configure.ac
b/configure.ac
+@@ -380,7 +380,7 @@ CH_CHECK_VERSION([SHELLCHECK], [$vmin_shellcheck],
+ vmin_squashfuse=0.1.100 # Ubuntu 16.04 (Xenial). CentOS 7 has 0.1.102.
+ AC_CHECK_PROG([SQUASHFUSE], [squashfuse], [squashfuse])
+ CH_CHECK_VERSION([SQUASHFUSE], [$vmin_squashfuse],
+- [--help |& head -1 | cut -d' ' -f2])
++ [--help 2>&1 | head -1 | cut -d' ' -f2])
+
+ # sudo, generic
+ # Avoids prompting for password; see https://superuser.com/a/1183480.
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/charliecloud/, sys-cluster/charliecloud/files/
commit: 284491879b5e6a0da3ee409535d3ac6242e25990
Author: Oliver Freyermuth googlemail com>
AuthorDate: Sun May 16 14:08:05 2021 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sun May 16 15:08:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28449187
sys-cluster/charliecloud: backport >=dev-python/sphinx-4 fix
Closes: https://bugs.gentoo.org/790473
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Oliver Freyermuth googlemail.com>
Closes: https://github.com/gentoo/gentoo/pull/20838
Signed-off-by: Joonas Niilola gentoo.org>
sys-cluster/charliecloud/charliecloud-0.22.ebuild | 4
sys-cluster/charliecloud/charliecloud-0.23.ebuild | 4
.../files/charliecloud-0.22-sphinx-4.patch | 25 ++
3 files changed, 33 insertions(+)
diff --git a/sys-cluster/charliecloud/charliecloud-0.22.ebuild
b/sys-cluster/charliecloud/charliecloud-0.22.ebuild
index b9628597125..a2e756974db 100644
--- a/sys-cluster/charliecloud/charliecloud-0.22.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.22.ebuild
@@ -46,6 +46,10 @@ DEPEND="
net-misc/rsync
)"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.22-sphinx-4.patch
+)
+
src_prepare() {
default
eautoreconf
diff --git a/sys-cluster/charliecloud/charliecloud-0.23.ebuild
b/sys-cluster/charliecloud/charliecloud-0.23.ebuild
index ae43a8ed107..a210608743e 100644
--- a/sys-cluster/charliecloud/charliecloud-0.23.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.23.ebuild
@@ -46,6 +46,10 @@ DEPEND="
net-misc/rsync
)"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.22-sphinx-4.patch
+)
+
src_prepare() {
default
eautoreconf
diff --git a/sys-cluster/charliecloud/files/charliecloud-0.22-sphinx-4.patch
b/sys-cluster/charliecloud/files/charliecloud-0.22-sphinx-4.patch
new file mode 100644
index 000..474fa1efbbe
--- /dev/null
+++ b/sys-cluster/charliecloud/files/charliecloud-0.22-sphinx-4.patch
@@ -0,0 +1,25 @@
+From f424c4078eab817b4af712b85184c4f07e2289c6 Mon Sep 17 00:00:00 2001
+From: Reid Priedhorsky <1682574+rei...@users.noreply.github.com>
+Date: Wed, 12 May 2021 15:18:15 -0600
+Subject: [PATCH] PR #1062: configure Sphinx 4.x behavior to match 3.x (closes
+ #1060)
+
+---
+ doc/conf.py | 4
+ 1 file changed, 4 insertions(+)
+
+diff --git a/doc/conf.py b/doc/conf.py
+index 53a187bbb..417c91629 100644
+--- a/doc/conf.py
b/doc/conf.py
+@@ -238,6 +238,10 @@
+
+ # -- Options for manual page output
+
++# Put all man pages in one directory regardless of section. Default changes to
++# True in Sphinx 4.0, which broke our builds (#1060).
++man_make_section_directory = False
++
+ # One entry per manual page. List of tuples
+ # (source start file, name, description, authors, manual section).
+ man_pages = [
[gentoo-commits] repo/gentoo:master commit in: sys-cluster/charliecloud/, sys-cluster/charliecloud/files/
commit: 573ebe4677679173557b56576a024f1faaed7459
Author: Oliver Freyermuth googlemail com>
AuthorDate: Sat Jul 11 16:11:26 2020 +
Commit: Christoph Junghans gentoo org>
CommitDate: Sat Jul 11 17:05:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=573ebe46
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 googlemail.com>
Signed-off-by: Christoph Junghans gentoo.org>
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(-)
diff --git a/sys-cluster/charliecloud/Manifest
b/sys-cluster/charliecloud/Manifest
index 058daaccdd3..3b195292bc2 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 b1560f0ec96..000
--- 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} == "" ]] ; 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 07e72b2fbd3..000
--- 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)) \
-
