gentoo resync : 25.11.2020

5 files changed, 29 insertions, 26 deletions

diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest
index e90d82596b9a..a69ef5f323e7 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -1,6 +1,6 @@
-DIST charliecloud-0.16.tar.gz 356118 BLAKE2B 72e7640feb23fbc55c515fd841cf90562b7800a83673b6a786c8162229b6714ed6a98d3c5066e42ce75a58935e085e86e42ae927cd5f14e6e54ffe6e9863629e SHA512 bf37b5ea2d139635f3207475497bd90595ce625ce9ad05eef5fcd19ec3252e4843eba2bd457587cd9c4ab860aa1e40ec01ac5cd073414bb5a4f89b5c4488bceb
-DIST charliecloud-0.18.tar.gz 366210 BLAKE2B 0da9542cccc39ff6f3ce97532e8576b8eb91c9d7f104fb31c1fe47ca88b3eb0150370fe7585c96a3f9ac3eee28e853866cf9a2c4bfc03b6dd1961d3731ae5439 SHA512 0b23db2348fb1fd491e450fa8684c47dae5acbbdac10fc3b12b5019e1db5f7024d259b43d082e0a4a202b5e79e042e408460d4b52f1e634eff3d4a7f4e68c50b
-EBUILD charliecloud-0.16.ebuild 2026 BLAKE2B 238c72c93696886ee6d4fb233ffea8cb87bf8aba4ccd095ddff7e5986c805d38d64cb1357c45a41de98b9b3d9e2a142ee088c124976fadd6c1ddec8192df7dcb SHA512 133ecfa2d891f9a2d7ee829efb25260652ca6ff5cbc17fb0c059c029c49b4ce730d3a694cafa28daaf47d52a4c35430938b38336498a77a4c9d7cfeb01ea4008
-EBUILD charliecloud-0.18.ebuild 2088 BLAKE2B bac49be9e8685d0b7f95ef7687de37a4f4d35becef4a028da72cceb777ec097c1035849ec6706029b07e2ea547baed2e049cf054405dc0c218b076140a222ee5 SHA512 bc62ad817d4aab0789e39547fc2070c20b684135b713805e31d41626077248fc4ea74150141eef481ef3644966159fe737d9ef8bfdb6f62d1ce31c49f1a4836a
-EBUILD charliecloud-9999.ebuild 2088 BLAKE2B bac49be9e8685d0b7f95ef7687de37a4f4d35becef4a028da72cceb777ec097c1035849ec6706029b07e2ea547baed2e049cf054405dc0c218b076140a222ee5 SHA512 bc62ad817d4aab0789e39547fc2070c20b684135b713805e31d41626077248fc4ea74150141eef481ef3644966159fe737d9ef8bfdb6f62d1ce31c49f1a4836a
-MISC metadata.xml 809 BLAKE2B 9dc29bca33e3a641ba5ddd913ee58d8c7703c55ca0e32db18a4f20ea70f871bf834637a1dab8934ef0034362dedf6b609acfcc5d534ac72d29b15ae32a56a17a SHA512 212cd70ac3e9fe0b91bc14feceef1f23e90c40c520ea8f9861847c93c6e341ca7f021a61d3608b3fd4a237c7681aa3fa7917c4ef1d849531eda0f3ca10ce4616
+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
+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
diff --git a/sys-cluster/charliecloud/charliecloud-0.18.ebuild b/sys-cluster/charliecloud/charliecloud-0.19.ebuild
index b35d7def4f93..ff37c4fd92ac 100644
--- a/sys-cluster/charliecloud/charliecloud-0.18.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.19.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit autotools optfeature python-single-r1
 
@@ -21,7 +21,7 @@ HOMEPAGE="https://hpc.github.io/charliecloud/"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-IUSE="ch-grow doc examples +pv +squashfs squashfuse"
+IUSE="ch-grow doc examples +squashfs squashfuse"
 
 # Extensive test suite exists, but downloads container images
 # directly and via Docker and installs packages inside using apt/yum.
@@ -31,7 +31,6 @@ RESTRICT="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	pv? ( sys-apps/pv )
 	squashfs? ( sys-fs/squashfs-tools )
 	squashfuse? ( sys-fs/squashfuse )"
 DEPEND="
@@ -72,8 +71,10 @@ src_configure() {
 pkg_postinst() {
 	elog "Various builders are supported, as alternative "
 	elog "to the internal ch-grow. The following packages "
-	elog "can be installed to get the corresponding support."
+	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
 }
diff --git a/sys-cluster/charliecloud/charliecloud-0.16.ebuild b/sys-cluster/charliecloud/charliecloud-0.20.ebuild
index d1d834d0655c..af2a098d694e 100644
--- a/sys-cluster/charliecloud/charliecloud-0.16.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.20.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit autotools optfeature python-single-r1
 
@@ -21,7 +21,7 @@ HOMEPAGE="https://hpc.github.io/charliecloud/"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-IUSE="ch-grow doc examples +pv +squashfs squashfuse"
+IUSE="ch-grow doc"
 
 # Extensive test suite exists, but downloads container images
 # directly and via Docker and installs packages inside using apt/yum.
@@ -30,10 +30,7 @@ RESTRICT="test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="${PYTHON_DEPS}
-	pv? ( sys-apps/pv )
-	squashfs? ( sys-fs/squashfs-tools )
-	squashfuse? ( sys-fs/squashfuse )"
+RDEPEND="${PYTHON_DEPS}"
 DEPEND="
 	ch-grow? (
 		$(python_gen_cond_dep '
@@ -51,7 +48,6 @@ DEPEND="
 
 src_prepare() {
 	default
-	sed -i 's/ -Werror//' configure.ac || die
 	eautoreconf
 }
 
@@ -64,6 +60,8 @@ src_configure() {
 		--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[@]}"
 }
@@ -71,8 +69,12 @@ src_configure() {
 pkg_postinst() {
 	elog "Various builders are supported, as alternative "
 	elog "to the internal ch-grow. The following packages "
-	elog "can be installed to get the corresponding support."
+	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 b35d7def4f93..af2a098d694e 100644
--- a/sys-cluster/charliecloud/charliecloud-9999.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit autotools optfeature python-single-r1
 
@@ -21,7 +21,7 @@ HOMEPAGE="https://hpc.github.io/charliecloud/"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-IUSE="ch-grow doc examples +pv +squashfs squashfuse"
+IUSE="ch-grow doc"
 
 # Extensive test suite exists, but downloads container images
 # directly and via Docker and installs packages inside using apt/yum.
@@ -30,10 +30,7 @@ RESTRICT="test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="${PYTHON_DEPS}
-	pv? ( sys-apps/pv )
-	squashfs? ( sys-fs/squashfs-tools )
-	squashfuse? ( sys-fs/squashfuse )"
+RDEPEND="${PYTHON_DEPS}"
 DEPEND="
 	ch-grow? (
 		$(python_gen_cond_dep '
@@ -72,8 +69,12 @@ src_configure() {
 pkg_postinst() {
 	elog "Various builders are supported, as alternative "
 	elog "to the internal ch-grow. The following packages "
-	elog "can be installed to get the corresponding support."
+	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/metadata.xml b/sys-cluster/charliecloud/metadata.xml
index 85cf8536faf3..5abb0dbdbf54 100644
--- a/sys-cluster/charliecloud/metadata.xml
+++ b/sys-cluster/charliecloud/metadata.xml
@@ -14,7 +14,6 @@
   </upstream>
   <use>
     <flag name='ch-grow'>Build the internal builder ch-grow</flag>
-    <flag name='pv'>Use sys-apps/pv to enable progress bar functionality</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>