Update dependencies.

Package-Manager: portage-14402-svn/cvs/Linux x86_64

3 files changed, 12 insertions, 12 deletions

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index f826d5617b5d..f64dd4e3481d 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -18,8 +18,8 @@ DIST python-gentoo-patches-3.1.1-r2.tar.bz2 8929 RMD160 26afbdbbec3bf0e394cb3082
 EBUILD python-2.4.6.ebuild 9423 RMD160 c0267203c0e2d5b5246834ff9840e627ff3b3bd8 SHA1 ccfc043a0dc14a1d2686619fad618fbdcace328d SHA256 9d3c0be5d6a82a845c694fcb31ffbbb4bb622f353441f37623978663cee665eb
 EBUILD python-2.5.4-r3.ebuild 9545 RMD160 364405c64e6ef8c5db45bee76c2ede87d9272bb6 SHA1 429027eb08b1f700acb8214719846672ada79588 SHA256 7df5bbcbb2373c67ceeb9f580a9406f3af5ec78f387b1cf293c0c5cd65efb2c7
 EBUILD python-2.6.2-r1.ebuild 9996 RMD160 ccd6f3394c7118c32fbf0f9f66dd795a7572e84e SHA1 0763fc240cccc1a899b4eef8a34d9b00a0349657 SHA256 9cfcb11d30762c754369066d69dbeee858e3b45626740fa5363cf9ce6e660a05
-EBUILD python-2.6.2-r2.ebuild 10278 RMD160 dc2700942f51227ea2986aa53eb598101e2637ce SHA1 f9176496e6b82d09cf4d9534d7a5396e54cbbdcf SHA256 290bf111155923c991d2373d1288a9c7a6babdc1b58dc0f84c43c429213497dc
-EBUILD python-3.1.1-r1.ebuild 8552 RMD160 3dd511935d17575d21ee77f07b70535a7ce2670e SHA1 f88e07ff0bb985c0209b0bca533e0659bf80fe07 SHA256 8ced7c6fa5a3ac5710c3aaabff40c76fc0cc6f0e5f795b8485e051ea15cce61a
+EBUILD python-2.6.2-r2.ebuild 10242 RMD160 cea2bb3b8c54782ee406c8215cd902571c541fad SHA1 42d144f328043a6ad7127ee7564a33296003571a SHA256 437031f14d97b90913f98fd1300537bd632fcc4b9b4491b81762d67df0f12f40
+EBUILD python-3.1.1-r1.ebuild 8516 RMD160 9f39fe926215a88561769d60319f6f6a4f30d24d SHA1 965b773bbb9a29c4e767b5c57bf37a697bbef017 SHA256 9a0afd04a82957187d2e80d5ed04c20c130848b9dea0e3d6eccd2751b008d9dc
 EBUILD python-3.1.1.ebuild 8230 RMD160 c6081723a73a16a77ab22ccf0b73d490fdaa970f SHA1 f58905246e9e2e5cb303b778dc36526c788b43c8 SHA256 b8afd52ef3626e0517888c8e365404f37a812939bfbe537ea6eb6c57b5901268
 MISC ChangeLog 73101 RMD160 dec4dead4bfe69c8a4c0a961d2698c88d738a52d SHA1 4a91fedb3f73c7e5c2944075fcced497f8e1a608 SHA256 026367e0c704f63eec1512c69767b407bfa76fc15fa37401c30b075d96d79c20
 MISC metadata.xml 501 RMD160 0cc2c851a7c59ed77809c1f3ac2130710f0700e9 SHA1 59bfd447cf15419f68077913de7228f3556ce6e3 SHA256 51c09ee221463f34722a6c655db605a7d6d683069453d173947e4416a43a071c
diff --git a/dev-lang/python/python-2.6.2-r2.ebuild b/dev-lang/python/python-2.6.2-r2.ebuild
index 6e58d4692ec8..d76deb11bf7b 100644
--- a/dev-lang/python/python-2.6.2-r2.ebuild
+++ b/dev-lang/python/python-2.6.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.2-r2.ebuild,v 1.3 2009/09/23 15:29:49 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.2-r2.ebuild,v 1.4 2009/09/24 14:31:26 arfrever Exp $
 
 # NOTE about python-portage interactions :
 # - Do not add a pkg_setup() check for a certain version of portage
@@ -56,11 +56,11 @@ RDEPEND=">=app-admin/eselect-python-20080925
 			tk? ( >=dev-lang/tk-8.0 )
 			xml? ( >=dev-libs/expat-2 )
 		)
-		!m68k? ( !mips? ( !sparc-fbsd? ( !x86-fbsd? ( virtual/libffi ) ) ) )"
+		!m68k? ( !mips? ( !sparc-fbsd? ( virtual/libffi ) ) )"
 DEPEND="${RDEPEND}
-		!m68k? ( !mips? ( !sparc-fbsd? ( !x86-fbsd? ( dev-util/pkgconfig ) ) ) )"
+		!m68k? ( !mips? ( !sparc-fbsd? ( dev-util/pkgconfig ) ) )"
 PDEPEND="${RDEPEND} app-admin/python-updater"
-RDEPEND+=" app-misc/mime-types"
+RDEPEND+=" !build? ( app-misc/mime-types )"
 
 PROVIDE="virtual/python"
 
@@ -185,7 +185,7 @@ src_configure() {
 	# Please query BSD team before removing this!
 	append-ldflags "-L."
 
-	if ! use m68k && ! use mips && ! use sparc-fbsd && ! use x86-fbsd; then
+	if ! use m68k && ! use mips && ! use sparc-fbsd; then
 		myconf+=" --with-system-ffi"
 	fi
 
diff --git a/dev-lang/python/python-3.1.1-r1.ebuild b/dev-lang/python/python-3.1.1-r1.ebuild
index 72ba77b51fa4..e1765c753d6e 100644
--- a/dev-lang/python/python-3.1.1-r1.ebuild
+++ b/dev-lang/python/python-3.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild,v 1.2 2009/09/23 13:42:36 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild,v 1.3 2009/09/24 14:31:26 arfrever Exp $
 
 EAPI="2"
 
@@ -38,11 +38,11 @@ RDEPEND=">=app-admin/eselect-python-20080925
 			doc? ( dev-python/python-docs:${SLOT} )
 			xml? ( >=dev-libs/expat-2 )
 		)
-		!m68k? ( !mips? ( !sparc-fbsd? ( !x86-fbsd? ( virtual/libffi ) ) ) )"
+		!m68k? ( !mips? ( !sparc-fbsd? ( virtual/libffi ) ) )"
 DEPEND="${RDEPEND}
-		!m68k? ( !mips? ( !sparc-fbsd? ( !x86-fbsd? ( dev-util/pkgconfig ) ) ) )"
+		!m68k? ( !mips? ( !sparc-fbsd? ( dev-util/pkgconfig ) ) )"
 PDEPEND="${RDEPEND} app-admin/python-updater"
-RDEPEND+=" app-misc/mime-types"
+RDEPEND+=" !build? ( app-misc/mime-types )"
 
 PROVIDE="virtual/python"
 
@@ -149,7 +149,7 @@ src_configure() {
 	fi
 	dbmliborder="${dbmliborder#:}"
 
-	if ! use m68k && ! use mips && ! use sparc-fbsd && ! use x86-fbsd; then
+	if ! use m68k && ! use mips && ! use sparc-fbsd; then
 		myconf+=" --with-system-ffi"
 	fi