summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-02-13 23:50:12 +0000
committerZac Medico <zmedico@gentoo.org>2012-02-13 23:50:12 +0000
commitf3c80b05c952c4573817aa36881dc03c0be293d4 (patch)
treedf301e4c99e640a1575c28a46da48177c7b7f5ae /eclass
parentVersion bump (diff)
downloadgentoo-2-f3c80b05c952c4573817aa36881dc03c0be293d4.tar.gz
gentoo-2-f3c80b05c952c4573817aa36881dc03c0be293d4.tar.bz2
gentoo-2-f3c80b05c952c4573817aa36881dc03c0be293d4.zip
Enable PyPy 1.8 support.
Merged from the progress overlay: http://code.google.com/p/gentoo-progress/source/detail?r=1785
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog6
-rw-r--r--eclass/python.eclass4
2 files changed, 7 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 77da27093b2f..d808a1431d20 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.134 2012/02/13 01:31:50 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.135 2012/02/13 23:50:12 zmedico Exp $
+
+ 13 Feb 2012; Zac Medico <zmedico@gentoo.org> python.eclass:
+ Enable PyPy 1.8 support. Merged from the progress overlay:
+ http://code.google.com/p/gentoo-progress/source/detail?r=1785
13 Feb 2012; Davide Pesavento <pesa@gentoo.org> qt4-r2.eclass:
Minor code style cleanup and quoting fixes.
diff --git a/eclass/python.eclass b/eclass/python.eclass
index 5fbdea53c496..1af1f549f657 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.149 2012/02/10 22:54:33 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.150 2012/02/13 23:50:12 zmedico Exp $
# @ECLASS: python.eclass
# @MAINTAINER:
@@ -30,7 +30,7 @@ fi
_CPYTHON2_GLOBALLY_SUPPORTED_ABIS=(2.4 2.5 2.6 2.7)
_CPYTHON3_GLOBALLY_SUPPORTED_ABIS=(3.1 3.2)
_JYTHON_GLOBALLY_SUPPORTED_ABIS=(2.5-jython)
-_PYPY_GLOBALLY_SUPPORTED_ABIS=(2.7-pypy-1.7)
+_PYPY_GLOBALLY_SUPPORTED_ABIS=(2.7-pypy-1.7 2.7-pypy-1.8)
_PYTHON_GLOBALLY_SUPPORTED_ABIS=(${_CPYTHON2_GLOBALLY_SUPPORTED_ABIS[@]} ${_CPYTHON3_GLOBALLY_SUPPORTED_ABIS[@]} ${_JYTHON_GLOBALLY_SUPPORTED_ABIS[@]} ${_PYPY_GLOBALLY_SUPPORTED_ABIS[@]})
# ================================================================================================