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 BC4F91584AD for ; Thu, 24 Apr 2025 21:27:18 +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 9D466342FF4 for ; Thu, 24 Apr 2025 21:27:18 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 97E2911028B; Thu, 24 Apr 2025 21:27:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 893B711028B for ; Thu, 24 Apr 2025 21:27:17 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3D527342FF4 for ; Thu, 24 Apr 2025 21:27:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C4BB32395 for ; Thu, 24 Apr 2025 21:27:15 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1745529986.2fe30372de612e07c5c27d8265be3bbe0c53f30c.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: cnf/sets/, lib/portage/tests/sets/base/ X-VCS-Repository: proj/portage X-VCS-Files: cnf/sets/portage.conf lib/portage/tests/sets/base/test_variable_set.py X-VCS-Directories: cnf/sets/ lib/portage/tests/sets/base/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 2fe30372de612e07c5c27d8265be3bbe0c53f30c X-VCS-Branch: master Date: Thu, 24 Apr 2025 21:27:15 +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: a398c64d-82a1-4f89-98f6-3edc2a0d2ff5 X-Archives-Hash: d00fdb919bdcabb608c2cfe08807c904 commit: 2fe30372de612e07c5c27d8265be3bbe0c53f30c Author: Sam James gentoo org> AuthorDate: Thu Apr 24 21:26:26 2025 +0000 Commit: Sam James gentoo org> CommitDate: Thu Apr 24 21:26:26 2025 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=2fe30372 cnf: sets: bring back @golang-rebuild I think this is still useful and it got dropped from dev-lang/go. This reverts commit 1d3e3843f2a51c581d344540c5c6ee266afa30d2 except for the playground change. Bug: https://bugs.gentoo.org/919751 Signed-off-by: Sam James gentoo.org> cnf/sets/portage.conf | 7 +++++++ lib/portage/tests/sets/base/test_variable_set.py | 6 +----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/cnf/sets/portage.conf b/cnf/sets/portage.conf index 5d2bd180cd..55372a6153 100644 --- a/cnf/sets/portage.conf +++ b/cnf/sets/portage.conf @@ -110,6 +110,13 @@ class = portage.sets.dbapi.UnavailableBinaries [changed-deps] class = portage.sets.dbapi.ChangedDepsSet +# Installed packages for which vdb *DEPEND includes dev-lang/go. +[golang-rebuild] +class = portage.sets.dbapi.VariableSet +variable = BDEPEND +includes = dev-lang/go +excludes_output = dev-lang/go dev-lang/go-bootstrap + # Installed packages for which vdb *DEPEND includes rust [rust-rebuild] class = portage.sets.dbapi.VariableSet diff --git a/lib/portage/tests/sets/base/test_variable_set.py b/lib/portage/tests/sets/base/test_variable_set.py index 3d3f16d73b..9eb1321e79 100644 --- a/lib/portage/tests/sets/base/test_variable_set.py +++ b/lib/portage/tests/sets/base/test_variable_set.py @@ -10,10 +10,6 @@ from portage.tests.resolver.ResolverPlayground import ( class VariableSetTestCase(TestCase): def testVariableSetEmerge(self): - - # Using local set definition because @golang-rebuild migrated to dev-lang/go since bug 919751. - golang_rebuild = "{class=portage.sets.dbapi.VariableSet,variable=BDEPEND,includes=dev-lang/go}" - # rust_with_rustc_rebuild = "{class=portage.sets.dbapi.VariableSet,variable=BDEPEND,includes=dev-lang/rust dev-lang/rust-bin}" ebuilds = { @@ -31,7 +27,7 @@ class VariableSetTestCase(TestCase): test_cases = ( ResolverPlaygroundTestCase( - [f"@golang-rebuild{golang_rebuild}"], + ["@golang-rebuild"], mergelist=["dev-go/go-pkg-1"], success=True, ),