From c1671591dc2b46038c871f9038ff4cb46dccc160 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 2 Dec 2020 09:28:45 -0800 Subject: MergeOrderTestCase: fix x11-drivers/xf86-video-fbdev slot operator deps The real ebuild has the x11-base/xorg-server:= dependency in RDEPEND rather than DEPEND. Fixes: 07a604537e74 ("find_smallest_cycle: don't merge satisfied PDEPEND too early") Signed-off-by: Zac Medico --- lib/portage/tests/resolver/test_merge_order.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/portage/tests/resolver/test_merge_order.py b/lib/portage/tests/resolver/test_merge_order.py index 0510a0636..db063ed9d 100644 --- a/lib/portage/tests/resolver/test_merge_order.py +++ b/lib/portage/tests/resolver/test_merge_order.py @@ -231,8 +231,8 @@ class MergeOrderTestCase(TestCase): }, "x11-drivers/xf86-video-fbdev-0.5.0-r1": { "EAPI": "7", - "DEPEND": "x11-base/xorg-server:=", - "RDEPEND": "x11-base/xorg-server", + "DEPEND": "x11-base/xorg-server", + "RDEPEND": "x11-base/xorg-server:=", } } @@ -325,8 +325,8 @@ class MergeOrderTestCase(TestCase): }, "x11-drivers/xf86-video-fbdev-0.5.0-r1": { "EAPI": "7", - "DEPEND": "x11-base/xorg-server:0/1.14.1=", - "RDEPEND": "x11-base/xorg-server", + "DEPEND": "x11-base/xorg-server", + "RDEPEND": "x11-base/xorg-server:0/1.14.1=", } } -- cgit v1.2.3-65-gdbad