From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-348786-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1QRC8m-0003iV-Nx
for garchives@archives.gentoo.org; Mon, 30 May 2011 23:44:57 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id B09161C057;
Mon, 30 May 2011 23:44:49 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 7D8231C057
for <gentoo-commits@lists.gentoo.org>; Mon, 30 May 2011 23:44:49 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 1C5201B4011
for <gentoo-commits@lists.gentoo.org>; Mon, 30 May 2011 23:44:49 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id C43BC80508
for <gentoo-commits@lists.gentoo.org>; Mon, 30 May 2011 23:44:47 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org>
Message-ID: <f67dfd2c24aa127f5d596b3d1f051df8d8cbf5fb.zmedico@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/tests/resolver/
X-VCS-Repository: proj/portage
X-VCS-Files: pym/portage/tests/resolver/test_merge_order.py
X-VCS-Directories: pym/portage/tests/resolver/
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: f67dfd2c24aa127f5d596b3d1f051df8d8cbf5fb
Date: Mon, 30 May 2011 23:44:47 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: cf0c7c7744095db801ef169fc84330c8
commit: f67dfd2c24aa127f5d596b3d1f051df8d8cbf5fb
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 23:43:33 2011 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Mon May 30 23:43:33 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3Df67dfd2c
test_merge_order: add USE deps to bug 264434 test
---
pym/portage/tests/resolver/test_merge_order.py | 22 ++++++++++++++++++=
----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/pym/portage/tests/resolver/test_merge_order.py b/pym/portage=
/tests/resolver/test_merge_order.py
index 6aa19c0..e42b772 100644
--- a/pym/portage/tests/resolver/test_merge_order.py
+++ b/pym/portage/tests/resolver/test_merge_order.py
@@ -170,12 +170,19 @@ class MergeOrderTestCase(TestCase):
"DEPEND" : "kde-base/libkdegames",
"RDEPEND" : "kde-base/libkdegames",
},
- "media-video/ffmpeg-0.7_rc1" : {},
"media-video/libav-0.7_pre20110327" : {
+ "EAPI" : "2",
+ "IUSE" : "X +encode",
"RDEPEND" : "!media-video/ffmpeg",
},
+ "media-video/ffmpeg-0.7_rc1" : {
+ "EAPI" : "2",
+ "IUSE" : "X +encode",
+ },
"virtual/ffmpeg-0.6.90" : {
- "RDEPEND" : "|| ( >=3Dmedia-video/ffmpeg-0.6.90_rc0-r2 >=3Dmedia-vid=
eo/libav-0.6.90_rc )",
+ "EAPI" : "2",
+ "IUSE" : "X +encode",
+ "RDEPEND" : "|| ( >=3Dmedia-video/ffmpeg-0.6.90_rc0-r2[X=3D,encode=3D=
] >=3Dmedia-video/libav-0.6.90_rc[X=3D,encode=3D] )",
},
}
=20
@@ -228,9 +235,16 @@ class MergeOrderTestCase(TestCase):
"RDEPEND": "",
},
"app-arch/xz-utils-5.0.1" : {},
- "media-video/ffmpeg-0.7_rc1" : {},
+ "media-video/ffmpeg-0.7_rc1" : {
+ "EAPI" : "2",
+ "IUSE" : "X +encode",
+ "USE" : "encode",
+ },
"virtual/ffmpeg-0.6.90" : {
- "RDEPEND" : "|| ( >=3Dmedia-video/ffmpeg-0.6.90_rc0-r2 >=3Dmedia-vid=
eo/libav-0.6.90_rc )",
+ "EAPI" : "2",
+ "IUSE" : "X +encode",
+ "USE" : "encode",
+ "RDEPEND" : "|| ( >=3Dmedia-video/ffmpeg-0.6.90_rc0-r2[X=3D,encode=3D=
] >=3Dmedia-video/libav-0.6.90_rc[X=3D,encode=3D] )",
},
}
=20