testVirtualCmakeBootstrapUseConditional: split out virtual/cmake

If we split the dependency conditional on the bootstrap USE flag into a
virtual, then it suffices to rebuild the virtual with USE=-bootstrap
instead of rebuilding jsoncpp:

 * Error: circular dependencies:

(dev-libs/jsoncpp-1.9.2:0/0::test_repo, ebuild scheduled for merge) depends on
 (virtual/cmake-0:0/0::test_repo, ebuild scheduled for merge) (buildtime)
  (dev-util/cmake-3.16.2:0/0::test_repo, ebuild scheduled for merge) (buildtime)
   (dev-libs/jsoncpp-1.9.2:0/0::test_repo, ebuild scheduled for merge) (buildtime_slot_op)

It might be possible to break this cycle
by applying the following change:
- virtual/cmake-0 (Change USE: +bootstrap)

Note that this change can be reverted, once the package has been installed.

Bug: https://bugs.gentoo.org/703440
Signed-off-by: Zac Medico <zmedico@gentoo.org>

1 files changed, 7 insertions, 3 deletions

diff --git a/lib/portage/tests/resolver/test_circular_choices.py b/lib/portage/tests/resolver/test_circular_choices.py
index 366f2bc27..ef9e88eac 100644
--- a/lib/portage/tests/resolver/test_circular_choices.py
+++ b/lib/portage/tests/resolver/test_circular_choices.py
@@ -51,8 +51,7 @@ class CircularJsoncppCmakeBootstrapTestCase(TestCase):
 		ebuilds = {
 			'dev-libs/jsoncpp-1.9.2': {
 				'EAPI': '7',
-				'IUSE': '+bootstrap',
-				'BDEPEND': 'bootstrap? ( dev-util/cmake-bootstrap ) !bootstrap? ( dev-util/cmake )'
+				'BDEPEND': 'virtual/cmake'
 			},
 			'dev-util/cmake-bootstrap-3.16.2': {
 				'EAPI': '7',
@@ -61,13 +60,18 @@ class CircularJsoncppCmakeBootstrapTestCase(TestCase):
 				'EAPI': '7',
 				'BDEPEND': '>=dev-libs/jsoncpp-0.6.0_rc2:0=',
 			},
+			'virtual/cmake-0': {
+				'EAPI': '7',
+				'IUSE': '+bootstrap',
+				'BDEPEND': 'bootstrap? ( dev-util/cmake-bootstrap ) !bootstrap? ( dev-util/cmake )'
+			},
 		}
 
 		test_cases = (
 			# Solve bug 703440 with a dependency conditional on the bootstrap USE flag.
 			ResolverPlaygroundTestCase(
 				['dev-util/cmake'],
-				mergelist = ['dev-util/cmake-bootstrap-3.16.2', 'dev-libs/jsoncpp-1.9.2', 'dev-util/cmake-3.16.2'],
+				mergelist = ['dev-util/cmake-bootstrap-3.16.2', 'virtual/cmake-0', 'dev-libs/jsoncpp-1.9.2', 'dev-util/cmake-3.16.2'],
 				success = True,
 			),
 		)