summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/python.eclass3
2 files changed, 6 insertions, 2 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index ab9fd7f0f54c..8696716a8d7b 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.568 2012/12/20 06:07:05 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.569 2012/12/20 06:26:16 floppym Exp $
+
+ 20 Dec 2012; Mike Gilbert <floppym@gentoo.org> python.eclass:
+ Add pypy version mapping for 2.0 => 2.7.
20 Dec 2012; Mike Gilbert <floppym@gentoo.org> python.eclass:
Add 2.7-pypy-2.0.
diff --git a/eclass/python.eclass b/eclass/python.eclass
index 673973d481dc..bdbd1ea288c6 100644
--- a/eclass/python.eclass
+++ b/eclass/python.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.162 2012/12/20 06:07:05 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.163 2012/12/20 06:26:16 floppym Exp $
# @ECLASS: python.eclass
# @MAINTAINER:
@@ -1306,6 +1306,7 @@ pypy_versions_mapping = {
"1.7": "2.7",
"1.8": "2.7",
"1.9": "2.7",
+ "2.0": "2.7",
}
def get_PYTHON_ABI(python_interpreter):