From d4af5bb08dbb9e759d6fac16cf23feba26ea7e3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Javier=20F=C3=A9lix?= Date: Wed, 7 Jul 2021 10:37:41 +0200 Subject: [PATCH] app-admin/salt: Remove contextvars dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/799431 Closes: https://github.com/gentoo/gentoo/pull/21547 Signed-off-by: Francisco Javier Félix Signed-off-by: Matt Turner --- app-admin/salt/{salt-3003.1.ebuild => salt-3003.1-r1.ebuild} | 3 +++ 1 file changed, 3 insertions(+) rename app-admin/salt/{salt-3003.1.ebuild => salt-3003.1-r1.ebuild} (98%) diff --git a/app-admin/salt/salt-3003.1.ebuild b/app-admin/salt/salt-3003.1-r1.ebuild similarity index 98% rename from app-admin/salt/salt-3003.1.ebuild rename to app-admin/salt/salt-3003.1-r1.ebuild index 83ee4b7790503..5c542bc2bd472 100644 --- a/app-admin/salt/salt-3003.1.ebuild +++ b/app-admin/salt/salt-3003.1-r1.ebuild @@ -143,6 +143,9 @@ python_prepare() { local abc abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die + + # removes contextvars, see bug: https://bugs.gentoo.org/799431 + sed -i '/^contextvars/d' requirements/base.txt || die } python_install_all() {