gentoo resync : 02.02.2022

3 files changed, 6 insertions, 27 deletions

diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest
index 2aa4e5f8cfba..80cbac2ebfd5 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -1,8 +1,7 @@
-AUX charliecloud-0.24-dash.patch 779 BLAKE2B 5062e284c59b63a20e2e291c0674d832fb7a9b0546c4fff515f48bb8944548c6f673db286551f0d16740c38885a3f9ca3a08c60c98bfdc984d958abffd2ddff7 SHA512 111f4db9a39f03710317af68a321ab496930ce4f8dd32ec8b8c47a5e9489d2313f0175d7580d25cb095e86b3d9148262fb4d4a1862c235739e39fc6732eb45bc
 AUX charliecloud-0.24-musl-argp.patch 1304 BLAKE2B cefc0e45803a1e82d62e4e7d16d6b39d1a25e76f7750977a6e5f91f48f87b24cc7b3ef2955375343ba122a90646aa3a33cdb3fe2aec06bba9bc6ffa56d85475b SHA512 87e0d73522f9777987e39ec841fd4ca6af62e81b2f73cf02df8590e8a82d8f8cc49ba44242c35fb898d0cdb5044e37f0902efeae4e0c2e4170c8ed15d4df6d31
-DIST charliecloud-0.24.tar.gz 420852 BLAKE2B ca55231c74012a678c24133b28e341392865a562653086766e6b5e570744f31ce69d1afa2bbb2cc85d5e52b6ed6e9f42f67187d9998afd3852a10fd4a8ff29d3 SHA512 41f44ef5f12dc35d7972923a84044b7255801705d4fcabf76e675dcb70a9f25422e7d584a7b49135ef2ae5dc1751a39efd84f8eb719653a769b41f46bd558fd2
 DIST charliecloud-0.25.tar.gz 454041 BLAKE2B 3a071f3b9fb06ca1db6d3b85a577943fe76440d395fdf1415d5085110db665fb75ee09dc14768d326e7e280e6c20096479e5f62290f7dee46821c356f5f18535 SHA512 a7a35b584dbdd6c6e27188d3555173c44f90c0e44fa685a15a47f47c94f9d76aa46ab80054a7c53e10a7f56bef87696f1db2a0eb8c49a388dbb0da0fe9112a60
-EBUILD charliecloud-0.24.ebuild 2181 BLAKE2B 4ac402158a26c0a684fccebe90c6cb64f3154076344cf4e27c49d86d2f1d49a07ece04515b7fdd3c76673008d6d1b41fbfab00410235628ebd8c223694ca11bc SHA512 b38b27dceb7365e5d65f77a0de13d4d45df24f9ed15813d776dae13995b4bb9ac715a6a04dcfde23ede82eebc1441cbec1e847a351e9c22b1144d26caa1e1489
+DIST charliecloud-0.26.tar.gz 472324 BLAKE2B 2b4b8f44f05a497e9367e97e49de255170b610880ef5d7909f7837bc54962f2c2de929d8381b99dc3f4b6124583744993b59839f8f1481cdbd5dc32334d3da9f SHA512 a8638db42a5563723b62ba0e9b9861b41e76b9246b94887d57a8d4c421d9dd2e8c0965b62af166e47859b72a50a2e01ec6775ef13f79c52696a6b2fd95134174
 EBUILD charliecloud-0.25.ebuild 2230 BLAKE2B 767bad4c7b77dbbf6687805b54c17d780ec51bdb09146cd58e8ec60f413ca12cf6232c1ff86fdfe3ebcf6de226d50d28c044296e6606736c89675ea23788d79d SHA512 232deff91ec5bf39cb13725e603edad2f208357581f3215a4ff4f6cc880dc83044bcb9210240a60b5667edefd964b22e6566e823ed38951c390591814c9a7465
+EBUILD charliecloud-0.26.ebuild 2175 BLAKE2B 312b4fd0225230943cb42704f8665c796d0712e387c46434c3e8ae8134ec13b37c9063e3dc31795f4705d7b632e0cc6dec3a47c8e3d77df7550a7224d8b30912 SHA512 49783cfdd1589748e1afc0f9152abba6f379a9cd0a492042ed1b509a21715ab95daacbd5c13580e4f4482d416474f04f54bc3af7dad20fe7fd3000fdb263d0d8
 EBUILD charliecloud-9999.ebuild 2175 BLAKE2B 0c62488a7e87e9c25833a20b4c619e8fa97d2586860dbdb80d329fb1b6dc5bbd26edd9c6e1cfb463ba9b627d9f013609d7a05fa5618bc3bf9197863dfca062f2 SHA512 c4e9e68f7c1a73ed6a9778cc29fb4559718742622680c62486b65f3d3a1f22718f1c426bb6b71455805fa7d44735ef72a576d86a0b0e85aff22e17dd2173281f
 MISC metadata.xml 618 BLAKE2B 5f7dbfdb8a940a534ed97b4bd47b05a271d6454b0584ac29db1c2fb533044a2c6d48b8425399866abd8d2ebea1f41199ea4cf23af1c6f2646d4c35b5b4c104a4 SHA512 df1b817bbabc6b227c9a779677d345b9df259444b943b1ab58d55c860cd79ad8f9d4b382dc6c4de0c5daa955fd694990217a559e897a3b11f7e954c7b54d4678
diff --git a/sys-cluster/charliecloud/charliecloud-0.24.ebuild b/sys-cluster/charliecloud/charliecloud-0.26.ebuild
index 951128bbb6df..8ce74691fe62 100644
--- a/sys-cluster/charliecloud/charliecloud-0.24.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.26.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
 inherit autotools optfeature python-single-r1
 
@@ -48,11 +48,6 @@ DEPEND="
 		net-misc/rsync
 	)"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.24-dash.patch
-	"${FILESDIR}"/${PN}-0.24-musl-argp.patch
-)
-
 src_prepare() {
 	default
 	eautoreconf
@@ -69,6 +64,8 @@ src_configure() {
 		--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[@]}"
 }
diff --git a/sys-cluster/charliecloud/files/charliecloud-0.24-dash.patch b/sys-cluster/charliecloud/files/charliecloud-0.24-dash.patch
deleted file mode 100644
index f03dc5e5b1aa..000000000000
--- a/sys-cluster/charliecloud/files/charliecloud-0.24-dash.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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.