From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9CD641581EE for ; Fri, 21 Mar 2025 19:52:53 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 8623B343259 for ; Fri, 21 Mar 2025 19:52:53 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id BD9C91104AB; Fri, 21 Mar 2025 19:52:49 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id B784F1104AB for ; Fri, 21 Mar 2025 19:52:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6F42234324E for ; Fri, 21 Mar 2025 19:52:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CF4FB1EEA for ; Fri, 21 Mar 2025 19:52:47 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1742578295.3bc08179b3ff8eb944b4784a56b5f02451770e8f.arthurzam@gentoo> Subject: [gentoo-commits] proj/pkgcore/pkgcore:master commit in: src/pkgcore/ebuild/ X-VCS-Repository: proj/pkgcore/pkgcore X-VCS-Files: src/pkgcore/ebuild/eapi.py X-VCS-Directories: src/pkgcore/ebuild/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: 3bc08179b3ff8eb944b4784a56b5f02451770e8f X-VCS-Branch: master Date: Fri, 21 Mar 2025 19:52:47 +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: a4b60313-8eb8-4854-b1f9-7fdeb169ec50 X-Archives-Hash: 3c6bfde778b66d55e24ff47890c19119 commit: 3bc08179b3ff8eb944b4784a56b5f02451770e8f Author: Arthur Zamarin gentoo org> AuthorDate: Fri Mar 21 17:20:33 2025 +0000 Commit: Arthur Zamarin gentoo org> CommitDate: Fri Mar 21 17:31:35 2025 +0000 URL: https://gitweb.gentoo.org/proj/pkgcore/pkgcore.git/commit/?id=3bc08179 EAPI=9: update bash_compat to 5.2 Bug: https://bugs.gentoo.org/946193 Signed-off-by: Arthur Zamarin gentoo.org> src/pkgcore/ebuild/eapi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pkgcore/ebuild/eapi.py b/src/pkgcore/ebuild/eapi.py index ce612743..90e899c0 100644 --- a/src/pkgcore/ebuild/eapi.py +++ b/src/pkgcore/ebuild/eapi.py @@ -859,6 +859,6 @@ eapi9 = EAPI.register( eclass_keys=eapi8.eclass_keys, tracked_attributes=eapi8.tracked_attributes, archive_exts=eapi8.archive_exts, - optionals=eapi8.options, + optionals=_combine_dicts(eapi8.options, dict(bash_compat="5.2")), ebd_env_options=eapi8._ebd_env_options, )