From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Qf5hN-0007Of-2b for garchives@archives.gentoo.org; Fri, 08 Jul 2011 07:42:05 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1E59C21C06A; Fri, 8 Jul 2011 07:41:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E68D721C06A for ; Fri, 8 Jul 2011 07:41:57 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 522172AC0B0 for ; Fri, 8 Jul 2011 07:41:57 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2256) id 18D052004B; Fri, 8 Jul 2011 07:41:56 +0000 (UTC) From: "Dirkjan Ochtman (djc)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, djc@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: python.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: python.eclass X-VCS-Directories: eclass X-VCS-Committer: djc X-VCS-Committer-Name: Dirkjan Ochtman Content-Type: text/plain; charset=utf8 Message-Id: <20110708074156.18D052004B@flycatcher.gentoo.org> Date: Fri, 8 Jul 2011 07:41:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 993901ec6ddb3f2cf4c793ecd786a2b9 djc 11/07/08 07:41:56 Modified: python.eclass Log: Allow to use _python_package_supporting_installation_for_multiple_pytho= n_abis() in global scope and define it earlier. (Patch by Arfrever. Backported from python overlay.) Revision Changes Path 1.121 eclass/python.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.ecla= ss?rev=3D1.121&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.ecla= ss?rev=3D1.121&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.ecla= ss?r1=3D1.120&r2=3D1.121 Index: python.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v retrieving revision 1.120 retrieving revision 1.121 diff -u -r1.120 -r1.121 --- python.eclass 8 Jul 2011 07:40:02 -0000 1.120 +++ python.eclass 8 Jul 2011 07:41:56 -0000 1.121 @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.120 2011/07/= 08 07:40:02 djc Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.121 2011/07/= 08 07:41:56 djc Exp $ =20 # @ECLASS: python.eclass # @MAINTAINER: @@ -83,6 +83,18 @@ fi } =20 +_python_package_supporting_installation_for_multiple_python_abis() { + if has "${EAPI:-0}" 0 1 2 3 4; then + if [[ -n "${SUPPORT_PYTHON_ABIS}" ]]; then + return 0 + else + return 1 + fi + else + die "${FUNCNAME}(): Support for EAPI=3D\"${EAPI}\" not implemented" + fi +} + # @ECLASS-VARIABLE: PYTHON_DEPEND # @DESCRIPTION: # Specification of dependency on dev-lang/python. @@ -287,22 +299,6 @@ fi } =20 -_python_package_supporting_installation_for_multiple_python_abis() { - if [[ "${EBUILD_PHASE}" =3D=3D "depend" ]]; then - die "${FUNCNAME}() cannot be used in global scope" - fi - - if has "${EAPI:-0}" 0 1 2 3 4; then - if [[ -n "${SUPPORT_PYTHON_ABIS}" ]]; then - return 0 - else - return 1 - fi - else - die "${FUNCNAME}(): Support for EAPI=3D\"${EAPI}\" not implemented" - fi -} - _python_abi-specific_local_scope() { [[ " ${FUNCNAME[@]:2} " =3D~ " "(_python_final_sanity_checks|python_exe= cute_function|python_mod_optimize|python_mod_cleanup)" " ]] }