From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9027513933E for ; Sat, 17 Jul 2021 17:27:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D4129E0B35; Sat, 17 Jul 2021 17:27:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BC2D3E0B35 for ; Sat, 17 Jul 2021 17:27:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7D78D33BE3F for ; Sat, 17 Jul 2021 17:27:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CED0C7BC for ; Sat, 17 Jul 2021 17:27:41 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1626542844.d4af5bb08dbb9e759d6fac16cf23feba26ea7e3b.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/salt/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/salt/salt-3003.1-r1.ebuild app-admin/salt/salt-3003.1.ebuild X-VCS-Directories: app-admin/salt/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: d4af5bb08dbb9e759d6fac16cf23feba26ea7e3b X-VCS-Branch: master Date: Sat, 17 Jul 2021 17:27:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bb576700-bad6-4543-bf75-10237852406e X-Archives-Hash: 2ec88f0cf7e667847e21111d72752599 commit: d4af5bb08dbb9e759d6fac16cf23feba26ea7e3b Author: Francisco Javier Félix inode64 com> AuthorDate: Wed Jul 7 08:37:41 2021 +0000 Commit: Matt Turner gentoo org> CommitDate: Sat Jul 17 17:27:24 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4af5bb0 app-admin/salt: Remove contextvars dependency Closes: https://bugs.gentoo.org/799431 Closes: https://github.com/gentoo/gentoo/pull/21547 Signed-off-by: Francisco Javier Félix inode64.com> Signed-off-by: Matt Turner gentoo.org> app-admin/salt/{salt-3003.1.ebuild => salt-3003.1-r1.ebuild} | 3 +++ 1 file changed, 3 insertions(+) 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 83ee4b77905..5c542bc2bd4 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() {