[gentoo-commits] repo/gentoo:python-cleanup-r2 commit in: eclass/

[gentoo-commits] repo/gentoo:python-cleanup-r2 commit in: eclass/

[Michał Górny]

commit:     14dc8ea25ce99202fa7876f746c2d090d012cb59
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 15:55:24 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec  9 19:29:33 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14dc8ea2

python-single-r1.eclass: Mark eclass-generated variables read-only

 eclass/python-single-r1.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
index 8021501..1582295 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
-	PYTHON_USEDEP=${optflags// /,}
+	declare -g -r PYTHON_USEDEP=${optflags// /,}
 
 	# 1) well, python-exec would suffice as an RDEP
 	# but no point in making this overcomplex, BDEP doesn't hurt anyone
@@ -253,6 +253,7 @@ _python_single_set_globals() {
 	else
 		PYTHON_DEPS+="dev-lang/python-exec:2[${PYTHON_USEDEP}]"
 	fi
+	readonly PYTHON_DEPS PYTHON_REQUIRED_USE
 }
 _python_single_set_globals
 unset -f _python_single_set_globals

[gentoo-commits] repo/gentoo:python-cleanup-r2 commit in: eclass/

[Michał Górny]

commit:     9b4c334f4829c8921650efafa4ab4591df6612b6
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 16:52:38 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec  9 19:29:33 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b4c334f

python-r1.eclass: python_gen_cond_dep(), rename local PYTHON_USEDEP

Rename local PYTHON_USEDEP variable to avoid collisions with read-only
global variable.

 eclass/python-r1.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 22030b9..8c58e31 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -390,8 +390,8 @@ python_gen_cond_dep() {
 				# (since python_gen_usedep() will not return ${PYTHON_USEDEP}
 				#  the code is run at most once)
 				if [[ ${dep} == *'${PYTHON_USEDEP}'* ]]; then
-					local PYTHON_USEDEP=$(python_gen_usedep "${@}")
-					dep=${dep//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}}
+					local usedep=$(python_gen_usedep "${@}")
+					dep=${dep//\$\{PYTHON_USEDEP\}/${usedep}}
 				fi
 
 				matches+=( "python_targets_${impl}? ( ${dep} )" )

[gentoo-commits] repo/gentoo:python-cleanup-r2 commit in: eclass/

[Michał Górny]

commit:     72748a27a6d4cf43af6179f4ac8a4663bac27608
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 15:38:02 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec  9 19:29:33 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72748a27

python-r1.eclass: Unset local functions after use

 eclass/python-r1.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 6e7b6e1..22030b9 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -582,6 +582,7 @@ python_setup() {
 		done
 	}
 	python_foreach_impl _python_try_impl
+	unset -f _python_try_impl
 
 	if [[ ! ${best_impl} ]]; then
 		eerror "${FUNCNAME}: none of the enabled implementation matched the patterns."
@@ -619,6 +620,7 @@ python_export_best() {
 		best=${MULTIBUILD_VARIANT}
 	}
 	multibuild_for_best_variant _python_set_best
+	unset -f _python_set_best
 
 	debug-print "${FUNCNAME}: Best implementation is: ${best}"
 	python_export "${best}" "${@}"
@@ -653,6 +655,7 @@ python_replicate_script() {
 
 	local files=( "${@}" )
 	python_foreach_impl _python_replicate_script
+	unset -f _python_replicate_script
 
 	# install the wrappers
 	local f

[gentoo-commits] repo/gentoo:python-cleanup-r2 commit in: eclass/

[Michał Górny]

commit:     b56282f14d445ef7a9bed48288d81ab22064890e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 15:53:34 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec  9 19:29:33 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b56282f1

python-r1.eclass: Mark eclass-generated variables read-only

 eclass/python-r1.eclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 8c58e31..4b9c6f3 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -216,8 +216,8 @@ _python_set_globals() {
 	optflags+=,${flags_st[@]/%/(-)}
 
 	IUSE=${flags[*]}
-	PYTHON_REQUIRED_USE="|| ( ${flags[*]} )"
-	PYTHON_USEDEP=${optflags// /,}
+	declare -g -r PYTHON_REQUIRED_USE="|| ( ${flags[*]} )"
+	declare -g -r PYTHON_USEDEP=${optflags// /,}
 
 	# 1) well, python-exec would suffice as an RDEP
 	# but no point in making this overcomplex, BDEP doesn't hurt anyone
@@ -232,6 +232,7 @@ _python_set_globals() {
 	else
 		PYTHON_DEPS+="dev-lang/python-exec:2[${PYTHON_USEDEP}]"
 	fi
+	readonly PYTHON_DEPS
 }
 _python_set_globals
 unset -f _python_set_globals

[gentoo-commits] repo/gentoo:python-cleanup-r2 commit in: eclass/

[Michał Górny]

commit:     193eb1bc140ca6087507bc7c504def14515e599a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 15:38:40 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec  9 19:29:33 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=193eb1bc

distutils-r1.eclass: Unset local functions after use

 eclass/distutils-r1.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 36b3436..be94c46 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -678,6 +678,7 @@ _distutils-r1_run_common_phase() {
 			done
 		}
 		python_foreach_impl _distutils_try_impl
+		unset -f _distutils_try_impl
 
 		local PYTHON_COMPAT=( "${best_impl}" )
 	fi

[gentoo-commits] repo/gentoo:python-cleanup-r2 commit in: eclass/

[Michał Górny]

commit:     fb97f651b70e7a74558374e001757c94a0b65ffc
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 15:45:28 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec  9 19:29:33 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb97f651

python-r1.eclass: Unset global-setting function after use

 eclass/python-r1.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 91f0436..6e7b6e1 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -234,6 +234,7 @@ _python_set_globals() {
 	fi
 }
 _python_set_globals
+unset -f _python_set_globals
 
 # @FUNCTION: _python_validate_useflags
 # @INTERNAL

[gentoo-commits] repo/gentoo:python-cleanup-r2 commit in: eclass/

[Michał Górny]

commit:     882c58e3cd8828dd3077027e5c9491248f434fe2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 15:43:19 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec  9 19:29:33 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=882c58e3

python-any-r1.eclass: Rename global-setting func to match eclass name

 eclass/python-any-r1.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
index b6c2258..390ce90 100644
--- a/eclass/python-any-r1.eclass
+++ b/eclass/python-any-r1.eclass
@@ -115,7 +115,7 @@ fi
 # 	dev-lang/python:2.6[gdbm] )
 # @CODE
 
-_python_build_set_globals() {
+_python_any_set_globals() {
 	local usestr i PYTHON_PKG_DEP
 	[[ ${PYTHON_REQ_USE} ]] && usestr="[${PYTHON_REQ_USE}]"
 
@@ -135,7 +135,7 @@ _python_build_set_globals() {
 	done
 	PYTHON_DEPS="|| ( ${PYTHON_DEPS})"
 }
-_python_build_set_globals
+_python_any_set_globals
 
 # @ECLASS-VARIABLE: PYTHON_USEDEP
 # @DESCRIPTION:

[gentoo-commits] repo/gentoo:python-cleanup-r2 commit in: eclass/

[Michał Górny]

commit:     5f612d0d8fcd6ba55cb1b5d572f60e875c0a21fc
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 17:24:55 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec  9 19:29:33 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f612d0d

python-single-r1.eclass: python_gen_cond_dep(), rename local PYTHON_USEDEP

Rename local PYTHON_USEDEP variable to avoid collisions with read-only
global variable.

 eclass/python-single-r1.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
index a89926d..8021501 100644
--- a/eclass/python-single-r1.eclass
+++ b/eclass/python-single-r1.eclass
@@ -388,8 +388,8 @@ python_gen_cond_dep() {
 				# (since python_gen_usedep() will not return ${PYTHON_USEDEP}
 				#  the code is run at most once)
 				if [[ ${dep} == *'${PYTHON_USEDEP}'* ]]; then
-					local PYTHON_USEDEP=$(python_gen_usedep "${@}")
-					dep=${dep//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}}
+					local usedep=$(python_gen_usedep "${@}")
+					dep=${dep//\$\{PYTHON_USEDEP\}/${usedep}}
 				fi
 
 				matches+=( "python_single_target_${impl}? ( ${dep} )" )

[gentoo-commits] repo/gentoo:python-cleanup-r2 commit in: eclass/

[Michał Górny]

commit:     6b1e8b0e1765878badd36a580ae740405bc56ce4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 15:50:05 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec  9 19:29:33 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b1e8b0e

python-any-r1.eclass: Mark eclass-generated variables read-only

 eclass/python-any-r1.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
index 7d86b9a..82ead76 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
-	PYTHON_DEPS="|| ( ${PYTHON_DEPS})"
+	declare -g -r PYTHON_DEPS="|| ( ${PYTHON_DEPS})"
 }
 _python_any_set_globals
 unset -f _python_any_set_globals

[gentoo-commits] repo/gentoo:python-cleanup-r2 commit in: eclass/

[Michał Górny]

commit:     eedef935b8d03d872eb729cda59c8328d0131e32
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 15:48:30 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec  9 19:29:33 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eedef935

python-utils-r1.eclass: Mark _PYTHON_ALL_IMPLS read-only

 eclass/python-utils-r1.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 024e093..0bce6a9 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.
-_PYTHON_ALL_IMPLS=(
+declare -g -r _PYTHON_ALL_IMPLS=(
 	jython2_5 jython2_7
 	pypy pypy3
 	python3_3 python3_4 python3_5

[gentoo-commits] repo/gentoo:python-cleanup-r2 commit in: eclass/

[Michał Górny]

commit:     38d511981a51c0c6a8d023621c4a59a8365f5b8c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 15:45:06 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec  9 19:29:33 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38d51198

python-any-r1.eclass: Unset global-setting function after use

 eclass/python-any-r1.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
index 390ce90..7d86b9a 100644
--- a/eclass/python-any-r1.eclass
+++ b/eclass/python-any-r1.eclass
@@ -136,6 +136,7 @@ _python_any_set_globals() {
 	PYTHON_DEPS="|| ( ${PYTHON_DEPS})"
 }
 _python_any_set_globals
+unset -f _python_any_set_globals
 
 # @ECLASS-VARIABLE: PYTHON_USEDEP
 # @DESCRIPTION:

[gentoo-commits] repo/gentoo:python-cleanup-r2 commit in: eclass/

[Michał Górny]

commit:     9d3d82fec1ffdd8b2f45f5861c89c4410a1617f6
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 15:45:17 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec  9 19:29:33 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d3d82fe

python-single-r1.eclass: Unset global-setting function after use

 eclass/python-single-r1.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
index d9fc34b..a89926d 100644
--- a/eclass/python-single-r1.eclass
+++ b/eclass/python-single-r1.eclass
@@ -255,6 +255,7 @@ _python_single_set_globals() {
 	fi
 }
 _python_single_set_globals
+unset -f _python_single_set_globals
 
 # @FUNCTION: python_gen_usedep
 # @USAGE: <pattern> [...]

[gentoo-commits] repo/gentoo:python-cleanup-r2 commit in: eclass/

[Michał Górny]

commit:     2f84986af360dcf026d0ac84f784246c3e54cc13
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 16:02:55 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec  9 19:29:33 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f84986a

python-utils-r1.eclass: Reorder implementations to semi-ascending order

Reorder the Python implementations to ascending version order, with
CPython listed first and other implementations in descending preference.

The previous ordering has been used for two reasons:

1. There were packages which supported Python 3.x or PyPy partially but
their documentation builds or test functions required CPython 2.x.
The specific ordering caused python_export_best (the predecessor of
python_setup) to use CPython 2.x for those tasks. This is now replaced
by explicit implementation restrictions in python_setup.

2. PyPy setup runs were usually slower than CPython, and CPython 3.x
runs were often slower due to 2to3 calls. Combined with parallel build
runs, this ordering caused slower builds to start earlier and sometimes
resulted in more efficient use of threads. However, nowadays we no
longer do parallel builds.

Therefore, it seems reasonable to finally reorder the implementations
into a more intuitive order.

 eclass/python-utils-r1.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 0bce6a9..3ea23a8 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -41,10 +41,10 @@ inherit toolchain-funcs
 # @DESCRIPTION:
 # All supported Python implementations, most preferred last.
 declare -g -r _PYTHON_ALL_IMPLS=(
-	jython2_5 jython2_7
-	pypy pypy3
-	python3_3 python3_4 python3_5
 	python2_7
+	python3_3 python3_4 python3_5
+	pypy pypy3
+	jython2_5 jython2_7
 )
 
 # @FUNCTION: _python_impl_supported

[gentoo-commits] repo/gentoo:python-cleanup-r2 commit in: eclass/

[Michał Górny]

commit:     3a1a7d6f0b6e3d635df902a9b221f9f2c3cc027c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 15:53:34 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec  6 17:28:30 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a1a7d6f

python-r1.eclass: Mark eclass-generated variables read-only

 eclass/python-r1.eclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 8c58e31..4b9c6f3 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -216,8 +216,8 @@ _python_set_globals() {
 	optflags+=,${flags_st[@]/%/(-)}
 
 	IUSE=${flags[*]}
-	PYTHON_REQUIRED_USE="|| ( ${flags[*]} )"
-	PYTHON_USEDEP=${optflags// /,}
+	declare -g -r PYTHON_REQUIRED_USE="|| ( ${flags[*]} )"
+	declare -g -r PYTHON_USEDEP=${optflags// /,}
 
 	# 1) well, python-exec would suffice as an RDEP
 	# but no point in making this overcomplex, BDEP doesn't hurt anyone
@@ -232,6 +232,7 @@ _python_set_globals() {
 	else
 		PYTHON_DEPS+="dev-lang/python-exec:2[${PYTHON_USEDEP}]"
 	fi
+	readonly PYTHON_DEPS
 }
 _python_set_globals
 unset -f _python_set_globals

[gentoo-commits] repo/gentoo:python-cleanup-r2 commit in: eclass/

[Michał Górny]

commit:     ab9fb60042da94b950fc18c379dbb084d64ef592
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 16:52:38 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec  6 17:28:23 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab9fb600

python-r1.eclass: python_gen_cond_dep(), rename local PYTHON_USEDEP

Rename local PYTHON_USEDEP variable to avoid collisions with read-only
global variable.

 eclass/python-r1.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 22030b9..8c58e31 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -390,8 +390,8 @@ python_gen_cond_dep() {
 				# (since python_gen_usedep() will not return ${PYTHON_USEDEP}
 				#  the code is run at most once)
 				if [[ ${dep} == *'${PYTHON_USEDEP}'* ]]; then
-					local PYTHON_USEDEP=$(python_gen_usedep "${@}")
-					dep=${dep//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}}
+					local usedep=$(python_gen_usedep "${@}")
+					dep=${dep//\$\{PYTHON_USEDEP\}/${usedep}}
 				fi
 
 				matches+=( "python_targets_${impl}? ( ${dep} )" )

[gentoo-commits] repo/gentoo:python-cleanup-r2 commit in: eclass/

[Michał Górny]

commit:     d8c8c811a90410db7193c9a2bfb4e3072da68c04
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 15:38:40 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec  6 17:28:36 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8c8c811

distutils-r1.eclass: Unset local functions after use

 eclass/distutils-r1.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 36b3436..be94c46 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -678,6 +678,7 @@ _distutils-r1_run_common_phase() {
 			done
 		}
 		python_foreach_impl _distutils_try_impl
+		unset -f _distutils_try_impl
 
 		local PYTHON_COMPAT=( "${best_impl}" )
 	fi

[gentoo-commits] repo/gentoo:python-cleanup-r2 commit in: eclass/

[Michał Górny]

commit:     51d35a68be0d6b6a52d876c896f3875d208b97e1
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 15:45:28 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec  6 17:28:11 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51d35a68

python-r1.eclass: Unset global-setting function after use

 eclass/python-r1.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 91f0436..6e7b6e1 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -234,6 +234,7 @@ _python_set_globals() {
 	fi
 }
 _python_set_globals
+unset -f _python_set_globals
 
 # @FUNCTION: _python_validate_useflags
 # @INTERNAL

[gentoo-commits] repo/gentoo:python-cleanup-r2 commit in: eclass/

[Michał Górny]

commit:     b97d546eb5b495d652044b97ff4be0295268c706
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 15:45:17 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec  6 17:27:52 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b97d546e

python-single-r1.eclass: Unset global-setting function after use

 eclass/python-single-r1.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
index d9fc34b..a89926d 100644
--- a/eclass/python-single-r1.eclass
+++ b/eclass/python-single-r1.eclass
@@ -255,6 +255,7 @@ _python_single_set_globals() {
 	fi
 }
 _python_single_set_globals
+unset -f _python_single_set_globals
 
 # @FUNCTION: python_gen_usedep
 # @USAGE: <pattern> [...]

[gentoo-commits] repo/gentoo:python-cleanup-r2 commit in: eclass/

[Michał Górny]

commit:     d91824b43c1e1a63a01fec13e0c0c87c856d29ed
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 15:50:05 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec  6 17:27:46 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d91824b4

python-any-r1.eclass: Mark eclass-generated variables read-only

 eclass/python-any-r1.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
index 7d86b9a..82ead76 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
-	PYTHON_DEPS="|| ( ${PYTHON_DEPS})"
+	declare -g -r PYTHON_DEPS="|| ( ${PYTHON_DEPS})"
 }
 _python_any_set_globals
 unset -f _python_any_set_globals

[gentoo-commits] repo/gentoo:python-cleanup-r2 commit in: eclass/

[Michał Górny]

commit:     4d11b4971f8b64caa7d9cb46f70f368e1f2d3017
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 15:38:02 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec  6 17:28:17 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d11b497

python-r1.eclass: Unset local functions after use

 eclass/python-r1.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 6e7b6e1..22030b9 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -582,6 +582,7 @@ python_setup() {
 		done
 	}
 	python_foreach_impl _python_try_impl
+	unset -f _python_try_impl
 
 	if [[ ! ${best_impl} ]]; then
 		eerror "${FUNCNAME}: none of the enabled implementation matched the patterns."
@@ -619,6 +620,7 @@ python_export_best() {
 		best=${MULTIBUILD_VARIANT}
 	}
 	multibuild_for_best_variant _python_set_best
+	unset -f _python_set_best
 
 	debug-print "${FUNCNAME}: Best implementation is: ${best}"
 	python_export "${best}" "${@}"
@@ -653,6 +655,7 @@ python_replicate_script() {
 
 	local files=( "${@}" )
 	python_foreach_impl _python_replicate_script
+	unset -f _python_replicate_script
 
 	# install the wrappers
 	local f

[gentoo-commits] repo/gentoo:python-cleanup-r2 commit in: eclass/

[Michał Górny]

commit:     9fd9fcec336c94f3693710a8fd408aa36ee00af1
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 16:02:55 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec  6 17:27:26 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fd9fcec

python-utils-r1.eclass: Reorder implementations to semi-ascending order

Reorder the Python implementations to ascending version order, with
CPython listed first and other implementations in descending preference.

The previous ordering has been used for two reasons:

1. There were packages which supported Python 3.x or PyPy partially but
their documentation builds or test functions required CPython 2.x.
The specific ordering caused python_export_best (the predecessor of
python_setup) to use CPython 2.x for those tasks. This is now replaced
by explicit implementation restrictions in python_setup.

2. PyPy setup runs were usually slower than CPython, and CPython 3.x
runs were often slower due to 2to3 calls. Combined with parallel build
runs, this ordering caused slower builds to start earlier and sometimes
resulted in more efficient use of threads. However, nowadays we no
longer do parallel builds.

Therefore, it seems reasonable to finally reorder the implementations
into a more intuitive order.

 eclass/python-utils-r1.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 0bce6a9..3ea23a8 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -41,10 +41,10 @@ inherit toolchain-funcs
 # @DESCRIPTION:
 # All supported Python implementations, most preferred last.
 declare -g -r _PYTHON_ALL_IMPLS=(
-	jython2_5 jython2_7
-	pypy pypy3
-	python3_3 python3_4 python3_5
 	python2_7
+	python3_3 python3_4 python3_5
+	pypy pypy3
+	jython2_5 jython2_7
 )
 
 # @FUNCTION: _python_impl_supported

[gentoo-commits] repo/gentoo:python-cleanup-r2 commit in: eclass/

[Michał Górny]

commit:     c52cda8856ed505428673f22c3257840cb9477d9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 15:43:19 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec  6 17:27:33 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c52cda88

python-any-r1.eclass: Rename global-setting func to match eclass name

 eclass/python-any-r1.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
index b6c2258..390ce90 100644
--- a/eclass/python-any-r1.eclass
+++ b/eclass/python-any-r1.eclass
@@ -115,7 +115,7 @@ fi
 # 	dev-lang/python:2.6[gdbm] )
 # @CODE
 
-_python_build_set_globals() {
+_python_any_set_globals() {
 	local usestr i PYTHON_PKG_DEP
 	[[ ${PYTHON_REQ_USE} ]] && usestr="[${PYTHON_REQ_USE}]"
 
@@ -135,7 +135,7 @@ _python_build_set_globals() {
 	done
 	PYTHON_DEPS="|| ( ${PYTHON_DEPS})"
 }
-_python_build_set_globals
+_python_any_set_globals
 
 # @ECLASS-VARIABLE: PYTHON_USEDEP
 # @DESCRIPTION:

[gentoo-commits] repo/gentoo:python-cleanup-r2 commit in: eclass/

[Michał Górny]

commit:     54ab0944122fbcfa00ad8c8aec97b166082462c3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 15:55:24 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec  6 17:28:05 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54ab0944

python-single-r1.eclass: Mark eclass-generated variables read-only

 eclass/python-single-r1.eclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
index 8021501..1582295 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
-	PYTHON_USEDEP=${optflags// /,}
+	declare -g -r PYTHON_USEDEP=${optflags// /,}
 
 	# 1) well, python-exec would suffice as an RDEP
 	# but no point in making this overcomplex, BDEP doesn't hurt anyone
@@ -253,6 +253,7 @@ _python_single_set_globals() {
 	else
 		PYTHON_DEPS+="dev-lang/python-exec:2[${PYTHON_USEDEP}]"
 	fi
+	readonly PYTHON_DEPS PYTHON_REQUIRED_USE
 }
 _python_single_set_globals
 unset -f _python_single_set_globals

[gentoo-commits] repo/gentoo:python-cleanup-r2 commit in: eclass/

[Michał Górny]

commit:     2827610d22525a55ad4b17a4a126ef98d5aaf16c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 15:45:06 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec  6 17:27:39 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2827610d

python-any-r1.eclass: Unset global-setting function after use

 eclass/python-any-r1.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
index 390ce90..7d86b9a 100644
--- a/eclass/python-any-r1.eclass
+++ b/eclass/python-any-r1.eclass
@@ -136,6 +136,7 @@ _python_any_set_globals() {
 	PYTHON_DEPS="|| ( ${PYTHON_DEPS})"
 }
 _python_any_set_globals
+unset -f _python_any_set_globals
 
 # @ECLASS-VARIABLE: PYTHON_USEDEP
 # @DESCRIPTION:

[gentoo-commits] repo/gentoo:python-cleanup-r2 commit in: eclass/

[Michał Górny]

commit:     20ae114f1f28ffdd59f4aca615593e627e22e0cb
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 17:24:55 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec  6 17:27:59 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20ae114f

python-single-r1.eclass: python_gen_cond_dep(), rename local PYTHON_USEDEP

Rename local PYTHON_USEDEP variable to avoid collisions with read-only
global variable.

 eclass/python-single-r1.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
index a89926d..8021501 100644
--- a/eclass/python-single-r1.eclass
+++ b/eclass/python-single-r1.eclass
@@ -388,8 +388,8 @@ python_gen_cond_dep() {
 				# (since python_gen_usedep() will not return ${PYTHON_USEDEP}
 				#  the code is run at most once)
 				if [[ ${dep} == *'${PYTHON_USEDEP}'* ]]; then
-					local PYTHON_USEDEP=$(python_gen_usedep "${@}")
-					dep=${dep//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}}
+					local usedep=$(python_gen_usedep "${@}")
+					dep=${dep//\$\{PYTHON_USEDEP\}/${usedep}}
 				fi
 
 				matches+=( "python_single_target_${impl}? ( ${dep} )" )

[gentoo-commits] repo/gentoo:python-cleanup-r2 commit in: eclass/

[Michał Górny]

commit:     e8e51fc43e71eb1a5b638a298e6a7cc52e1129d3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 15:48:30 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec  6 17:27:20 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8e51fc4

python-utils-r1.eclass: Mark _PYTHON_ALL_IMPLS read-only

 eclass/python-utils-r1.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 024e093..0bce6a9 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.
-_PYTHON_ALL_IMPLS=(
+declare -g -r _PYTHON_ALL_IMPLS=(
 	jython2_5 jython2_7
 	pypy pypy3
 	python3_3 python3_4 python3_5

[gentoo-commits] repo/gentoo:python-cleanup-r2 commit in: eclass/

[Michał Górny]

commit:     b392d99098a4415f5e9207251cdeedd7764f51df
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 16:52:38 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec  6 16:52:38 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b392d990

python-r1.eclass: python_gen_cond_dep(), rename local PYTHON_USEDEP

Rename local PYTHON_USEDEP variable to avoid collisions with read-only
global variable.

 eclass/python-r1.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 9eb2cf0..4b9c6f3 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -391,8 +391,8 @@ python_gen_cond_dep() {
 				# (since python_gen_usedep() will not return ${PYTHON_USEDEP}
 				#  the code is run at most once)
 				if [[ ${dep} == *'${PYTHON_USEDEP}'* ]]; then
-					local PYTHON_USEDEP=$(python_gen_usedep "${@}")
-					dep=${dep//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}}
+					local usedep=$(python_gen_usedep "${@}")
+					dep=${dep//\$\{PYTHON_USEDEP\}/${usedep}}
 				fi
 
 				matches+=( "python_targets_${impl}? ( ${dep} )" )

[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michał Górny]

commit:     917d6c000fb2ae9a348d4e76342e582b630d29c9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 16:14:52 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec  6 16:15:15 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=917d6c00

git-r3.eclass: Unset local function after use

 eclass/git-r3.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass
index 8b5ffd5..42d6dbf 100644
--- a/eclass/git-r3.eclass
+++ b/eclass/git-r3.eclass
@@ -821,6 +821,7 @@ git-r3_checkout() {
 		"${@}" || die "git checkout ${remote_ref:-${new_commit_id}} failed"
 	}
 	git-r3_sub_checkout
+	unset -f git-r3_sub_checkout
 
 	local old_commit_id=$(
 		git rev-parse --quiet --verify refs/git-r3/"${local_id}"/__old__

[gentoo-commits] repo/gentoo:python-cleanup-r2 commit in: eclass/

[Michał Górny]

commit:     917d6c000fb2ae9a348d4e76342e582b630d29c9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 16:14:52 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec  6 16:15:15 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=917d6c00

git-r3.eclass: Unset local function after use

 eclass/git-r3.eclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass
index 8b5ffd5..42d6dbf 100644
--- a/eclass/git-r3.eclass
+++ b/eclass/git-r3.eclass
@@ -821,6 +821,7 @@ git-r3_checkout() {
 		"${@}" || die "git checkout ${remote_ref:-${new_commit_id}} failed"
 	}
 	git-r3_sub_checkout
+	unset -f git-r3_sub_checkout
 
 	local old_commit_id=$(
 		git rev-parse --quiet --verify refs/git-r3/"${local_id}"/__old__

[gentoo-commits] repo/gentoo:python-cleanup-r2 commit in: eclass/

[Michał Górny]

commit:     ade7b5873bd4b61be76f41e52e98aec7dbe9dfad
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  6 16:02:55 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec  6 16:02:55 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ade7b587

python-utils-r1.eclass: Reorder implementations to semi-ascending order

Reorder the Python implementations to ascending version order, with
CPython listed first and other implementations in descending preference.

The previous ordering has been used for two reasons:

1. There were packages which supported Python 3.x or PyPy partially but
their documentation builds or test functions required CPython 2.x.
The specific ordering caused python_export_best (the predecessor of
python_setup) to use CPython 2.x for those tasks. This is now replaced
by explicit implementation restrictions in python_setup.

2. PyPy setup runs were usually slower than CPython, and CPython 3.x
runs were often slower due to 2to3 calls. Combined with parallel build
runs, this ordering caused slower builds to start earlier and sometimes
resulted in more efficient use of threads. However, nowadays we no
longer do parallel builds.

Therefore, it seems reasonable to finally reorder the implementations
into a more intuitive order.

 eclass/python-utils-r1.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 0bce6a9..3ea23a8 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -41,10 +41,10 @@ inherit toolchain-funcs
 # @DESCRIPTION:
 # All supported Python implementations, most preferred last.
 declare -g -r _PYTHON_ALL_IMPLS=(
-	jython2_5 jython2_7
-	pypy pypy3
-	python3_3 python3_4 python3_5
 	python2_7
+	python3_3 python3_4 python3_5
+	pypy pypy3
+	jython2_5 jython2_7
 )
 
 # @FUNCTION: _python_impl_supported