Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/salt/
Date: Sat, 17 Jul 2021 17:27:45
Message-Id: 1626542844.d4af5bb08dbb9e759d6fac16cf23feba26ea7e3b.mattst88@gentoo
1 commit: d4af5bb08dbb9e759d6fac16cf23feba26ea7e3b
2 Author: Francisco Javier Félix <web <AT> inode64 <DOT> com>
3 AuthorDate: Wed Jul 7 08:37:41 2021 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 17 17:27:24 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4af5bb0
7
8 app-admin/salt: Remove contextvars dependency
9
10 Closes: https://bugs.gentoo.org/799431
11 Closes: https://github.com/gentoo/gentoo/pull/21547
12 Signed-off-by: Francisco Javier Félix <ffelix <AT> inode64.com>
13 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
14
15 app-admin/salt/{salt-3003.1.ebuild => salt-3003.1-r1.ebuild} | 3 +++
16 1 file changed, 3 insertions(+)
17
18 diff --git a/app-admin/salt/salt-3003.1.ebuild b/app-admin/salt/salt-3003.1-r1.ebuild
19 similarity index 98%
20 rename from app-admin/salt/salt-3003.1.ebuild
21 rename to app-admin/salt/salt-3003.1-r1.ebuild
22 index 83ee4b77905..5c542bc2bd4 100644
23 --- a/app-admin/salt/salt-3003.1.ebuild
24 +++ b/app-admin/salt/salt-3003.1-r1.ebuild
25 @@ -143,6 +143,9 @@ python_prepare() {
26 local abc
27 abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die
28 find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die
29 +
30 + # removes contextvars, see bug: https://bugs.gentoo.org/799431
31 + sed -i '/^contextvars/d' requirements/base.txt || die
32 }
33
34 python_install_all() {