axs 14/11/07 16:17:46 Modified: ChangeLog python-single-r1.eclass Log: fixed whitespace
Revision Changes Path 1.1406 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1406&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1406&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1405&r2=1.1406 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1405 retrieving revision 1.1406 diff -u -r1.1405 -r1.1406 --- ChangeLog 7 Nov 2014 15:48:01 -0000 1.1405 +++ ChangeLog 7 Nov 2014 16:17:46 -0000 1.1406 @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1405 2014/11/07 15:48:01 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1406 2014/11/07 16:17:46 axs Exp $ + + 07 Nov 2014; Ian Stakenvicius (_AxS_) <[email protected]> + python-single-r1.eclass: + fixed whitespace 06 Nov 2014; Ian Stakenvicius <[email protected]> python-single-r1.eclass: When only one supported python implementation can satisfy an ebuild, do 1.28 eclass/python-single-r1.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?rev=1.28&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?rev=1.28&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-single-r1.eclass?r1=1.27&r2=1.28 Index: python-single-r1.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- python-single-r1.eclass 7 Nov 2014 15:48:01 -0000 1.27 +++ python-single-r1.eclass 7 Nov 2014 16:17:46 -0000 1.28 @@ -1,6 +1,6 @@ # Copyright 1999-2014 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.27 2014/11/07 15:48:01 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.28 2014/11/07 16:17:46 axs Exp $ # @ECLASS: python-single-r1 # @MAINTAINER: @@ -249,28 +249,28 @@ else for impl in "${impls[@]}"; do if use "python_single_target_${impl}"; then - if [[ ${EPYTHON} ]]; then - eerror "Your PYTHON_SINGLE_TARGET setting lists more than a single Python" - eerror "implementation. Please set it to just one value. If you need" - eerror "to override the value for a single package, please use package.env" - eerror "or an equivalent solution (man 5 portage)." - echo - die "More than one implementation in PYTHON_SINGLE_TARGET." - fi + if [[ ${EPYTHON} ]]; then + eerror "Your PYTHON_SINGLE_TARGET setting lists more than a single Python" + eerror "implementation. Please set it to just one value. If you need" + eerror "to override the value for a single package, please use package.env" + eerror "or an equivalent solution (man 5 portage)." + echo + die "More than one implementation in PYTHON_SINGLE_TARGET." + fi + + if ! use "python_targets_${impl}"; then + eerror "The implementation chosen as PYTHON_SINGLE_TARGET must be added" + eerror "to PYTHON_TARGETS as well. This is in order to ensure that" + eerror "dependencies are satisfied correctly. We're sorry" + eerror "for the inconvenience." + echo + die "Build target (${impl}) not in PYTHON_TARGETS." + fi - if ! use "python_targets_${impl}"; then - eerror "The implementation chosen as PYTHON_SINGLE_TARGET must be added" - eerror "to PYTHON_TARGETS as well. This is in order to ensure that" - eerror "dependencies are satisfied correctly. We're sorry" - eerror "for the inconvenience." - echo - die "Build target (${impl}) not in PYTHON_TARGETS." + python_export "${impl}" EPYTHON PYTHON + python_wrapper_setup fi - - python_export "${impl}" EPYTHON PYTHON - python_wrapper_setup - fi - done + done fi if [[ ! ${EPYTHON} ]]; then @@ -278,7 +278,7 @@ if [[ ${#impls[@]} -eq 1 ]]; then eerror "the PYTHON_TARGETS variable in your make.conf to include one" else - eerror "the PYTHON_SINGLE_TARGET variable in your make.conf to one" + eerror "the PYTHON_SINGLE_TARGET variable in your make.conf to one" fi eerror "of the following values:" eerror
