mgorny 15/07/27 16:34:48 Modified: ChangeLog python-utils-r1.eclass Log: Ban calling pythonN and pythonN-config when the other version of Python is selected (i.e. ban python2 when python3 is used).
Revision Changes Path 1.1731 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1731&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1731&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1730&r2=1.1731 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1730 retrieving revision 1.1731 diff -u -r1.1730 -r1.1731 --- ChangeLog 27 Jul 2015 16:34:10 -0000 1.1730 +++ ChangeLog 27 Jul 2015 16:34:48 -0000 1.1731 @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1730 2015/07/27 16:34:10 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1731 2015/07/27 16:34:48 mgorny Exp $ + + 27 Jul 2015; Michał Górny <mgo...@gentoo.org> python-utils-r1.eclass: + Ban calling pythonN and pythonN-config when the other version of Python is + selected (i.e. ban python2 when python3 is used). 27 Jul 2015; Michał Górny <mgo...@gentoo.org> python-utils-r1.eclass: python_wrapper_setup(): wrap pythonN-config as well as suggested by PEP and 1.87 eclass/python-utils-r1.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.87&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?rev=1.87&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-utils-r1.eclass?r1=1.86&r2=1.87 Index: python-utils-r1.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- python-utils-r1.eclass 27 Jul 2015 16:34:10 -0000 1.86 +++ python-utils-r1.eclass 27 Jul 2015 16:34:48 -0000 1.87 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.86 2015/07/27 16:34:10 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.87 2015/07/27 16:34:48 mgorny Exp $ # @ECLASS: python-utils-r1 # @MAINTAINER: @@ -847,11 +847,13 @@ local EPYTHON PYTHON python_export "${impl}" EPYTHON PYTHON - local pyver + local pyver pyother if python_is_python3; then pyver=3 + pyother=2 else pyver=2 + pyother=3 fi # Python interpreter @@ -865,7 +867,7 @@ cp "${workdir}/bin/python" "${workdir}/bin/python${pyver}" || die chmod +x "${workdir}/bin/python" "${workdir}/bin/python${pyver}" || die - local nonsupp=() + local nonsupp=( "python${pyother}" "python${pyother}-config" ) # CPython-specific if [[ ${EPYTHON} == python* ]]; then
