commit: 8c7eb157a6b98c33d9fcad7c3eee2506415b19c2 Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com> AuthorDate: Sat May 3 19:22:24 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri May 23 04:56:18 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c7eb157
sys-cluster/charliecloud: add USE fuse Fixes automagic dependency on fuse and squashfuse. Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com> Part-of: https://github.com/gentoo/gentoo/pull/41920 Signed-off-by: Sam James <sam <AT> gentoo.org> .../{charliecloud-9999.ebuild => charliecloud-0.39-r1.ebuild} | 9 +++++++-- sys-cluster/charliecloud/charliecloud-9999.ebuild | 9 +++++++-- sys-cluster/charliecloud/metadata.xml | 1 + 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/sys-cluster/charliecloud/charliecloud-9999.ebuild b/sys-cluster/charliecloud/charliecloud-0.39-r1.ebuild similarity index 94% copy from sys-cluster/charliecloud/charliecloud-9999.ebuild copy to sys-cluster/charliecloud/charliecloud-0.39-r1.ebuild index 45301adb775e..210b07c67bfb 100644 --- a/sys-cluster/charliecloud/charliecloud-9999.ebuild +++ b/sys-cluster/charliecloud/charliecloud-0.39-r1.ebuild @@ -21,7 +21,7 @@ HOMEPAGE="https://hpc.github.io/charliecloud/"; LICENSE="Apache-2.0" SLOT="0" -IUSE="ch-image doc" +IUSE="ch-image doc +fuse" # Extensive test suite exists, but downloads container images # directly and via Docker and installs packages inside using apt/yum. @@ -42,6 +42,10 @@ COMMON_DEPEND=" dev-vcs/git net-misc/rsync ) + fuse? ( + sys-fs/fuse:3= + sys-fs/squashfuse + ) " RDEPEND=" ${DEPEND} @@ -72,6 +76,8 @@ src_configure() { local econf_args=( $(use_enable doc html) $(use_enable ch-image) + # activates linking against both fuse and squashfuse + $(use_with fuse libsquashfuse) # Libdir is used as a libexec-style destination. --libdir="${EPREFIX}"/usr/lib # Attempts to call python-exec directly otherwise. @@ -100,6 +106,5 @@ pkg_postinst() { 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 45301adb775e..210b07c67bfb 100644 --- a/sys-cluster/charliecloud/charliecloud-9999.ebuild +++ b/sys-cluster/charliecloud/charliecloud-9999.ebuild @@ -21,7 +21,7 @@ HOMEPAGE="https://hpc.github.io/charliecloud/"; LICENSE="Apache-2.0" SLOT="0" -IUSE="ch-image doc" +IUSE="ch-image doc +fuse" # Extensive test suite exists, but downloads container images # directly and via Docker and installs packages inside using apt/yum. @@ -42,6 +42,10 @@ COMMON_DEPEND=" dev-vcs/git net-misc/rsync ) + fuse? ( + sys-fs/fuse:3= + sys-fs/squashfuse + ) " RDEPEND=" ${DEPEND} @@ -72,6 +76,8 @@ src_configure() { local econf_args=( $(use_enable doc html) $(use_enable ch-image) + # activates linking against both fuse and squashfuse + $(use_with fuse libsquashfuse) # Libdir is used as a libexec-style destination. --libdir="${EPREFIX}"/usr/lib # Attempts to call python-exec directly otherwise. @@ -100,6 +106,5 @@ pkg_postinst() { 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/metadata.xml b/sys-cluster/charliecloud/metadata.xml index bdff4bd7ab8e..c4fc29317e2d 100644 --- a/sys-cluster/charliecloud/metadata.xml +++ b/sys-cluster/charliecloud/metadata.xml @@ -14,5 +14,6 @@ </upstream> <use> <flag name="ch-image">Build the internal builder ch-image (previously named ch-grow)</flag> + <flag name="fuse">Enable FUSE support for mounting squashfs images</flag> </use> </pkgmetadata>
