Use USE dependencies to work around packages with incorrect dependencies.

Package-Manager: portage-HEAD/cvs/Linux x86_64

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index fb653363237276a07dc2c60acc9d23971512802c..a9acaab8fdd7b61bb7ea82953a9f8bfa8a0a4e09 100644 (file)
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -19,6 +19,6 @@ EBUILD python-2.4.6.ebuild 9183 RMD160 2c5c071f04ba8d7b4b2f7feaab4edeb2ced45c75
 EBUILD python-2.5.4-r4.ebuild 9546 RMD160 7883e9270894f2a1f0ad9aaa39f6bbf303c0d150 SHA1 bb73bfa7e770196792335141a689601aad3531fe SHA256 1ba673bb92492cd6f9cb7be8ec0750203a5a446f85ed646d60e58cc2a254a953
 EBUILD python-2.6.4-r1.ebuild 9595 RMD160 16965b55db01472c632cd5c5e6a97a5de6afb9f1 SHA1 089452541a0e5c98c5299dc6eefb57bc1f3fede7 SHA256 226a1228e20485b484f6e5581b2ed65e3946229f42b6bf5f07a8794fd592e6dc
 EBUILD python-2.6.5-r2.ebuild 9404 RMD160 2564685cc974c8091daae4b894b6f3a844ee4457 SHA1 722b65fbe3869df6e79a4407dd6f33123d0d077a SHA256 0c76cf16a64fa6471325b04b0ab56e56ccab039eb0bce45b6f2b391b9daa0f1b
-EBUILD python-3.1.2-r3.ebuild 9010 RMD160 a51dc846da1539a3fce044c937420df84b90b94a SHA1 cdd2ad13b9440bd5e1b71e28dd72dadd3cebda2b SHA256 2c6cc9d6cec1ab5d1b1c72e8246855fb795192d6ee72c8ac84a0d486c0adaf97
+EBUILD python-3.1.2-r3.ebuild 9144 RMD160 bbadcf587205bf0e3712cb459002ee3e1f3cfee5 SHA1 c5e714e98d8e9a19c18a3912d1ec11a97a336e5e SHA256 861ab835557897034311275a74e95cb6a23ef21b861d884cad41aee5b9096eff
 MISC ChangeLog 83404 RMD160 97c60394258d37cf5f3740a2cba7f8c22214ecab SHA1 0ab88c4c8934b4ce793746cfb8e7f440bb320ae2 SHA256 792ed379800e03d2619133e7e6a2f5120895f4de22a64d370d0470017161d64c
 MISC metadata.xml 661 RMD160 54831d16b8807086bfabdbb3df9d33336b5d42a0 SHA1 9867c337fe9e6f4e967004fc9409763e0fedf43b SHA256 2c6c3407251f7ccd6501dee49494e539a9544f2fbae99a4373eefdf4e83e8908

diff --git a/dev-lang/python/python-3.1.2-r3.ebuild b/dev-lang/python/python-3.1.2-r3.ebuild
index 629126ef8199f3212fac031b4f3bcd2fd9f2013a..4db6ee79fb8803eeb6e6dca1aae5b3ea62fbaf36 100644 (file)
--- a/dev-lang/python/python-3.1.2-r3.ebuild
+++ b/dev-lang/python/python-3.1.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.2-r3.ebuild,v 1.6 2010/05/20 21:14:09 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.2-r3.ebuild,v 1.7 2010/05/22 21:08:23 arfrever Exp $
 
 EAPI="3"
 
@@ -42,7 +42,10 @@ DEPEND="${RDEPEND}
                !sys-devel/gcc[libffi]"
 RDEPEND+=" !build? ( app-misc/mime-types )"
 PDEPEND=">=app-admin/python-updater-0.8
-               || ( dev-lang/python:2.7 dev-lang/python:2.6 )"
+               || (
+                       dev-lang/python:2.7[gdbm?,ipv6?,ncurses?,readline?,sqlite?,ssl?,threads?,tk?,xml?]
+                       dev-lang/python:2.6[gdbm?,ipv6?,ncurses?,readline?,sqlite?,ssl?,threads?,tk?,xml?]
+               )"
 
 PROVIDE="virtual/python"