diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2012-03-20 20:37:21 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2012-03-20 20:37:21 +0000 |
| commit | c5881cf5350a579163eb561e2e469da5548606fb (patch) | |
| tree | 0bc0c5a946701f6a50a9d3a70dd4d64adddb9c4d /eclass | |
| parent | Bump to 1.13.0 (diff) | |
| download | gentoo-2-c5881cf5350a579163eb561e2e469da5548606fb.tar.gz gentoo-2-c5881cf5350a579163eb561e2e469da5548606fb.tar.bz2 gentoo-2-c5881cf5350a579163eb561e2e469da5548606fb.zip | |
Apply patch from Arfrever to adjust dependencies in python.eclass.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 8 | ||||
| -rw-r--r-- | eclass/python.eclass | 37 |
2 files changed, 27 insertions, 18 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 3f53dcbb66ac..1ff6deab15a5 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.175 2012/03/20 15:32:02 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.176 2012/03/20 20:37:21 floppym Exp $ + + 20 Mar 2012; Mike Gilbert <floppym@gentoo.org> python.eclass: + Define _python_implementation() earlier. + Update handling of dependencies. + Patch by Arfrever. Backported from Progress Overlay. + http://code.google.com/p/gentoo-progress/source/detail?r=1705 19 Mar 2012; Michał Górny <mgorny@gentoo.org> vcs-snapshot.eclass: Fix old eclass name in die-message. diff --git a/eclass/python.eclass b/eclass/python.eclass index 7805a1177caa..d88cd35d8d1e 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.152 2012/03/07 04:13:27 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.153 2012/03/20 20:37:21 floppym Exp $ # @ECLASS: python.eclass # @MAINTAINER: @@ -100,6 +100,18 @@ _python_check_python_abi_matching() { fi } +_python_implementation() { + if [[ "${CATEGORY}/${PN}" == "dev-lang/python" ]]; then + return 0 + elif [[ "${CATEGORY}/${PN}" == "dev-java/jython" ]]; then + return 0 + elif [[ "${CATEGORY}/${PN}" == "dev-python/pypy" ]]; then + return 0 + else + return 1 + fi +} + _python_package_supporting_installation_for_multiple_python_abis() { if has "${EAPI:-0}" 0 1 2 3 4; then if [[ -n "${SUPPORT_PYTHON_ABIS}" ]]; then @@ -245,8 +257,11 @@ _python_parse_PYTHON_DEPEND() { fi } -DEPEND=">=app-admin/eselect-python-20091230" -RDEPEND="${DEPEND}" +if _python_implementation; then + DEPEND=">=app-admin/eselect-python-20091230" + RDEPEND="${DEPEND}" + PDEPEND="app-admin/python-updater" +fi if [[ -n "${PYTHON_DEPEND}" ]]; then _python_parse_PYTHON_DEPEND @@ -295,8 +310,8 @@ if ! has "${EAPI:-0}" 0 1 && [[ -n ${PYTHON_USE_WITH} || -n ${PYTHON_USE_WITH_OR if [[ -n "${PYTHON_USE_WITH_OPT}" ]]; then _PYTHON_USE_WITH_ATOMS="${PYTHON_USE_WITH_OPT}? ( ${_PYTHON_USE_WITH_ATOMS} )" fi - DEPEND+=" ${_PYTHON_USE_WITH_ATOMS}" - RDEPEND+=" ${_PYTHON_USE_WITH_ATOMS}" + DEPEND+="${DEPEND:+ }${_PYTHON_USE_WITH_ATOMS}" + RDEPEND+="${RDEPEND:+ }${_PYTHON_USE_WITH_ATOMS}" unset _PYTHON_ATOM _PYTHON_USE_WITH_ATOMS _PYTHON_USE_WITH_ATOMS_ARRAY fi @@ -306,18 +321,6 @@ unset _PYTHON_ATOMS # =================================== MISCELLANEOUS FUNCTIONS ==================================== # ================================================================================================ -_python_implementation() { - if [[ "${CATEGORY}/${PN}" == "dev-lang/python" ]]; then - return 0 - elif [[ "${CATEGORY}/${PN}" == "dev-java/jython" ]]; then - return 0 - elif [[ "${CATEGORY}/${PN}" == "dev-python/pypy" ]]; then - return 0 - else - return 1 - fi -} - _python_abi-specific_local_scope() { [[ " ${FUNCNAME[@]:2} " =~ " "(_python_final_sanity_checks|python_execute_function|python_mod_optimize|python_mod_cleanup)" " ]] } |