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 | 4d3bf6ce982f56b440303b1c16b8c371a1a0d091 (patch) | |
| tree | ad77833c9f397f973a92d2b1035aa3c55dbec584 | |
| parent | Version bump to fix location of libexecdir (bug #437146). Removed old versions (diff) | |
| download | gentoo-2-4d3bf6ce982f56b440303b1c16b8c371a1a0d091.tar.gz gentoo-2-4d3bf6ce982f56b440303b1c16b8c371a1a0d091.tar.bz2 gentoo-2-4d3bf6ce982f56b440303b1c16b8c371a1a0d091.zip | |
Override incompatible functions in python-single-r1 directly, instead of adding checks to python-r1.
| -rw-r--r-- | eclass/ChangeLog | 7 | ||||
| -rw-r--r-- | eclass/python-r1.eclass | 14 | ||||
| -rw-r--r-- | eclass/python-single-r1.eclass | 16 |
3 files changed, 22 insertions, 15 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index db271fbc9b42..144ec657b6ff 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.519 2012/11/25 07:19:51 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.520 2012/11/26 08:31:26 mgorny Exp $ + + 26 Nov 2012; Michał Górny <mgorny@gentoo.org> python-r1.eclass, + python-single-r1.eclass: + Override incompatible functions in python-single-r1 directly, instead of + adding checks to python-r1. 25 Nov 2012; Pacho Ramos <pacho@gentoo.org> emul-linux-x86.eclass: Really install only libs, not everything included in .so* (#442910 by SpanKY, 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 diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass index d0f6df3c14d6..125dc16ae39f 100644 --- a/eclass/python-single-r1.eclass +++ b/eclass/python-single-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-single-r1.eclass,v 1.2 2012/11/24 21:07:14 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.3 2012/11/26 08:31:26 mgorny Exp $ # @ECLASS: python-single-r1 # @MAINTAINER: @@ -98,5 +98,19 @@ python-single-r1_pkg_setup() { done } +# Incompatible python-r1 functions. + +python_copy_sources() { + die "${FUNCNAME} must not be used with python-single-r1 eclass." +} + +python_foreach_impl() { + die "${FUNCNAME} must not be used with python-single-r1 eclass." +} + +python_export_best() { + die "${FUNCNAME} must not be used with python-single-r1 eclass." +} + _PYTHON_SINGLE_R1=1 fi |