From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D3E7D1384B4 for ; Fri, 11 Dec 2015 21:27:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4945D21C027; Fri, 11 Dec 2015 21:27:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CFBE9E087F for ; Fri, 11 Dec 2015 21:27:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9F15834085D for ; Fri, 11 Dec 2015 21:27:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7D3F2AF9 for ; Fri, 11 Dec 2015 21:27:42 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1449869239.44d3345d828af162b2fbfd623dd8f0d7ac4ae2f9.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/python-any-r1.eclass eclass/python-r1.eclass eclass/python-single-r1.eclass eclass/python-utils-r1.eclass X-VCS-Directories: eclass/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 44d3345d828af162b2fbfd623dd8f0d7ac4ae2f9 X-VCS-Branch: master Date: Fri, 11 Dec 2015 21:27:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 07ebaf51-9774-4303-b9a3-e9fc1c0a20dc X-Archives-Hash: 9cb58027140a6a40b17eef915d9ca4db commit: 44d3345d828af162b2fbfd623dd8f0d7ac4ae2f9 Author: Michał Górny gentoo org> AuthorDate: Fri Dec 11 21:26:45 2015 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Dec 11 21:27:19 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44d3345d python*-r1.eclass: Replace non-portable use of 'declare -g' Replace uses of 'declare -g -r' (bash-4.2+) with 'readonly'. Reported by Arfrever. eclass/python-any-r1.eclass | 2 +- eclass/python-r1.eclass | 4 ++-- eclass/python-single-r1.eclass | 2 +- eclass/python-utils-r1.eclass | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass index 82ead76..846c0da 100644 --- a/eclass/python-any-r1.eclass +++ b/eclass/python-any-r1.eclass @@ -133,7 +133,7 @@ _python_any_set_globals() { PYTHON_DEPS="${PYTHON_PKG_DEP} ${PYTHON_DEPS}" done - declare -g -r PYTHON_DEPS="|| ( ${PYTHON_DEPS})" + readonly PYTHON_DEPS="|| ( ${PYTHON_DEPS})" } _python_any_set_globals unset -f _python_any_set_globals diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass index 4b9c6f3..5c1f1b3 100644 --- a/eclass/python-r1.eclass +++ b/eclass/python-r1.eclass @@ -216,8 +216,8 @@ _python_set_globals() { optflags+=,${flags_st[@]/%/(-)} IUSE=${flags[*]} - declare -g -r PYTHON_REQUIRED_USE="|| ( ${flags[*]} )" - declare -g -r PYTHON_USEDEP=${optflags// /,} + readonly PYTHON_REQUIRED_USE="|| ( ${flags[*]} )" + readonly PYTHON_USEDEP=${optflags// /,} # 1) well, python-exec would suffice as an RDEP # but no point in making this overcomplex, BDEP doesn't hurt anyone diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass index 1582295..3c33f37 100644 --- a/eclass/python-single-r1.eclass +++ b/eclass/python-single-r1.eclass @@ -238,7 +238,7 @@ _python_single_set_globals() { PYTHON_DEPS+="python_single_target_${i}? ( ${PYTHON_PKG_DEP} ) " done fi - declare -g -r PYTHON_USEDEP=${optflags// /,} + readonly PYTHON_USEDEP=${optflags// /,} # 1) well, python-exec would suffice as an RDEP # but no point in making this overcomplex, BDEP doesn't hurt anyone diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index cf0e134..42c33eb 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -40,7 +40,7 @@ inherit toolchain-funcs # @INTERNAL # @DESCRIPTION: # All supported Python implementations, most preferred last. -declare -g -r _PYTHON_ALL_IMPLS=( +readonly _PYTHON_ALL_IMPLS=( python2_7 python3_3 python3_4 python3_5 pypy pypy3