summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-10-09 17:23:33 +0000
committerMichał Górny <mgorny@gentoo.org>2013-10-09 17:23:33 +0000
commit1f15081f032e583df9ef4ead317d25d73e7248d5 (patch)
tree906fd98717cd73602f79afaae7cfeaad5daa47b6 /eclass
parentVersion bump. (diff)
downloadgentoo-2-1f15081f032e583df9ef4ead317d25d73e7248d5.tar.gz
gentoo-2-1f15081f032e583df9ef4ead317d25d73e7248d5.tar.bz2
gentoo-2-1f15081f032e583df9ef4ead317d25d73e7248d5.zip
Bump dependencies on Python interpreters to require newest stable versions. Bug #463532.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog6
-rw-r--r--eclass/python-utils-r1.eclass25
2 files changed, 20 insertions, 11 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index f21b6bf75b50..0cac82d95270 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1015 2013/10/09 17:14:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1016 2013/10/09 17:23:33 mgorny Exp $
+
+ 09 Oct 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Bump dependencies on Python interpreters to require newest stable versions.
+ Bug #463532.
09 Oct 2013; Michał Górny <mgorny@gentoo.org> git-r3.eclass:
Skip submodules that have update=none specified in config. Fixes bug #487262.
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 6e428c15c3a2..ccfc0a4edf34 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.41 2013/09/26 11:24:30 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.42 2013/10/09 17:23:33 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -349,19 +349,24 @@ python_export() {
PYTHON_PKG_DEP)
local d
case ${impl} in
- python*)
- PYTHON_PKG_DEP='dev-lang/python';;
- jython*)
- PYTHON_PKG_DEP='dev-java/jython';;
- pypy*)
- PYTHON_PKG_DEP='virtual/pypy';;
+ python2.6)
+ PYTHON_PKG_DEP='>=dev-lang/python-2.6.8-r3:2.6';;
+ python2.7)
+ PYTHON_PKG_DEP='>=dev-lang/python-2.7.5-r2:2.7';;
+ python3.2)
+ PYTHON_PKG_DEP='>=dev-lang/python-3.2.5-r2:3.2';;
+ python3.3)
+ PYTHON_PKG_DEP='>=dev-lang/python-3.3.2-r2:3.3';;
+ pypy-c2.0)
+ PYTHON_PKG_DEP='>=dev-python/pypy-2.0.2:2.0';;
+ jython2.5)
+ PYTHON_PKG_DEP='>=dev-java/jython-2.5.3-r2:2.5';;
+ jython2.7)
+ PYTHON_PKG_DEP='dev-java/jython:2.7';;
*)
die "Invalid implementation: ${impl}"
esac
- # slot
- PYTHON_PKG_DEP+=:${impl##*[a-z-]}
-
# use-dep
if [[ ${PYTHON_REQ_USE} ]]; then
PYTHON_PKG_DEP+=[${PYTHON_REQ_USE}]