diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-07-27 11:17:44 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-07-27 11:17:44 +0000 |
| commit | 8692846aad827feecc3e58dda91e00b5d2b85c7e (patch) | |
| tree | 6d19eaab269a098e9f0d2dcf0136ed0f799792fc /eclass | |
| parent | Use PYTHON_PKG_DEP for generating deps. (diff) | |
| download | historical-8692846aad827feecc3e58dda91e00b5d2b85c7e.tar.gz historical-8692846aad827feecc3e58dda91e00b5d2b85c7e.tar.bz2 historical-8692846aad827feecc3e58dda91e00b5d2b85c7e.zip | |
Switch eclasses to use virtual/pypy (and therefore support pypy-bin).
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/python-distutils-ng.eclass | 6 | ||||
| -rw-r--r-- | eclass/python-utils-r1.eclass | 4 | ||||
| -rw-r--r-- | eclass/python.eclass | 8 |
4 files changed, 14 insertions, 10 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index c101d4eb53ed..7a4b1b297181 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.897 2013/07/27 11:16:48 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.898 2013/07/27 11:17:44 mgorny Exp $ + + 27 Jul 2013; Michał Górny <mgorny@gentoo.org> python.eclass, + python-distutils-ng.eclass, python-utils-r1.eclass: + Switch eclasses to use virtual/pypy (and therefore support pypy-bin). 27 Jul 2013; Michał Górny <mgorny@gentoo.org> python-any-r1.eclass: Use PYTHON_PKG_DEP for generating deps. diff --git a/eclass/python-distutils-ng.eclass b/eclass/python-distutils-ng.eclass index 249757fb8b91..7eceb791178a 100644 --- a/eclass/python-distutils-ng.eclass +++ b/eclass/python-distutils-ng.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.29 2012/10/30 17:22:33 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-distutils-ng.eclass,v 1.30 2013/07/27 11:17:44 mgorny Exp $ # @ECLASS: python-distutils-ng # @MAINTAINER: @@ -132,7 +132,7 @@ for impl in ${PYTHON_COMPAT}; do jython?.?) dep_str="dev-java/jython:${dep_str: -3}${_PYTHON_USE}" ;; pypy?.?) - dep_str="dev-python/pypy:${dep_str: -3}${_PYTHON_USE}" ;; + dep_str="virtual/pypy:${dep_str: -3}${_PYTHON_USE}" ;; *) die "Unsupported implementation: ${impl}" ;; esac diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 3565879dca0f..5814a137dfb6 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.29 2013/07/11 07:20:13 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.30 2013/07/27 11:17:44 mgorny Exp $ # @ECLASS: python-utils-r1 # @MAINTAINER: @@ -343,7 +343,7 @@ python_export() { jython*) PYTHON_PKG_DEP='dev-java/jython';; pypy*) - PYTHON_PKG_DEP='dev-python/pypy';; + PYTHON_PKG_DEP='virtual/pypy';; *) die "Invalid implementation: ${impl}" esac diff --git a/eclass/python.eclass b/eclass/python.eclass index 3f94e0bf85e2..913a6c444a45 100644 --- a/eclass/python.eclass +++ b/eclass/python.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.eclass,v 1.166 2013/03/07 21:02:06 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.167 2013/07/27 11:17:44 mgorny Exp $ # @ECLASS: python.eclass # @MAINTAINER: @@ -109,7 +109,7 @@ _python_implementation() { return 0 elif [[ "${CATEGORY}/${PN}" == "dev-java/jython" ]]; then return 0 - elif [[ "${CATEGORY}/${PN}" == "dev-python/pypy" ]]; then + elif [[ "${CATEGORY}/${PN}" == "virtual/pypy" ]]; then return 0 else return 1 @@ -2054,7 +2054,7 @@ python_get_implementational_package() { elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then echo "=dev-java/jython-${PYTHON_ABI%-jython}*" elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then - echo "=dev-python/pypy-${PYTHON_ABI#*-pypy-}*" + echo "=virtual/pypy-${PYTHON_ABI#*-pypy-}*" fi else if [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "CPython" ]]; then @@ -2062,7 +2062,7 @@ python_get_implementational_package() { elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "Jython" ]]; then echo "dev-java/jython:${PYTHON_ABI%-jython}" elif [[ "$(_python_get_implementation "${PYTHON_ABI}")" == "PyPy" ]]; then - echo "dev-python/pypy:${PYTHON_ABI#*-pypy-}" + echo "virtual/pypy:${PYTHON_ABI#*-pypy-}" fi fi } |