gentoo resync : 08.07.2021

4 files changed, 22 insertions, 3 deletions

diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest
index 9ece4f9ee29c..b90cece11767 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -1,7 +1,8 @@
 AUX charliecloud-0.22-sphinx-4.patch 838 BLAKE2B 09fbf97c9145ca050ffb56215c5e114354c6fad39eda5e9876427b8272c700a495137dbeac1972eb3aaf525322634f5250595293f9f5af04421b6cc85ba89732 SHA512 1743e8fd6619185059892e70c1906d99d60c9fd27392eab331dd8f624c842aa1426f77da4f7b826cf0025d92777d30aba137f9d3685037607af66560031e3bd1
+AUX charliecloud-0.24-dash.patch 779 BLAKE2B 5062e284c59b63a20e2e291c0674d832fb7a9b0546c4fff515f48bb8944548c6f673db286551f0d16740c38885a3f9ca3a08c60c98bfdc984d958abffd2ddff7 SHA512 111f4db9a39f03710317af68a321ab496930ce4f8dd32ec8b8c47a5e9489d2313f0175d7580d25cb095e86b3d9148262fb4d4a1862c235739e39fc6732eb45bc
 DIST charliecloud-0.23.tar.gz 403281 BLAKE2B f7a6824782e7bf3bdb51ae791fdca2f5929f5c713590ff49cc8a7e1e1c1758e83bdd429a99497dd15e565d01f0f66f2873f64edddacf24ea78f68c2326669db7 SHA512 35543ed3d838b80fbb64fe3e658993fe9f7ded2d1dfd92e0e9a7725fab6d872503a790964c0f3fabb6438c8bd872b5b00cdf31a028f26588b318b9d0dc568119
 DIST charliecloud-0.24.tar.gz 420852 BLAKE2B ca55231c74012a678c24133b28e341392865a562653086766e6b5e570744f31ce69d1afa2bbb2cc85d5e52b6ed6e9f42f67187d9998afd3852a10fd4a8ff29d3 SHA512 41f44ef5f12dc35d7972923a84044b7255801705d4fcabf76e675dcb70a9f25422e7d584a7b49135ef2ae5dc1751a39efd84f8eb719653a769b41f46bd558fd2
-EBUILD charliecloud-0.23.ebuild 2124 BLAKE2B 672e1584fc4cd100a77618bd6a3b2f7fa1b7fa850f573e2c80ad946834bc138e626de483fd123d4eb4a9494f037219b83d2079fa3c4f4d1844a27039e5050375 SHA512 02fa7e8b8343850ababaee5eab491325aa2c1e598dcb0a871dd57b1fd44d04c8941949b09ee946f295ebd52efda4e172d5ce9405d17a536b6d68a3904ce5c372
-EBUILD charliecloud-0.24.ebuild 2124 BLAKE2B 672e1584fc4cd100a77618bd6a3b2f7fa1b7fa850f573e2c80ad946834bc138e626de483fd123d4eb4a9494f037219b83d2079fa3c4f4d1844a27039e5050375 SHA512 02fa7e8b8343850ababaee5eab491325aa2c1e598dcb0a871dd57b1fd44d04c8941949b09ee946f295ebd52efda4e172d5ce9405d17a536b6d68a3904ce5c372
+EBUILD charliecloud-0.23.ebuild 2161 BLAKE2B afb61b96bcc421d8b12e57b140847dafd6de6b7276bd73dd98847c469e584cc2905c6446b9ca72f6b800717b72ac29f7335ce98ac1c97919232525e7f409084e SHA512 66d8c7ef58d8d70a8336b055f1c0a1697d171262e406888172da39db988587e3ced07ebe9fc7cfa5863199badcff576fe1decdbc66c20868c5dc4179ce8a11a3
+EBUILD charliecloud-0.24.ebuild 2120 BLAKE2B 60548b6ea87b1fbcb8314eba4f01d3a9df7e79ea4efb62f57371d4dda459fd94fc8042c98a30c2dd60d4caa12a3699ec9d4713f0fb1fe2476e5c4df76274d427 SHA512 4a2f9fa0332f446a110adec9ad9c670ec0c980f1481809aa8301d8567c53a4c6034d6e8ec58566a04fc49fd12f0b25f0fa2010f14a7a3fe45e8a8ccdd47e4465
 EBUILD charliecloud-9999.ebuild 2070 BLAKE2B b703c4d5bc566cca1acf2f5555208d5ebc9457d3f3cce1141e86b3f08c5a26902ff3ebc4f21cbd456cca09c1e48f862745f181f26917a90da563cec68eebb70a SHA512 12a3d6d5a77fabf562cacf533ff6a52b24118a153e9342fd7c49359213882e2a5c17b7df247040aa270787af9f34f89f984f93ba304b7f50d32c1d0a11d0d7b6
 MISC metadata.xml 617 BLAKE2B 1c9b75dc0e15fec82053803042667d20b9b3cf49bc90a2630bc7dd3139de79d1d1791e5677640d510a3641ab7d117037bb5134ccb336f5027b5ea7105f63eafb SHA512 8fb83c8b9c57c98893ebfc724026a88e484ef2f7d50c6ede3dcd982978cf428b699126c5eb5e7cec3c3308c875b657bca53dc879030b54fd3c0d03282cd1776f
diff --git a/sys-cluster/charliecloud/charliecloud-0.23.ebuild b/sys-cluster/charliecloud/charliecloud-0.23.ebuild
index a210608743e5..612b89ec6158 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 a210608743e5..d7ab23b95398 100644
--- a/sys-cluster/charliecloud/charliecloud-0.24.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.24.ebuild
@@ -47,7 +47,7 @@ DEPEND="
 	)"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.22-sphinx-4.patch
+	"${FILESDIR}"/${PN}-0.24-dash.patch
 )
 
 src_prepare() {
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 000000000000..f03dc5e5b1aa
--- /dev/null
+++ b/sys-cluster/charliecloud/files/charliecloud-0.24-dash.patch
@@ -0,0 +1,17 @@
+https://github.com/hpc/charliecloud/pull/1111
+
+From e540ad8148ba451349f4c4a7f983096ff0f6e60c Mon Sep 17 00:00:00 2001
+From: Oliver Freyermuth <o.freyermuth@googlemail.com>
+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.