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 1S2U2B-0004HI-Sc for garchives@archives.gentoo.org; Tue, 28 Feb 2012 20:52:32 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B9AE9E0797; Tue, 28 Feb 2012 20:52:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7A8BEE0797 for ; Tue, 28 Feb 2012 20:52:19 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9329B1B400D for ; Tue, 28 Feb 2012 20:52:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 5E9D6E5411 for ; Tue, 28 Feb 2012 20:52:15 +0000 (UTC) From: "Krzysztof Pawlik" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Krzysztof Pawlik" Message-ID: <1330279971.64a68921294a806d350e0155ed96b74099c53f08.nelchael@gentoo> Subject: [gentoo-commits] dev/nelchael:master commit in: eclass/ X-VCS-Repository: dev/nelchael X-VCS-Files: eclass/python-distutils-ng.eclass X-VCS-Directories: eclass/ X-VCS-Committer: nelchael X-VCS-Committer-Name: Krzysztof Pawlik X-VCS-Revision: 64a68921294a806d350e0155ed96b74099c53f08 X-VCS-Branch: master Date: Tue, 28 Feb 2012 20:52:15 +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: 951c54fc-b0e7-433a-97e8-6d76a0080b71 X-Archives-Hash: cfb5862bcc79f72e2d34c0bb9114c958 commit: 64a68921294a806d350e0155ed96b74099c53f08 Author: Krzysztof Pawlik none> AuthorDate: Sun Feb 26 18:12:51 2012 +0000 Commit: Krzysztof Pawlik gentoo org> CommitDate: Sun Feb 26 18:12:51 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/nelchael.git;a= =3Dcommit;h=3D64a68921 Change USE_PYTHON to PYTHON_COMPAT. --- eclass/python-distutils-ng.eclass | 42 ++++++++++++++++++-------------= ----- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eclass/python-distutils-ng.eclass b/eclass/python-distutils-= ng.eclass index 48de447..98e5721 100644 --- a/eclass/python-distutils-ng.eclass +++ b/eclass/python-distutils-ng.eclass @@ -15,18 +15,18 @@ # # TODO: Document implementations! =20 -# @ECLASS-VARIABLE: USE_PYTHON +# @ECLASS-VARIABLE: PYTHON_COMPAT # @DESCRIPTION: -# This variable contains a space separated list of targets (see above) a= package -# is compatible to. It must be set before the `inherit' call. The defaul= t is to -# enable all targets. +# This variable contains a space separated list of implementations (see = above) a +# package is compatible to. It must be set before the `inherit' call. Th= e +# default is to enable all implementations. =20 -if [[ -z "${USE_PYTHON}" ]]; then +if [[ -z "${PYTHON_COMPAT}" ]]; then # Default: pure python, support all implementations - USE_PYTHON=3D" python2_5 python2_6 python2_7" - USE_PYTHON+=3D" python3_1 python3_2" - USE_PYTHON+=3D" jython2_5" - USE_PYTHON+=3D" pypy1_7 pypy1_8" + PYTHON_COMPAT=3D" python2_5 python2_6 python2_7" + PYTHON_COMPAT+=3D" python3_1 python3_2" + PYTHON_COMPAT+=3D" jython2_5" + PYTHON_COMPAT+=3D" pypy1_7 pypy1_8" fi =20 # @ECLASS-VARIABLE: PYTHON_OPTIONAL @@ -58,7 +58,7 @@ esac # @DESCRIPTION: # This function returns the full package atom of a Python implementation= . # -# `implementation' has to be one of the valid values for USE_PYTHON. +# `implementation' has to be one of the valid values for PYTHON_COMPAT. _python-distutils-ng_generate_depend() { local impl=3D"${1/_/.}" case "${impl}" in @@ -105,7 +105,7 @@ else REQUIRED_USE+=3D"${required_use_str}" fi =20 -for impl in ${USE_PYTHON}; do +for impl in ${PYTHON_COMPAT}; do IUSE+=3D" python_targets_${impl} " local dep_str=3D"python_targets_${impl}? ( $(_python-distutils-ng_gener= ate_depend "${impl}") )" =20 @@ -149,8 +149,8 @@ _python-distutils-ng_run_for_impl() { _python-distutils-ng_run_for_all_impls() { local command=3D"${1}" =20 - for impl in ${USE_PYTHON}; do - use "python_targets_${impl}" ${USE_PYTHON} || continue + for impl in ${PYTHON_COMPAT}; do + use "python_targets_${impl}" ${PYTHON_COMPAT} || continue _python-distutils-ng_run_for_impl "${impl}" "${command}" done } @@ -248,8 +248,8 @@ python-distutils-ng_newscript() { =20 einfo "Installing ${source_file} for multiple implementations (default:= ${default_impl})" insinto /usr/bin - for impl in ${USE_PYTHON}; do - use "python_targets_${impl}" ${USE_PYTHON} || continue + for impl in ${PYTHON_COMPAT}; do + use "python_targets_${impl}" ${PYTHON_COMPAT} || continue =20 newins "${source_file}" "${destination_file}-${impl}" fperms 755 "/usr/bin/${destination_file}-${impl}" @@ -279,8 +279,8 @@ python-distutils-ng_src_prepare() { [[ "${PYTHON_OPTIONAL}" =3D "yes" ]] && { use python || return; } =20 # Try to run binary for each implementation: - for impl in ${USE_PYTHON}; do - use "python_targets_${impl}" ${USE_PYTHON} || continue + for impl in ${PYTHON_COMPAT}; do + use "python_targets_${impl}" ${PYTHON_COMPAT} || continue $(_python-distutils-ng_get_binary_for_implementation "${impl}") \ -c "import sys" || die done @@ -292,8 +292,8 @@ python-distutils-ng_src_prepare() { fi =20 # Create a copy of S for each implementation: - for impl in ${USE_PYTHON}; do - use "python_targets_${impl}" ${USE_PYTHON} || continue + for impl in ${PYTHON_COMPAT}; do + use "python_targets_${impl}" ${PYTHON_COMPAT} || continue =20 einfo "Creating copy for ${impl} in ${WORKDIR}/impl_${impl}" mkdir -p "${WORKDIR}/impl_${impl}" || die @@ -353,9 +353,9 @@ python-distutils-ng_src_install() { python_install_all fi =20 - for impl in ${USE_PYTHON}; do + for impl in ${PYTHON_COMPAT}; do [[ "${PYTHON_DISABLE_COMPILATION}" =3D "yes" ]] && continue - use "python_targets_${impl}" ${USE_PYTHON} || continue + use "python_targets_${impl}" ${PYTHON_COMPAT} || continue =20 PYTHON=3D"$(_python-distutils-ng_get_binary_for_implementation "${impl= }")" for accessible_path in $(${PYTHON} -c 'import sys; print " ".join(sys.= path)'); do