Bug #304311 - Fix python dependencies so a supported version of python-2.x is always pulled in when upgrading from <portage-2.1.7.

(Portage version: 2.2_rc62_p15336/cvs/Linux i686)

4 files changed, 12 insertions, 7 deletions

diff --git a/sys-apps/portage/ChangeLog b/sys-apps/portage/ChangeLog
index 5faf3e563196..e5e2a36ac6a6 100644
--- a/sys-apps/portage/ChangeLog
+++ b/sys-apps/portage/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/portage
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.673 2010/02/10 01:04:03 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/ChangeLog,v 1.674 2010/02/11 01:14:13 zmedico Exp $
+
+  11 Feb 2010; Zac Medico <zmedico@gentoo.org> portage-2.1.7.16.ebuild,
+  portage-2.1.7.17.ebuild, portage-2.2_rc62.ebuild:
+  Bug #304311 - Fix python dependencies so a supported of version python-2.x
+  is always pulled in when upgrading from <portage-2.1.7.
 
   10 Feb 2010; Zac Medico <zmedico@gentoo.org> portage-2.1.6.7.ebuild,
   portage-2.1.6.13.ebuild:
diff --git a/sys-apps/portage/portage-2.1.7.16.ebuild b/sys-apps/portage/portage-2.1.7.16.ebuild
index 5486ae71577e..dbf3a45665ba 100644
--- a/sys-apps/portage/portage-2.1.7.16.ebuild
+++ b/sys-apps/portage/portage-2.1.7.16.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/sys-apps/portage/portage-2.1.7.16.ebuild,v 1.7 2010/02/10 00:49:49 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.7.16.ebuild,v 1.8 2010/02/11 01:14:13 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -16,7 +16,7 @@ SLOT="0"
 IUSE="build doc epydoc linguas_pl python3 selinux"
 
 python_dep="python3? ( =dev-lang/python-3* )
-	!python3? ( || ( ( >=dev-lang/python-2.6 <dev-lang/python-3 ) >=dev-lang/python-3 ) )"
+	!python3? ( || ( dev-lang/python:2.8 dev-lang/python:2.7 dev-lang/python:2.6 >=dev-lang/python-3 ) )"
 
 # The pysqlite blocker is for bug #282760.
 DEPEND="${python_dep}
diff --git a/sys-apps/portage/portage-2.1.7.17.ebuild b/sys-apps/portage/portage-2.1.7.17.ebuild
index a3a7aa5be2cb..9ebc4df78420 100644
--- a/sys-apps/portage/portage-2.1.7.17.ebuild
+++ b/sys-apps/portage/portage-2.1.7.17.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/sys-apps/portage/portage-2.1.7.17.ebuild,v 1.3 2010/02/10 00:49:49 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.1.7.17.ebuild,v 1.4 2010/02/11 01:14:13 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -16,7 +16,7 @@ SLOT="0"
 IUSE="build doc epydoc linguas_pl python3 selinux"
 
 python_dep="python3? ( =dev-lang/python-3* )
-	!python3? ( || ( ( >=dev-lang/python-2.6 <dev-lang/python-3 ) >=dev-lang/python-3 ) )"
+	!python3? ( || ( dev-lang/python:2.8 dev-lang/python:2.7 dev-lang/python:2.6 >=dev-lang/python-3 ) )"
 
 # The pysqlite blocker is for bug #282760.
 DEPEND="${python_dep}
diff --git a/sys-apps/portage/portage-2.2_rc62.ebuild b/sys-apps/portage/portage-2.2_rc62.ebuild
index bdc4a500d88f..d2798431c3dc 100644
--- a/sys-apps/portage/portage-2.2_rc62.ebuild
+++ b/sys-apps/portage/portage-2.2_rc62.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/sys-apps/portage/portage-2.2_rc62.ebuild,v 1.2 2010/02/07 02:11:42 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2_rc62.ebuild,v 1.3 2010/02/11 01:14:13 zmedico Exp $
 
 # Require EAPI 2 since we now require at least python-2.6 (for python 3
 # syntax support) which also requires EAPI 2.
@@ -16,7 +16,7 @@ SLOT="0"
 IUSE="build doc epydoc linguas_pl python3 selinux"
 
 python_dep="python3? ( =dev-lang/python-3* )
-	!python3? ( || ( ( >=dev-lang/python-2.6 <dev-lang/python-3 ) >=dev-lang/python-3 ) )"
+	!python3? ( || ( dev-lang/python:2.8 dev-lang/python:2.7 dev-lang/python:2.6 >=dev-lang/python-3 ) )"
 
 # The pysqlite blocker is for bug #282760.
 DEPEND="${python_dep}