diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2012-11-26 08:31:26 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2012-11-26 08:31:26 +0000 |
| commit | 4cb99eba28a32a525764ac732e9b91df0c9eb1a6 (patch) | |
| tree | 4d7a67e2c5bf4023328d934ad39a2eb69f7a8c0e /eclass/python-r1.eclass | |
| parent | Version bump to fix location of libexecdir (bug #437146). Removed old versions (diff) | |
| download | historical-4cb99eba28a32a525764ac732e9b91df0c9eb1a6.tar.gz historical-4cb99eba28a32a525764ac732e9b91df0c9eb1a6.tar.bz2 historical-4cb99eba28a32a525764ac732e9b91df0c9eb1a6.zip | |
Override incompatible functions in python-single-r1 directly, instead of adding checks to python-r1.
Diffstat (limited to 'eclass/python-r1.eclass')
| -rw-r--r-- | eclass/python-r1.eclass | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass index fed023960277..c98969081fbc 100644 --- a/eclass/python-r1.eclass +++ b/eclass/python-r1.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-r1.eclass,v 1.22 2012/11/24 21:07:14 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.23 2012/11/26 08:31:26 mgorny Exp $ # @ECLASS: python-r1 # @MAINTAINER: @@ -197,10 +197,6 @@ _python_set_globals python_copy_sources() { debug-print-function ${FUNCNAME} "${@}" - if [[ ${_PYTHON_SINGLE_R1} ]]; then - die "${FUNCNAME} must not be used with python-single-r1 eclass." - fi - local impl local bdir=${BUILD_DIR:-${S}} @@ -428,10 +424,6 @@ _python_check_USE_PYTHON() { python_foreach_impl() { debug-print-function ${FUNCNAME} "${@}" - if [[ ${_PYTHON_SINGLE_R1} ]]; then - die "${FUNCNAME} must not be used with python-single-r1 eclass." - fi - _python_check_USE_PYTHON local impl @@ -461,10 +453,6 @@ python_foreach_impl() { python_export_best() { debug-print-function ${FUNCNAME} "${@}" - if [[ ${_PYTHON_SINGLE_R1} ]]; then - die "${FUNCNAME} must not be used with python-single-r1 eclass." - fi - [[ ${#} -gt 0 ]] || set -- EPYTHON PYTHON local impl best |