[gentoo-commits] proj/portage:master commit in: cnf/sets/, lib/portage/tests/sets/base/

[gentoo-commits] proj/portage:master commit in: cnf/sets/, lib/portage/tests/sets/base/

[Sam James]

commit:     2fe30372de612e07c5c27d8265be3bbe0c53f30c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 24 21:26:26 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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,
             ),