summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-09-05 09:59:52 +0000
committerMichał Górny <mgorny@gentoo.org>2013-09-05 09:59:52 +0000
commitb25bb51b197d7a97d79113c1714018e6656bb948 (patch)
treeef2ec9f8755d9762b860f30f4790cecdb7b59199 /eclass
parentRemove dev-python/turbogears, Python 2.5 only. Bug #480070. (diff)
downloadgentoo-2-b25bb51b197d7a97d79113c1714018e6656bb948.tar.gz
gentoo-2-b25bb51b197d7a97d79113c1714018e6656bb948.tar.bz2
gentoo-2-b25bb51b197d7a97d79113c1714018e6656bb948.zip
Disable Python 2.5, 3.1 and PyPy 1.9 in the eclass.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/python-utils-r1.eclass12
2 files changed, 10 insertions, 7 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index b9d7bf2063a1..43a92837dbd1 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.944 2013/09/04 19:16:40 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.945 2013/09/05 09:59:52 mgorny Exp $
+
+ 05 Sep 2013; Michał Górny <mgorny@gentoo.org> python-utils-r1.eclass:
+ Disable Python 2.5, 3.1 and PyPy 1.9 in the eclass.
04 Sep 2013; Ulrich Müller <ulm@gentoo.org> elisp-common.eclass:
Add proper @CODE tags in comments.
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index a16d52852feb..1a136f47603a 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.31 2013/08/28 22:04:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.32 2013/09/05 09:59:52 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -42,9 +42,9 @@ inherit multilib toolchain-funcs
# All supported Python implementations, most preferred last.
_PYTHON_ALL_IMPLS=(
jython2_5 jython2_7
- pypy1_9 pypy2_0
- python3_1 python3_2 python3_3
- python2_5 python2_6 python2_7
+ pypy2_0
+ python3_2 python3_3
+ python2_6 python2_7
)
# @FUNCTION: _python_impl_supported
@@ -67,10 +67,10 @@ _python_impl_supported() {
# keep in sync with _PYTHON_ALL_IMPLS!
# (not using that list because inline patterns shall be faster)
case "${impl}" in
- python2_[567]|python3_[123]|pypy1_9|pypy2_0|jython2_[57])
+ python2_[67]|python3_[23]|pypy2_0|jython2_[57])
return 0
;;
- pypy1_8)
+ pypy1_[89]|python2_5|python3_1)
return 1
;;
*)