1 |
commit: f67dfd2c24aa127f5d596b3d1f051df8d8cbf5fb |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 30 23:43:33 2011 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 30 23:43:33 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=f67dfd2c |
7 |
|
8 |
test_merge_order: add USE deps to bug 264434 test |
9 |
|
10 |
--- |
11 |
pym/portage/tests/resolver/test_merge_order.py | 22 ++++++++++++++++++---- |
12 |
1 files changed, 18 insertions(+), 4 deletions(-) |
13 |
|
14 |
diff --git a/pym/portage/tests/resolver/test_merge_order.py b/pym/portage/tests/resolver/test_merge_order.py |
15 |
index 6aa19c0..e42b772 100644 |
16 |
--- a/pym/portage/tests/resolver/test_merge_order.py |
17 |
+++ b/pym/portage/tests/resolver/test_merge_order.py |
18 |
@@ -170,12 +170,19 @@ class MergeOrderTestCase(TestCase): |
19 |
"DEPEND" : "kde-base/libkdegames", |
20 |
"RDEPEND" : "kde-base/libkdegames", |
21 |
}, |
22 |
- "media-video/ffmpeg-0.7_rc1" : {}, |
23 |
"media-video/libav-0.7_pre20110327" : { |
24 |
+ "EAPI" : "2", |
25 |
+ "IUSE" : "X +encode", |
26 |
"RDEPEND" : "!media-video/ffmpeg", |
27 |
}, |
28 |
+ "media-video/ffmpeg-0.7_rc1" : { |
29 |
+ "EAPI" : "2", |
30 |
+ "IUSE" : "X +encode", |
31 |
+ }, |
32 |
"virtual/ffmpeg-0.6.90" : { |
33 |
- "RDEPEND" : "|| ( >=media-video/ffmpeg-0.6.90_rc0-r2 >=media-video/libav-0.6.90_rc )", |
34 |
+ "EAPI" : "2", |
35 |
+ "IUSE" : "X +encode", |
36 |
+ "RDEPEND" : "|| ( >=media-video/ffmpeg-0.6.90_rc0-r2[X=,encode=] >=media-video/libav-0.6.90_rc[X=,encode=] )", |
37 |
}, |
38 |
} |
39 |
|
40 |
@@ -228,9 +235,16 @@ class MergeOrderTestCase(TestCase): |
41 |
"RDEPEND": "", |
42 |
}, |
43 |
"app-arch/xz-utils-5.0.1" : {}, |
44 |
- "media-video/ffmpeg-0.7_rc1" : {}, |
45 |
+ "media-video/ffmpeg-0.7_rc1" : { |
46 |
+ "EAPI" : "2", |
47 |
+ "IUSE" : "X +encode", |
48 |
+ "USE" : "encode", |
49 |
+ }, |
50 |
"virtual/ffmpeg-0.6.90" : { |
51 |
- "RDEPEND" : "|| ( >=media-video/ffmpeg-0.6.90_rc0-r2 >=media-video/libav-0.6.90_rc )", |
52 |
+ "EAPI" : "2", |
53 |
+ "IUSE" : "X +encode", |
54 |
+ "USE" : "encode", |
55 |
+ "RDEPEND" : "|| ( >=media-video/ffmpeg-0.6.90_rc0-r2[X=,encode=] >=media-video/libav-0.6.90_rc[X=,encode=] )", |
56 |
}, |
57 |
} |