gentoo christmass resync : 25.12.2020

4 files changed, 16 insertions, 17 deletions

diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest
index a69ef5f323e7..c20986a8bad2 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -1,6 +1,6 @@
-DIST charliecloud-0.19.tar.gz 370553 BLAKE2B a87fc00a88528dfaf5a0a666ff92b98ee4bc7d37c5eaaa7c5029e4269b497d280e1e84757bf882f94480b618ac2430b0cc0550406317e8247155e1b380d30c8b SHA512 e2a000155ac2cc5bd40e1f2a7c2d873e4860bd5ef28a362ce5a04a1f4152b2ad1124055755c288e6ae5d40067661dfacbb77a528e3c071aa189765e0d29addb5
 DIST charliecloud-0.20.tar.gz 372770 BLAKE2B a5e6ad3fc93aa7219ec8d35ae112fc7320befc909d2cc805f5d67a356840112c245581c18d790a4fc755e70240e6444059cab8b9531eaedb3e3b941cf756aa55 SHA512 e3269bbf667462214ba88f8fc4651396c9621cd315a798113b66e8be0d4367ce1c18b8b956f325bd07049d644b46fd6837c5b712ced4bdf20a42bcc9aaafd8b7
-EBUILD charliecloud-0.19.ebuild 2163 BLAKE2B 6b093391f3bbe38b0604eefa588f9a1fe846bc00afff920ecd12c9d27cddeea1ced4ecdc282c8088d75987e1597c10427abf157f272b3d0936dc31dac35b1ff3 SHA512 aab3d7ad72b2fd95bf0ebeedc4fd81b31b970aa1ab163bcc55aae55fc71694a1240ad15d56c00598d549f721850a6ee81979b795ed43ad19265a2e928c1366f4
+DIST charliecloud-0.21.tar.gz 386637 BLAKE2B a5b115a9d741a2c83596a302e7dd3d0d6096eb11f3e38925009b05f5a16f2d6fa4ff1c0023789feae1d359c94e4970dcc62d597437c6f7143f8152603b0e9a88 SHA512 89351e4dc039cd724c7503a4855f0980128d28aa4e2e98c5fd8cc5060e2c853e65280b830526691c8d4c7d85168658d578236893075637e3a38c6eb1df4e8dfe
 EBUILD charliecloud-0.20.ebuild 2194 BLAKE2B bcf9d551e98d9ded0c1e88ca109a1002a5c2feb7e92878fce7498096d8e39f01d14f0c75e3e51d16386c8f814a2d9f6b201726dc9c1db08d9ed77e494905520e SHA512 c96e8f8136ee42c48733f074d3eb5d47bb0a3f3a92ea16b9b4845d7c9a5cb22cc27287eab4a156728e29faacc0abb1b2904a4fd30375e3df1fd9fea55de4d52c
-EBUILD charliecloud-9999.ebuild 2194 BLAKE2B bcf9d551e98d9ded0c1e88ca109a1002a5c2feb7e92878fce7498096d8e39f01d14f0c75e3e51d16386c8f814a2d9f6b201726dc9c1db08d9ed77e494905520e SHA512 c96e8f8136ee42c48733f074d3eb5d47bb0a3f3a92ea16b9b4845d7c9a5cb22cc27287eab4a156728e29faacc0abb1b2904a4fd30375e3df1fd9fea55de4d52c
-MISC metadata.xml 729 BLAKE2B 2ab3f15b004e2a01fa5e0b427058b66d2dfc61c9f426720054f8535fbfa28c3cb4f284fedb6b4eba2f27a3bb7ac4c6a246d7360b24a26448d9205334bd680765 SHA512 e77a6ffc83df8735a081412f86f85c8783ee5b3f0030989407ac9725d1292f1b937499f495cde32b6c59ce009d835238596d28ea9b891578bbc3c56bc05e8893
+EBUILD charliecloud-0.21.ebuild 2198 BLAKE2B 5c3051284da63c9ea5706b38b55a1cbdf01eb54556b113ee98dc16372583b3ded574729a15b9b0be013ecf057aa17804d6cf82257d4e8ef881cac58598f76a19 SHA512 da59fca5d83b423ec29ffc7ed1f1782d8cf7a88ea399d795537cb54866feb6e0280b64d71b7e3794d15970c4b6c69967d20cdc781985094a7e11ae536250c617
+EBUILD charliecloud-9999.ebuild 2198 BLAKE2B 5c3051284da63c9ea5706b38b55a1cbdf01eb54556b113ee98dc16372583b3ded574729a15b9b0be013ecf057aa17804d6cf82257d4e8ef881cac58598f76a19 SHA512 da59fca5d83b423ec29ffc7ed1f1782d8cf7a88ea399d795537cb54866feb6e0280b64d71b7e3794d15970c4b6c69967d20cdc781985094a7e11ae536250c617
+MISC metadata.xml 654 BLAKE2B 6112cf8d2f3a016c3ee824acafcac2bd01e5ea4de151c360258394a49acf6df8ced66f3c59cd46bd0ff78508f44cb317afa8d99e92f8079ebf3036575a8d719f SHA512 3d24e3f3efc185808acf84782cde2e2680d0eac4ccfff72d06bde54eec0b5cf84b6403e560b938d4821060786ca8a910a599e22ee61f03c77db1b68ef708b9cb
diff --git a/sys-cluster/charliecloud/charliecloud-0.19.ebuild b/sys-cluster/charliecloud/charliecloud-0.21.ebuild
index ff37c4fd92ac..9d82ccea8d02 100644
--- a/sys-cluster/charliecloud/charliecloud-0.19.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.21.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://hpc.github.io/charliecloud/"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-IUSE="ch-grow doc examples +squashfs squashfuse"
+IUSE="ch-image doc"
 
 # Extensive test suite exists, but downloads container images
 # directly and via Docker and installs packages inside using apt/yum.
@@ -30,11 +30,9 @@ RESTRICT="test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="${PYTHON_DEPS}
-	squashfs? ( sys-fs/squashfs-tools )
-	squashfuse? ( sys-fs/squashfuse )"
+RDEPEND="${PYTHON_DEPS}"
 DEPEND="
-	ch-grow? (
+	ch-image? (
 		$(python_gen_cond_dep '
 			dev-python/lark-parser[${PYTHON_MULTI_USEDEP}]
 			dev-python/requests[${PYTHON_MULTI_USEDEP}]
@@ -57,7 +55,7 @@ src_configure() {
 	local econf_args=()
 	econf_args+=(
 		$(use_enable doc html)
-		$(use_enable ch-grow)
+		$(use_enable ch-image)
 		# Libdir is used as a libexec-style destination.
 		--libdir="${EPREFIX}"/usr/lib
 		# Attempts to call python-exec directly otherwise.
@@ -70,11 +68,13 @@ src_configure() {
 
 pkg_postinst() {
 	elog "Various builders are supported, as alternative "
-	elog "to the internal ch-grow. The following packages "
+	elog "to the internal ch-image. The following packages "
 	elog "can be installed to get the corresponding support "
 	elog "and related functionality."
 
 	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/charliecloud-9999.ebuild b/sys-cluster/charliecloud/charliecloud-9999.ebuild
index af2a098d694e..9d82ccea8d02 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/"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-IUSE="ch-grow doc"
+IUSE="ch-image doc"
 
 # Extensive test suite exists, but downloads container images
 # directly and via Docker and installs packages inside using apt/yum.
@@ -32,7 +32,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}"
 DEPEND="
-	ch-grow? (
+	ch-image? (
 		$(python_gen_cond_dep '
 			dev-python/lark-parser[${PYTHON_MULTI_USEDEP}]
 			dev-python/requests[${PYTHON_MULTI_USEDEP}]
@@ -55,7 +55,7 @@ src_configure() {
 	local econf_args=()
 	econf_args+=(
 		$(use_enable doc html)
-		$(use_enable ch-grow)
+		$(use_enable ch-image)
 		# Libdir is used as a libexec-style destination.
 		--libdir="${EPREFIX}"/usr/lib
 		# Attempts to call python-exec directly otherwise.
@@ -68,7 +68,7 @@ src_configure() {
 
 pkg_postinst() {
 	elog "Various builders are supported, as alternative "
-	elog "to the internal ch-grow. The following packages "
+	elog "to the internal ch-image. The following packages "
 	elog "can be installed to get the corresponding support "
 	elog "and related functionality."
 
diff --git a/sys-cluster/charliecloud/metadata.xml b/sys-cluster/charliecloud/metadata.xml
index 5abb0dbdbf54..0e5ccf0b73ee 100644
--- a/sys-cluster/charliecloud/metadata.xml
+++ b/sys-cluster/charliecloud/metadata.xml
@@ -13,8 +13,7 @@
     <remote-id type="github">hpc/charliecloud</remote-id>
   </upstream>
   <use>
+    <flag name='ch-image'>Build the internal builder ch-image (previously named ch-grow)</flag>
     <flag name='ch-grow'>Build the internal builder ch-grow</flag>
-    <flag name='squashfs'>Use sys-fs/squashfs-tools for creating SquashFS images</flag>
-    <flag name='squashfuse'>Use sys-fs/squashfuse for the SquashFS workflow</flag>
   </use>
 </pkgmetadata>