diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2013-07-27 11:16:48 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2013-07-27 11:16:48 +0000 |
| commit | cfc9f2ca3f2f25aa50a784df6e137d54aea1b9d6 (patch) | |
| tree | 00904897ebd76ab84edb07fd2db26ba8fc47b233 /eclass | |
| parent | Revbump providing preliminary systemd support (diff) | |
| download | gentoo-2-cfc9f2ca3f2f25aa50a784df6e137d54aea1b9d6.tar.gz gentoo-2-cfc9f2ca3f2f25aa50a784df6e137d54aea1b9d6.tar.bz2 gentoo-2-cfc9f2ca3f2f25aa50a784df6e137d54aea1b9d6.zip | |
Use PYTHON_PKG_DEP for generating deps.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/python-any-r1.eclass | 24 |
2 files changed, 10 insertions, 19 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index f14179522ab5..c101d4eb53ed 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.896 2013/07/27 10:36:55 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.897 2013/07/27 11:16:48 mgorny Exp $ + + 27 Jul 2013; Michał Górny <mgorny@gentoo.org> python-any-r1.eclass: + Use PYTHON_PKG_DEP for generating deps. 27 Jul 2013; Michał Górny <mgorny@gentoo.org> systemd.eclass: Introduce systemd_is_booted() to allow ebuilds to warn consistently for diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass index 087efb27a431..cd586d47f8d4 100644 --- a/eclass/python-any-r1.eclass +++ b/eclass/python-any-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-any-r1.eclass,v 1.11 2013/05/10 22:03:30 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-any-r1.eclass,v 1.12 2013/07/27 11:16:48 mgorny Exp $ # @ECLASS: python-any-r1 # @MAINTAINER: @@ -118,25 +118,13 @@ _python_build_set_globals() { [[ ${PYTHON_REQ_USE} ]] && usestr="[${PYTHON_REQ_USE}]" PYTHON_DEPS= - local i + local i PYTHON_PKG_DEP for i in "${_PYTHON_ALL_IMPLS[@]}"; do - if has "${i}" "${PYTHON_COMPAT[@]}" - then - local d - case ${i} in - python*) - d='dev-lang/python';; - jython*) - d='dev-java/jython';; - pypy*) - d='dev-python/pypy';; - *) - die "Invalid implementation: ${i}" - esac + has "${i}" "${PYTHON_COMPAT[@]}" || continue - local v=${i##*[a-z]} - PYTHON_DEPS="${d}:${v/_/.}${usestr} ${PYTHON_DEPS}" - fi + python_export "${i}" PYTHON_PKG_DEP + + PYTHON_DEPS="${PYTHON_PKG_DEP} ${PYTHON_DEPS}" done PYTHON_DEPS="|| ( ${PYTHON_DEPS})" } |