mgorny 14/04/05 20:56:03 Modified: ChangeLog python-r1.eclass Log: Fix improper suggestions to put unsupported implmentations in USE_PYTHON, bug #506814.
Revision Changes Path 1.1197 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1197&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1197&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1196&r2=1.1197 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1196 retrieving revision 1.1197 diff -u -r1.1196 -r1.1197 --- ChangeLog 5 Apr 2014 09:19:19 -0000 1.1196 +++ ChangeLog 5 Apr 2014 20:56:03 -0000 1.1197 @@ -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.1196 2014/04/05 09:19:19 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1197 2014/04/05 20:56:03 mgorny Exp $ + + 05 Apr 2014; Michał Górny <mgo...@gentoo.org> python-r1.eclass: + Fix improper suggestions to put unsupported implmentations in USE_PYTHON, bug + #506814. 05 Apr 2014; Alexandre Rostovtsev <tetrom...@gentoo.org> gst-plugins10.eclass: 1.67 eclass/python-r1.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.67&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.67&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?r1=1.66&r2=1.67 Index: python-r1.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- python-r1.eclass 29 Dec 2013 18:19:48 -0000 1.66 +++ python-r1.eclass 5 Apr 2014 20:56:03 -0000 1.67 @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.66 2013/12/29 18:19:48 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.67 2014/04/05 20:56:03 mgorny Exp $ # @ECLASS: python-r1 # @MAINTAINER: @@ -440,6 +440,10 @@ fi py2=${impl/_/.} ;; + python3_4) + debug-print "${FUNCNAME}: python3.4 found, not using eselect" + return 1 + ;; python3_*) if [[ ${py3+1} ]]; then debug-print "${FUNCNAME}: -> more than one py3: ${py3} ${impl}" @@ -504,6 +508,7 @@ fi fi + if [[ ${py3+1} ]]; then local sel_py3=$(eselect python show --python3) @@ -546,6 +551,10 @@ local abi case "${impl}" in + pypy|python3_4) + # unsupported in python.eclass + continue + ;; python*) abi=${impl#python} ;;
