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

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

[Michał Górny]

commit:     2380e470c5678acc30b2510a654831ab144edda8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:11:24 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 21:11:24 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2380e470

python-any-r1: Enable EAPI=6, no changes needed

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

diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
index c00cc3a..b6c2258 100644
--- a/eclass/python-any-r1.eclass
+++ b/eclass/python-any-r1.eclass
@@ -37,8 +37,7 @@
 # https://wiki.gentoo.org/wiki/Project:Python/python-any-r1
 
 case "${EAPI:-0}" in
-	0|1|2|3|4|5)
-		# EAPI=4 needed by python-r1
+	0|1|2|3|4|5|6)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"

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

[Michał Górny]

commit:     c6e2863318a8b7d753532fc78e1dfe3c8ffd8c4f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:12:38 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 21:12:38 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6e28633

python-single-r1: Enable EAPI=6, no changes needed

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

diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
index 1c27285..d9fc34b 100644
--- a/eclass/python-single-r1.eclass
+++ b/eclass/python-single-r1.eclass
@@ -55,7 +55,7 @@ case "${EAPI:-0}" in
 			die "Unsupported EAPI=${EAPI:-4} (too old, allowed only on restricted set of packages) for ${ECLASS}"
 		fi
 		;;
-	5)
+	5|6)
 		# EAPI=5 is required for sane USE_EXPAND dependencies
 		;;
 	*)

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

[Michał Górny]

commit:     52715110eceba0e05a3eb40b66776b90641a69b8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:29:15 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 21:30:58 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52715110

python-r1.eclass: Enable EAPI 6

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

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 92fa5de..91f0436 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -47,7 +47,7 @@ case "${EAPI:-0}" in
 			die "Unsupported EAPI=${EAPI:-4} (too old, allowed only on restricted set of packages) for ${ECLASS}"
 		fi
 		;;
-	5)
+	5|6)
 		# EAPI=5 is required for sane USE_EXPAND dependencies
 		;;
 	*)

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

[Michał Górny]

commit:     9dcb587826f444ebdcb8219e6cd1d0f365a1d2e4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:27:52 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 21:30:52 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dcb5878

python-r1.eclass: Ban python_export_best in EAPI 6

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

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 1531442..de83bb5 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -603,6 +603,8 @@ python_setup() {
 python_export_best() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}"
+
 	eqawarn "python_export_best() is deprecated. Please use python_setup instead,"
 	eqawarn "combined with python_export if necessary."
 

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

[Michał Górny]

commit:     996da4f371b1c3f4a8db886fa3225d30ca898343
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:27:15 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 21:30:43 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=996da4f3

python-r1.eclass: Ban python_parallel_foreach_impl in EAPI 6

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

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index d3b4f1d..1531442 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -526,6 +526,8 @@ python_foreach_impl() {
 python_parallel_foreach_impl() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}"
+
 	if [[ ! ${_PYTHON_PARALLEL_WARNED} ]]; then
 		eqawarn "python_parallel_foreach_impl() is no longer meaningful. All runs"
 		eqawarn "are non-parallel now. Please replace the call with python_foreach_impl."

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

[Michał Górny]

commit:     dba2456e44aa83370846b1865c08236081a8227a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:26:08 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 21:30:39 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dba2456e

multibuild.eclass: Enable EAPI 6

 eclass/multibuild.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass
index 0bdbed1..d21008c 100644
--- a/eclass/multibuild.eclass
+++ b/eclass/multibuild.eclass
@@ -17,7 +17,7 @@ case "${EAPI:-0}" in
 	0|1|2|3)
 		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
 		;;
-	4|5)
+	4|5|6)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"

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

[Michał Górny]

commit:     6078661d7ea1d4c5a5d2bd5bb30ba75eb15ac1be
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:28:48 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 21:30:55 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6078661d

python-r1.eclass: Fix missing explicit eutils inherit for EAPI < 6

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

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index de83bb5..92fa5de 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -63,6 +63,7 @@ elif [[ ${_PYTHON_ANY_R1} ]]; then
 	die 'python-r1.eclass can not be used with python-any-r1.eclass.'
 fi
 
+[[ ${EAPI} == [45] ]] && inherit eutils
 inherit multibuild python-utils-r1
 
 # @ECLASS-VARIABLE: PYTHON_COMPAT

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

[Michał Górny]

commit:     f5f3e4d55bdd82f933d47aec03e792acb6d1343d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:12:38 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 21:30:27 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5f3e4d5

python-single-r1.eclass: Enable EAPI=6, no changes needed

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

diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
index 1c27285..d9fc34b 100644
--- a/eclass/python-single-r1.eclass
+++ b/eclass/python-single-r1.eclass
@@ -55,7 +55,7 @@ case "${EAPI:-0}" in
 			die "Unsupported EAPI=${EAPI:-4} (too old, allowed only on restricted set of packages) for ${ECLASS}"
 		fi
 		;;
-	5)
+	5|6)
 		# EAPI=5 is required for sane USE_EXPAND dependencies
 		;;
 	*)

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

[Michał Górny]

commit:     eeac1a2379d29b4ca09293cdb7028829e76b029f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:11:24 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 21:29:56 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eeac1a23

python-any-r1.eclass: Enable EAPI=6, no changes needed

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

diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
index c00cc3a..b6c2258 100644
--- a/eclass/python-any-r1.eclass
+++ b/eclass/python-any-r1.eclass
@@ -37,8 +37,7 @@
 # https://wiki.gentoo.org/wiki/Project:Python/python-any-r1
 
 case "${EAPI:-0}" in
-	0|1|2|3|4|5)
-		# EAPI=4 needed by python-r1
+	0|1|2|3|4|5|6)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"

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

[Michał Górny]

commit:     2c9a003efc96b528768e9b2ec9886db4cf683cb8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:20:59 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 21:30:37 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c9a003e

multibuild.eclass: Ban multibuild_parallel_foreach_variant in EAPI 6

 eclass/multibuild.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass
index 3115ac9..0bdbed1 100644
--- a/eclass/multibuild.eclass
+++ b/eclass/multibuild.eclass
@@ -146,6 +146,8 @@ multibuild_foreach_variant() {
 multibuild_parallel_foreach_variant() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}"
+
 	multibuild_foreach_variant "${@}"
 }
 

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

[Michał Górny]

commit:     17cd4494e055e3b55e80757b7f5b6095001da49e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 18:31:40 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 22:09:16 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17cd4494

python-utils-r1.eclass: Remove py2.6 note from python_optimize

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 201b0c4..9f3c750 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -564,9 +564,6 @@ python_optimize() {
 	local PYTHON=${PYTHON}
 	[[ ${PYTHON} ]] || python_export PYTHON
 
-	# Note: python2.6 can't handle passing files to compileall...
-	# TODO: we do not support 2.6 any longer
-
 	# default to sys.path
 	if [[ ${#} -eq 0 ]]; then
 		local f

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

[Michał Górny]

commit:     c49f18f252e80c528303621d8f4e369dff920a7d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:30:10 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 07:26:28 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c49f18f2

python-utils-r1.eclass: Make python_fix_shebang QAwarns fatal in EAPI 6

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 99ee58b..d8ced41 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -33,7 +33,8 @@ fi
 
 if [[ ! ${_PYTHON_UTILS_R1} ]]; then
 
-inherit eutils multilib toolchain-funcs
+[[ ${EAPI:-0} == [012345] ]] && inherit eutils
+inherit multilib toolchain-funcs
 
 # @ECLASS-VARIABLE: _PYTHON_ALL_IMPLS
 # @INTERNAL
@@ -1137,12 +1138,17 @@ python_fix_shebang() {
 		done < <(find "${path}" -type f -print0 || die)
 
 		if [[ ! ${any_fixed} ]]; then
-			eqawarn "QA warning: ${FUNCNAME}, ${path#${D}} did not match any fixable files."
+			local cmd=eerror
+			[[ ${EAPI:-0} == [012345] ]] && cmd=eqawarn
+
+			"${cmd}" "QA warning: ${FUNCNAME}, ${path#${D}} did not match any fixable files."
 			if [[ ${any_correct} ]]; then
-				eqawarn "All files have ${EPYTHON} shebang already."
+				"${cmd}" "All files have ${EPYTHON} shebang already."
 			else
-				eqawarn "There are no Python files in specified directory."
+				"${cmd}" "There are no Python files in specified directory."
 			fi
+
+			[[ ${cmd} == eerror ]] && die "${FUNCNAME} did not match any fixable files (QA warning fatal in EAPI ${EAPI})"
 		fi
 	done
 }

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

[Michał Górny]

commit:     dac29367fa13e66e12f8a6f98d625ca0a3741201
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 18:44:22 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 22:09:19 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dac29367

python-utils-r1.eclass: Replace local INSDESTTREE with subshells

Replace the 'local INSDESTTREE' hacks (which are PMS-valid yet
deprecated) with safer subshells.

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 9f3c750..e690e09 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -802,10 +802,10 @@ python_domodule() {
 		d=${PYTHON_SITEDIR#${EPREFIX}}/${python_moduleroot}
 	fi
 
-	local INSDESTTREE
-
-	insinto "${d}"
-	doins -r "${@}" || die
+	(
+		insinto "${d}"
+		doins -r "${@}" || die
+	)
 
 	python_optimize "${ED}/${d}"
 }
@@ -833,10 +833,10 @@ python_doheader() {
 
 	d=${PYTHON_INCLUDEDIR#${EPREFIX}}
 
-	local INSDESTTREE
-
-	insinto "${d}"
-	doins -r "${@}" || die
+	(
+		insinto "${d}"
+		doins -r "${@}" || die
+	)
 }
 
 # @FUNCTION: python_wrapper_setup

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

[Michał Górny]

commit:     52dbbd00f5584ada79d81af21928d53067fb9c1c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:45:05 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 22:09:13 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52dbbd00

python-utils-r1.eclass: Add missing ||die on file read

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 0a04e12..201b0c4 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -1038,12 +1038,12 @@ python_fix_shebang() {
 			local shebang i
 			local error= from=
 
-			IFS= read -r shebang <"${f}"
+			IFS= read -r shebang <"${f}" || die
 
 			# First, check if it's shebang at all...
 			if [[ ${shebang} == '#!'* ]]; then
 				local split_shebang=()
-				read -r -a split_shebang <<<${shebang}
+				read -r -a split_shebang <<<${shebang} || die
 
 				# Match left-to-right in a loop, to avoid matching random
 				# repetitions like 'python2.7 python2'.

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

[Michał Górny]

commit:     423c27482ef4998530d6133609fbee3050f18050
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:41:29 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 22:09:23 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=423c2748

python-utils-r1.eclass: Ban installation helpers in EAPIs < 5

Ban python_do* and python_new* helpers in EAPIs older than 5. We should
ban them in python-any-r1 uses, actually but that would break
dev-python/pypy* ebuilds as they are written now.

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index e690e09..99ee58b 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -662,6 +662,9 @@ python_newexe() {
 
 	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
 	[[ ${#} -eq 2 ]] || die "Usage: ${FUNCNAME} <path> <new-name>"
+	if [[ ${EAPI:-0} == [01234] ]]; then
+		die "python_do* and python_new* helpers are banned in EAPIs older than 5."
+	fi
 
 	local wrapd=${python_scriptroot:-${DESTTREE}/bin}
 
@@ -789,6 +792,9 @@ python_domodule() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
+	if [[ ${EAPI:-0} == [01234] ]]; then
+		die "python_do* and python_new* helpers are banned in EAPIs older than 5."
+	fi
 
 	local d
 	if [[ ${python_moduleroot} == /* ]]; then
@@ -827,6 +833,9 @@ python_doheader() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
+	if [[ ${EAPI:-0} == [01234] ]]; then
+		die "python_do* and python_new* helpers are banned in EAPIs older than 5."
+	fi
 
 	local d PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR}
 	[[ ${PYTHON_INCLUDEDIR} ]] || python_export PYTHON_INCLUDEDIR

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

[Michał Górny]

commit:     4c87a0e2955c0ac477a5d64ec837153c2e4f14f2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:12:38 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 07:26:42 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c87a0e2

python-single-r1.eclass: Enable EAPI=6, no changes needed

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

diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
index 1c27285..d9fc34b 100644
--- a/eclass/python-single-r1.eclass
+++ b/eclass/python-single-r1.eclass
@@ -55,7 +55,7 @@ case "${EAPI:-0}" in
 			die "Unsupported EAPI=${EAPI:-4} (too old, allowed only on restricted set of packages) for ${ECLASS}"
 		fi
 		;;
-	5)
+	5|6)
 		# EAPI=5 is required for sane USE_EXPAND dependencies
 		;;
 	*)

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

[Michał Górny]

commit:     7b0073ba05a0e6f4e56eab3f53c0d3286e871884
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:26:08 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 07:26:48 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b0073ba

multibuild.eclass: Enable EAPI 6

 eclass/multibuild.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass
index 0bdbed1..d21008c 100644
--- a/eclass/multibuild.eclass
+++ b/eclass/multibuild.eclass
@@ -17,7 +17,7 @@ case "${EAPI:-0}" in
 	0|1|2|3)
 		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
 		;;
-	4|5)
+	4|5|6)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"

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

[Michał Górny]

commit:     ba4709d4b14af0fd7b9c156cae82f0074a84224a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:31:10 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 07:26:31 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba4709d4

python-utils-r1.eclass: Remove unneeded multilib inherit in EAPI 6

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index d8ced41..59e8799 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -33,8 +33,8 @@ fi
 
 if [[ ! ${_PYTHON_UTILS_R1} ]]; then
 
-[[ ${EAPI:-0} == [012345] ]] && inherit eutils
-inherit multilib toolchain-funcs
+[[ ${EAPI:-0} == [012345] ]] && inherit eutils multilib
+inherit toolchain-funcs
 
 # @ECLASS-VARIABLE: _PYTHON_ALL_IMPLS
 # @INTERNAL

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

[Michał Górny]

commit:     e90dea27ed346a4b24079d9dcc56e79a1fcd4b71
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:11:24 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 07:26:40 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e90dea27

python-any-r1.eclass: Enable EAPI=6, no changes needed

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

diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
index c00cc3a..b6c2258 100644
--- a/eclass/python-any-r1.eclass
+++ b/eclass/python-any-r1.eclass
@@ -37,8 +37,7 @@
 # https://wiki.gentoo.org/wiki/Project:Python/python-any-r1
 
 case "${EAPI:-0}" in
-	0|1|2|3|4|5)
-		# EAPI=4 needed by python-r1
+	0|1|2|3|4|5|6)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"

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

[Michał Górny]

commit:     05a3442f4bf605f1b6226e983ff140c437905c38
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:28:48 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 07:26:56 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05a3442f

python-r1.eclass: Fix missing explicit eutils inherit for EAPI < 6

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

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index de83bb5..92fa5de 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -63,6 +63,7 @@ elif [[ ${_PYTHON_ANY_R1} ]]; then
 	die 'python-r1.eclass can not be used with python-any-r1.eclass.'
 fi
 
+[[ ${EAPI} == [45] ]] && inherit eutils
 inherit multibuild python-utils-r1
 
 # @ECLASS-VARIABLE: PYTHON_COMPAT

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

[Michał Górny]

commit:     b56143528c279c8d6eeed4b14c174a3507036b7e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:27:52 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 07:26:53 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5614352

python-r1.eclass: Ban python_export_best in EAPI 6

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

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 1531442..de83bb5 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -603,6 +603,8 @@ python_setup() {
 python_export_best() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}"
+
 	eqawarn "python_export_best() is deprecated. Please use python_setup instead,"
 	eqawarn "combined with python_export if necessary."
 

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

[Michał Górny]

commit:     d64edf6ed2549ec5f28ea19c96813a417c16cd81
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:20:59 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 07:26:45 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d64edf6e

multibuild.eclass: Ban multibuild_parallel_foreach_variant in EAPI 6

 eclass/multibuild.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass
index 3115ac9..0bdbed1 100644
--- a/eclass/multibuild.eclass
+++ b/eclass/multibuild.eclass
@@ -146,6 +146,8 @@ multibuild_foreach_variant() {
 multibuild_parallel_foreach_variant() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}"
+
 	multibuild_foreach_variant "${@}"
 }
 

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

[Michał Górny]

commit:     317c3157ec6aa4eb73b0228b8cd44234a099c362
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:44:27 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 07:26:34 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=317c3157

python-utils-r1.eclass: Support nonfatal in python_do* and python_new*

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 59e8799..5f95f6a 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -666,6 +666,8 @@ python_newexe() {
 	if [[ ${EAPI:-0} == [01234] ]]; then
 		die "python_do* and python_new* helpers are banned in EAPIs older than 5."
 	fi
+	local die_args=()
+	[[ ${EAPI} != [012345] ]] && die_args+=( -n )
 
 	local wrapd=${python_scriptroot:-${DESTTREE}/bin}
 
@@ -679,12 +681,12 @@ python_newexe() {
 	(
 		dodir "${wrapd}"
 		exeinto "${d}"
-		newexe "${f}" "${newfn}" || die
+		newexe "${f}" "${newfn}" || return ${?}
 	)
 
 	# install the wrapper
 	_python_ln_rel "${ED%/}"/usr/lib/python-exec/python-exec2 \
-		"${ED%/}/${wrapd}/${newfn}" || die
+		"${ED%/}/${wrapd}/${newfn}" || die "${die_args[@]}" || return ${?}
 
 	# don't use this at home, just call python_doscript() instead
 	if [[ ${_PYTHON_REWRITE_SHEBANG} ]]; then
@@ -811,7 +813,7 @@ python_domodule() {
 
 	(
 		insinto "${d}"
-		doins -r "${@}" || die
+		doins -r "${@}" || return ${?}
 	)
 
 	python_optimize "${ED}/${d}"
@@ -845,7 +847,7 @@ python_doheader() {
 
 	(
 		insinto "${d}"
-		doins -r "${@}" || die
+		doins -r "${@}" || return ${?}
 	)
 }
 

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

[Michał Górny]

commit:     dab12f2039adbbeeaa793e01f6586be3df2f8bf4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:31:41 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 07:26:37 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dab12f20

python-utils-r1.eclass: Enable EAPI 6

 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 5f95f6a..c0a6024 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -20,7 +20,7 @@
 # https://wiki.gentoo.org/wiki/Project:Python/python-utils-r1
 
 case "${EAPI:-0}" in
-	0|1|2|3|4|5)
+	0|1|2|3|4|5|6)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"

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

[Michał Górny]

commit:     85dc4b95805a6558e9e0da7f5518383cd8a64bf0
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:27:15 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 07:26:51 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85dc4b95

python-r1.eclass: Ban python_parallel_foreach_impl in EAPI 6

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

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index d3b4f1d..1531442 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -526,6 +526,8 @@ python_foreach_impl() {
 python_parallel_foreach_impl() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}"
+
 	if [[ ! ${_PYTHON_PARALLEL_WARNED} ]]; then
 		eqawarn "python_parallel_foreach_impl() is no longer meaningful. All runs"
 		eqawarn "are non-parallel now. Please replace the call with python_foreach_impl."

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

[Michał Górny]

commit:     e1ee7ff20f440e967aace403f8a8ed5456bcf657
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:41:51 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 07:27:01 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1ee7ff2

distutils-r1.eclass: esetup.py, respect nonfatal in EAPI 6

 eclass/distutils-r1.eclass | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 185dd4f..256c893 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -236,10 +236,13 @@ fi
 esetup.py() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	local die_args=()
+	[[ ${EAPI} != [45] ]] && die_args+=( -n )
+
 	set -- "${PYTHON:-python}" setup.py "${mydistutilsargs[@]}" "${@}"
 
 	echo "${@}" >&2
-	"${@}" || die
+	"${@}" || die "${die_args[@]}" || return ${?}
 }
 
 # @FUNCTION: distutils_install_for_testing

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

[Michał Górny]

commit:     7af6bbcd54d22311bbb11e9c74ffea319a7a7522
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:29:15 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 07:26:59 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7af6bbcd

python-r1.eclass: Enable EAPI 6

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

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 92fa5de..91f0436 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -47,7 +47,7 @@ case "${EAPI:-0}" in
 			die "Unsupported EAPI=${EAPI:-4} (too old, allowed only on restricted set of packages) for ${ECLASS}"
 		fi
 		;;
-	5)
+	5|6)
 		# EAPI=5 is required for sane USE_EXPAND dependencies
 		;;
 	*)

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

[Michał Górny]

commit:     e13b0e340aa33b8faae8e48287e263a029b84e81
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:44:54 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 07:27:04 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e13b0e34

distutils-r1.eclass: Use default_src_prepare to apply patches in EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 256c893..f9cff5c 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -312,9 +312,12 @@ _distutils-r1_disable_ez_setup() {
 distutils-r1_python_prepare_all() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	[[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
-
-	epatch_user
+	if [[ ${EAPI} != [45] ]]; then
+		default
+	else
+		[[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
+		epatch_user
+	fi
 
 	# by default, use in-source build if python_prepare() is used
 	if [[ ! ${DISTUTILS_IN_SOURCE_BUILD+1} ]]; then

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

[Michał Górny]

commit:     18b97682077d5e15655381d693af364910f5b63b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:50:57 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 07:27:07 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18b97682

distutils-r1.eclass: Ban no-op default phase implementations in EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index f9cff5c..47b09b0 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -343,7 +343,7 @@ distutils-r1_python_prepare_all() {
 distutils-r1_python_prepare() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	:
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI 6 (it was a no-op)"
 }
 
 # @FUNCTION: distutils-r1_python_configure
@@ -352,7 +352,7 @@ distutils-r1_python_prepare() {
 distutils-r1_python_configure() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	:
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI 6 (it was a no-op)"
 }
 
 # @FUNCTION: _distutils-r1_create_setup_cfg

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

[Michał Górny]

commit:     5a42761ebce1afddac5fb657cf7992960c16d511
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 22:02:59 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 07:27:23 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a42761e

distutils-r1.eclass: Enable EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 7cb37c8..a2356f4 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -47,7 +47,7 @@ case "${EAPI:-0}" in
 	0|1|2|3)
 		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
 		;;
-	4|5)
+	4|5|6)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"

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

[Michał Górny]

commit:     6d84e78d0435aa8608e7bc9683256bfb2e84efab
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:50:57 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 07:27:10 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d84e78d

distutils-r1.eclass: Make pypy/share QA error fatal in EAPI 6

 eclass/distutils-r1.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 47b09b0..e632202 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -563,7 +563,9 @@ distutils-r1_python_install() {
 		fi
 	done
 	if [[ -d ${root}/usr/$(get_libdir)/pypy/share ]]; then
-		eqawarn "Package installs 'share' in PyPy prefix, see bug #465546."
+		local cmd=die
+		[[ ${EAPI} == [45] ]] && cmd=eqawarn
+		"${cmd}" "Package installs 'share' in PyPy prefix, see bug #465546."
 	fi
 
 	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then

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

[Michał Górny]

commit:     4b8dc1be48f7dccc79b0fbcc8d8ebc879ac61ef4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 22:02:39 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 07:27:20 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b8dc1be

distutils-r1.eclass: Remove unnecessary eutils inherit in EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 1f0b74a..7cb37c8 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -79,7 +79,8 @@ esac
 
 if [[ ! ${_DISTUTILS_R1} ]]; then
 
-inherit eutils toolchain-funcs
+[[ ${EAPI} == [45] ]] && inherit eutils
+inherit toolchain-funcs
 
 if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
 	inherit multiprocessing python-r1

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

[Michał Górny]

commit:     a0770973dac5f99d4e9cc504dc147a6b5fa2e280
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:58:19 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 07:27:15 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0770973

distutils-r1.eclass: Ban DISTUTILS_NO_PARALLEL_BUILD in EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index e55e2e4..6054f27 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -691,6 +691,8 @@ _distutils-r1_run_foreach_impl() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	if [[ ${DISTUTILS_NO_PARALLEL_BUILD} ]]; then
+		[[ ${EAPI} == [45] ]] || die "DISTUTILS_NO_PARALLEL_BUILD is banned in EAPI ${EAPI}"
+
 		eqawarn "DISTUTILS_NO_PARALLEL_BUILD is no longer meaningful. Now all builds"
 		eqawarn "are non-parallel. Please remove it from the ebuild."
 

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

[Michał Górny]

commit:     96d6f6f7a67bb37d2a4723e62d6540f7fa1cebd1
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:57:04 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 07:27:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96d6f6f7

distutils-r1.eclass: Ban EXAMPLES in EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index e632202..e55e2e4 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -583,6 +583,8 @@ distutils-r1_python_install_all() {
 	einstalldocs
 
 	if declare -p EXAMPLES &>/dev/null; then
+		[[ ${EAPI} == [45] ]] && die "EXAMPLES are banned in EAPI ${EAPI}"
+
 		local INSDESTTREE=/usr/share/doc/${PF}/examples
 		doins -r "${EXAMPLES[@]}"
 		docompress -x "${INSDESTTREE}"

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

[Michał Górny]

commit:     7431ca5a740be5403a5b9ceede89a29258079621
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 22:00:48 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 07:27:18 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7431ca5a

distutils-r1.eclass: Make default _all impl call warning fatal in EAPI 6

 eclass/distutils-r1.eclass | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 6054f27..1f0b74a 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -729,7 +729,10 @@ distutils-r1_src_prepare() {
 	fi
 
 	if [[ ! ${_DISTUTILS_DEFAULT_CALLED} ]]; then
-		eqawarn "QA warning: python_prepare_all() didn't call distutils-r1_python_prepare_all"
+		local cmd=die
+		[[ ${EAPI} == [45] ]] && cmd=eqawarn
+
+		"${cmd}" "QA: python_prepare_all() didn't call distutils-r1_python_prepare_all"
 	fi
 
 	if declare -f python_prepare >/dev/null; then
@@ -800,7 +803,10 @@ distutils-r1_src_install() {
 	fi
 
 	if [[ ! ${_DISTUTILS_DEFAULT_CALLED} ]]; then
-		eqawarn "QA warning: python_install_all() didn't call distutils-r1_python_install_all"
+		local cmd=die
+		[[ ${EAPI} == [45] ]] && cmd=eqawarn
+
+		"${cmd}" "QA: python_install_all() didn't call distutils-r1_python_install_all"
 	fi
 }
 

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

[Michał Górny]

commit:     b3bbaca3a237972002c260e8e05795ea0ed9bf9e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:41:29 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 15:13:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3bbaca3

python-utils-r1.eclass: Ban installation helpers in EAPIs < 5

Ban python_do* and python_new* helpers in EAPIs older than 5. We should
ban them in python-any-r1 uses, actually but that would break
dev-python/pypy* ebuilds as they are written now.

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index e690e09..99ee58b 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -662,6 +662,9 @@ python_newexe() {
 
 	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
 	[[ ${#} -eq 2 ]] || die "Usage: ${FUNCNAME} <path> <new-name>"
+	if [[ ${EAPI:-0} == [01234] ]]; then
+		die "python_do* and python_new* helpers are banned in EAPIs older than 5."
+	fi
 
 	local wrapd=${python_scriptroot:-${DESTTREE}/bin}
 
@@ -789,6 +792,9 @@ python_domodule() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
+	if [[ ${EAPI:-0} == [01234] ]]; then
+		die "python_do* and python_new* helpers are banned in EAPIs older than 5."
+	fi
 
 	local d
 	if [[ ${python_moduleroot} == /* ]]; then
@@ -827,6 +833,9 @@ python_doheader() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
+	if [[ ${EAPI:-0} == [01234] ]]; then
+		die "python_do* and python_new* helpers are banned in EAPIs older than 5."
+	fi
 
 	local d PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR}
 	[[ ${PYTHON_INCLUDEDIR} ]] || python_export PYTHON_INCLUDEDIR

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

[Michał Górny]

commit:     e83ed08084dc05990ad6e0b62252b1423e82c214
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:31:41 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 15:13:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e83ed080

python-utils-r1.eclass: Enable EAPI 6

 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 7617c3f..e2bf667 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -20,7 +20,7 @@
 # https://wiki.gentoo.org/wiki/Project:Python/python-utils-r1
 
 case "${EAPI:-0}" in
-	0|1|2|3|4|5)
+	0|1|2|3|4|5|6)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"

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

[Michał Górny]

commit:     3564e31812b95ffb7437eaa630b999437fab77a9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:30:10 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 15:13:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3564e318

python-utils-r1.eclass: Make python_fix_shebang QAwarns fatal in EAPI 6

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 99ee58b..d8ced41 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -33,7 +33,8 @@ fi
 
 if [[ ! ${_PYTHON_UTILS_R1} ]]; then
 
-inherit eutils multilib toolchain-funcs
+[[ ${EAPI:-0} == [012345] ]] && inherit eutils
+inherit multilib toolchain-funcs
 
 # @ECLASS-VARIABLE: _PYTHON_ALL_IMPLS
 # @INTERNAL
@@ -1137,12 +1138,17 @@ python_fix_shebang() {
 		done < <(find "${path}" -type f -print0 || die)
 
 		if [[ ! ${any_fixed} ]]; then
-			eqawarn "QA warning: ${FUNCNAME}, ${path#${D}} did not match any fixable files."
+			local cmd=eerror
+			[[ ${EAPI:-0} == [012345] ]] && cmd=eqawarn
+
+			"${cmd}" "QA warning: ${FUNCNAME}, ${path#${D}} did not match any fixable files."
 			if [[ ${any_correct} ]]; then
-				eqawarn "All files have ${EPYTHON} shebang already."
+				"${cmd}" "All files have ${EPYTHON} shebang already."
 			else
-				eqawarn "There are no Python files in specified directory."
+				"${cmd}" "There are no Python files in specified directory."
 			fi
+
+			[[ ${cmd} == eerror ]] && die "${FUNCNAME} did not match any fixable files (QA warning fatal in EAPI ${EAPI})"
 		fi
 	done
 }

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

[Michał Górny]

commit:     0726ae32264084f4bd49508f20674ebbff0c3ee8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 18:44:22 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 15:13:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0726ae32

python-utils-r1.eclass: Replace local INSDESTTREE with subshells

Replace the 'local INSDESTTREE' hacks (which are PMS-valid yet
deprecated) with safer subshells.

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 9f3c750..e690e09 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -802,10 +802,10 @@ python_domodule() {
 		d=${PYTHON_SITEDIR#${EPREFIX}}/${python_moduleroot}
 	fi
 
-	local INSDESTTREE
-
-	insinto "${d}"
-	doins -r "${@}" || die
+	(
+		insinto "${d}"
+		doins -r "${@}" || die
+	)
 
 	python_optimize "${ED}/${d}"
 }
@@ -833,10 +833,10 @@ python_doheader() {
 
 	d=${PYTHON_INCLUDEDIR#${EPREFIX}}
 
-	local INSDESTTREE
-
-	insinto "${d}"
-	doins -r "${@}" || die
+	(
+		insinto "${d}"
+		doins -r "${@}" || die
+	)
 }
 
 # @FUNCTION: python_wrapper_setup

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

[Michał Górny]

commit:     167c58c1e639a681c1ab39afd6363cd8a5585000
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 18:31:40 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 15:13:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=167c58c1

python-utils-r1.eclass: Remove py2.6 note from python_optimize

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 201b0c4..9f3c750 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -564,9 +564,6 @@ python_optimize() {
 	local PYTHON=${PYTHON}
 	[[ ${PYTHON} ]] || python_export PYTHON
 
-	# Note: python2.6 can't handle passing files to compileall...
-	# TODO: we do not support 2.6 any longer
-
 	# default to sys.path
 	if [[ ${#} -eq 0 ]]; then
 		local f

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

[Michał Górny]

commit:     d795bc14e62efbebf648a89890f4461c9a3a9d5a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:31:10 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 15:13:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d795bc14

python-utils-r1.eclass: Remove unneeded multilib inherit in EAPI 6

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index d8ced41..59e8799 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -33,8 +33,8 @@ fi
 
 if [[ ! ${_PYTHON_UTILS_R1} ]]; then
 
-[[ ${EAPI:-0} == [012345] ]] && inherit eutils
-inherit multilib toolchain-funcs
+[[ ${EAPI:-0} == [012345] ]] && inherit eutils multilib
+inherit toolchain-funcs
 
 # @ECLASS-VARIABLE: _PYTHON_ALL_IMPLS
 # @INTERNAL

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

[Michał Górny]

commit:     40a95dd1aa272f1e9b5c27c53e847cdc8237f1c6
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:45:05 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 15:13:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40a95dd1

python-utils-r1.eclass: Add missing ||die on file read

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 0a04e12..201b0c4 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -1038,12 +1038,12 @@ python_fix_shebang() {
 			local shebang i
 			local error= from=
 
-			IFS= read -r shebang <"${f}"
+			IFS= read -r shebang <"${f}" || die
 
 			# First, check if it's shebang at all...
 			if [[ ${shebang} == '#!'* ]]; then
 				local split_shebang=()
-				read -r -a split_shebang <<<${shebang}
+				read -r -a split_shebang <<<${shebang} || die
 
 				# Match left-to-right in a loop, to avoid matching random
 				# repetitions like 'python2.7 python2'.

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

[Michał Górny]

commit:     3173b136e378af0324ece7d1173e3fdc434d67fc
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:44:27 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 15:13:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3173b136

python-utils-r1.eclass: Support nonfatal in python_do* and python_new*

 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 59e8799..7617c3f 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -679,7 +679,7 @@ python_newexe() {
 	(
 		dodir "${wrapd}"
 		exeinto "${d}"
-		newexe "${f}" "${newfn}" || die
+		newexe "${f}" "${newfn}" || return ${?}
 	)
 
 	# install the wrapper
@@ -811,7 +811,7 @@ python_domodule() {
 
 	(
 		insinto "${d}"
-		doins -r "${@}" || die
+		doins -r "${@}" || return ${?}
 	)
 
 	python_optimize "${ED}/${d}"
@@ -845,7 +845,7 @@ python_doheader() {
 
 	(
 		insinto "${d}"
-		doins -r "${@}" || die
+		doins -r "${@}" || return ${?}
 	)
 }
 

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

[Michał Górny]

commit:     bdeea8295f3be5a545fe13242d4676502ae9264e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:29:15 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 15:13:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdeea829

python-r1.eclass: Enable EAPI 6

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

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 92fa5de..91f0436 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -47,7 +47,7 @@ case "${EAPI:-0}" in
 			die "Unsupported EAPI=${EAPI:-4} (too old, allowed only on restricted set of packages) for ${ECLASS}"
 		fi
 		;;
-	5)
+	5|6)
 		# EAPI=5 is required for sane USE_EXPAND dependencies
 		;;
 	*)

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

[Michał Górny]

commit:     fbbe7f2bba80d7fd12b2597b1bc14733661841bf
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:27:52 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 15:13:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbbe7f2b

python-r1.eclass: Ban python_export_best in EAPI 6

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

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 1531442..de83bb5 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -603,6 +603,8 @@ python_setup() {
 python_export_best() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}"
+
 	eqawarn "python_export_best() is deprecated. Please use python_setup instead,"
 	eqawarn "combined with python_export if necessary."
 

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

[Michał Górny]

commit:     c6d5afe5a88f3f5e0ef56bb0810a98391c8f75d8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:57:04 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 15:13:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6d5afe5

distutils-r1.eclass: Ban EXAMPLES in EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index e632202..e55e2e4 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -583,6 +583,8 @@ distutils-r1_python_install_all() {
 	einstalldocs
 
 	if declare -p EXAMPLES &>/dev/null; then
+		[[ ${EAPI} == [45] ]] && die "EXAMPLES are banned in EAPI ${EAPI}"
+
 		local INSDESTTREE=/usr/share/doc/${PF}/examples
 		doins -r "${EXAMPLES[@]}"
 		docompress -x "${INSDESTTREE}"

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

[Michał Górny]

commit:     675316b758b2bfd4f871a3cc77b900ade506ba4d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:12:38 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 15:13:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=675316b7

python-single-r1.eclass: Enable EAPI=6, no changes needed

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

diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
index 1c27285..d9fc34b 100644
--- a/eclass/python-single-r1.eclass
+++ b/eclass/python-single-r1.eclass
@@ -55,7 +55,7 @@ case "${EAPI:-0}" in
 			die "Unsupported EAPI=${EAPI:-4} (too old, allowed only on restricted set of packages) for ${ECLASS}"
 		fi
 		;;
-	5)
+	5|6)
 		# EAPI=5 is required for sane USE_EXPAND dependencies
 		;;
 	*)

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

[Michał Górny]

commit:     e40ec089b23aa10ff0ff0c802a8995855d03e360
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:44:54 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 15:13:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e40ec089

distutils-r1.eclass: Use default_src_prepare to apply patches in EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 256c893..f9cff5c 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -312,9 +312,12 @@ _distutils-r1_disable_ez_setup() {
 distutils-r1_python_prepare_all() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	[[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
-
-	epatch_user
+	if [[ ${EAPI} != [45] ]]; then
+		default
+	else
+		[[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
+		epatch_user
+	fi
 
 	# by default, use in-source build if python_prepare() is used
 	if [[ ! ${DISTUTILS_IN_SOURCE_BUILD+1} ]]; then

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

[Michał Górny]

commit:     493fd4c6db6e10ca9679ef24258c206762de5dd8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:50:57 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 15:13:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=493fd4c6

distutils-r1.eclass: Ban no-op default phase implementations in EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index f9cff5c..47b09b0 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -343,7 +343,7 @@ distutils-r1_python_prepare_all() {
 distutils-r1_python_prepare() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	:
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI 6 (it was a no-op)"
 }
 
 # @FUNCTION: distutils-r1_python_configure
@@ -352,7 +352,7 @@ distutils-r1_python_prepare() {
 distutils-r1_python_configure() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	:
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI 6 (it was a no-op)"
 }
 
 # @FUNCTION: _distutils-r1_create_setup_cfg

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

[Michał Górny]

commit:     0af4f69c76dc81fe103f5d8f55ed4b42c0ed99d3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:26:08 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 15:13:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0af4f69c

multibuild.eclass: Enable EAPI 6

 eclass/multibuild.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass
index 0bdbed1..d21008c 100644
--- a/eclass/multibuild.eclass
+++ b/eclass/multibuild.eclass
@@ -17,7 +17,7 @@ case "${EAPI:-0}" in
 	0|1|2|3)
 		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
 		;;
-	4|5)
+	4|5|6)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"

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

[Michał Górny]

commit:     cf206d721023ade87564e808a89f1e900e05ad40
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:41:51 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 15:13:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf206d72

distutils-r1.eclass: esetup.py, respect nonfatal in EAPI 6

 eclass/distutils-r1.eclass | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 185dd4f..256c893 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -236,10 +236,13 @@ fi
 esetup.py() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	local die_args=()
+	[[ ${EAPI} != [45] ]] && die_args+=( -n )
+
 	set -- "${PYTHON:-python}" setup.py "${mydistutilsargs[@]}" "${@}"
 
 	echo "${@}" >&2
-	"${@}" || die
+	"${@}" || die "${die_args[@]}" || return ${?}
 }
 
 # @FUNCTION: distutils_install_for_testing

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

[Michał Górny]

commit:     2b31aa8af088d9e375a831fcf0b7d3eea2373185
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:28:48 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 15:13:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b31aa8a

python-r1.eclass: Fix missing explicit eutils inherit for EAPI < 6

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

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index de83bb5..92fa5de 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -63,6 +63,7 @@ elif [[ ${_PYTHON_ANY_R1} ]]; then
 	die 'python-r1.eclass can not be used with python-any-r1.eclass.'
 fi
 
+[[ ${EAPI} == [45] ]] && inherit eutils
 inherit multibuild python-utils-r1
 
 # @ECLASS-VARIABLE: PYTHON_COMPAT

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

[Michał Górny]

commit:     ad0661da62efab01660d2fe65114671007c2f4e8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:50:57 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 15:13:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad0661da

distutils-r1.eclass: Make pypy/share QA error fatal in EAPI 6

 eclass/distutils-r1.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 47b09b0..e632202 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -563,7 +563,9 @@ distutils-r1_python_install() {
 		fi
 	done
 	if [[ -d ${root}/usr/$(get_libdir)/pypy/share ]]; then
-		eqawarn "Package installs 'share' in PyPy prefix, see bug #465546."
+		local cmd=die
+		[[ ${EAPI} == [45] ]] && cmd=eqawarn
+		"${cmd}" "Package installs 'share' in PyPy prefix, see bug #465546."
 	fi
 
 	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then

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

[Michał Górny]

commit:     317c08840382de6f2262b6560254171c97e3ee7e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:20:59 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 15:13:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=317c0884

multibuild.eclass: Ban multibuild_parallel_foreach_variant in EAPI 6

 eclass/multibuild.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass
index 3115ac9..0bdbed1 100644
--- a/eclass/multibuild.eclass
+++ b/eclass/multibuild.eclass
@@ -146,6 +146,8 @@ multibuild_foreach_variant() {
 multibuild_parallel_foreach_variant() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}"
+
 	multibuild_foreach_variant "${@}"
 }
 

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

[Michał Górny]

commit:     713c8b6128773b3a7d2e512c75764b2280e67a23
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:27:15 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 15:13:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=713c8b61

python-r1.eclass: Ban python_parallel_foreach_impl in EAPI 6

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

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index d3b4f1d..1531442 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -526,6 +526,8 @@ python_foreach_impl() {
 python_parallel_foreach_impl() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}"
+
 	if [[ ! ${_PYTHON_PARALLEL_WARNED} ]]; then
 		eqawarn "python_parallel_foreach_impl() is no longer meaningful. All runs"
 		eqawarn "are non-parallel now. Please replace the call with python_foreach_impl."

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

[Michał Górny]

commit:     986cec33e47a9a7b7b6ea030380cf5599e7ef33a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:11:24 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 15:13:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=986cec33

python-any-r1.eclass: Enable EAPI=6, no changes needed

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

diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
index c00cc3a..b6c2258 100644
--- a/eclass/python-any-r1.eclass
+++ b/eclass/python-any-r1.eclass
@@ -37,8 +37,7 @@
 # https://wiki.gentoo.org/wiki/Project:Python/python-any-r1
 
 case "${EAPI:-0}" in
-	0|1|2|3|4|5)
-		# EAPI=4 needed by python-r1
+	0|1|2|3|4|5|6)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"

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

[Michał Górny]

commit:     c2823a1925c231779003dd55032747feda662ad2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:58:19 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 15:13:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2823a19

distutils-r1.eclass: Ban DISTUTILS_NO_PARALLEL_BUILD in EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index e55e2e4..6054f27 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -691,6 +691,8 @@ _distutils-r1_run_foreach_impl() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	if [[ ${DISTUTILS_NO_PARALLEL_BUILD} ]]; then
+		[[ ${EAPI} == [45] ]] || die "DISTUTILS_NO_PARALLEL_BUILD is banned in EAPI ${EAPI}"
+
 		eqawarn "DISTUTILS_NO_PARALLEL_BUILD is no longer meaningful. Now all builds"
 		eqawarn "are non-parallel. Please remove it from the ebuild."
 

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

[Michał Górny]

commit:     138a38b94b28c4e1f06949fe3ce3d780be6f237a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 22:00:48 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 15:13:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=138a38b9

distutils-r1.eclass: Make default _all impl call warning fatal in EAPI 6

 eclass/distutils-r1.eclass | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 6054f27..1f0b74a 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -729,7 +729,10 @@ distutils-r1_src_prepare() {
 	fi
 
 	if [[ ! ${_DISTUTILS_DEFAULT_CALLED} ]]; then
-		eqawarn "QA warning: python_prepare_all() didn't call distutils-r1_python_prepare_all"
+		local cmd=die
+		[[ ${EAPI} == [45] ]] && cmd=eqawarn
+
+		"${cmd}" "QA: python_prepare_all() didn't call distutils-r1_python_prepare_all"
 	fi
 
 	if declare -f python_prepare >/dev/null; then
@@ -800,7 +803,10 @@ distutils-r1_src_install() {
 	fi
 
 	if [[ ! ${_DISTUTILS_DEFAULT_CALLED} ]]; then
-		eqawarn "QA warning: python_install_all() didn't call distutils-r1_python_install_all"
+		local cmd=die
+		[[ ${EAPI} == [45] ]] && cmd=eqawarn
+
+		"${cmd}" "QA: python_install_all() didn't call distutils-r1_python_install_all"
 	fi
 }
 

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

[Michał Górny]

commit:     ba87c01358404ccb7be676c41d41b703f5fa6e9e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 22:02:39 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 15:13:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba87c013

distutils-r1.eclass: Remove unnecessary eutils inherit in EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 1f0b74a..7cb37c8 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -79,7 +79,8 @@ esac
 
 if [[ ! ${_DISTUTILS_R1} ]]; then
 
-inherit eutils toolchain-funcs
+[[ ${EAPI} == [45] ]] && inherit eutils
+inherit toolchain-funcs
 
 if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
 	inherit multiprocessing python-r1

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

[Michał Górny]

commit:     601e667a8dbd45670d213169b9e1bd7f4f000793
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 22:02:59 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 15:13:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=601e667a

distutils-r1.eclass: Enable EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 7cb37c8..a2356f4 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -47,7 +47,7 @@ case "${EAPI:-0}" in
 	0|1|2|3)
 		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
 		;;
-	4|5)
+	4|5|6)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"

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

[Michał Górny]

commit:     a41f45b4de0af08f23a3e0a05d25f695c7e766b3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 15:21:40 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 15:21:40 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a41f45b4

python-utils-r1.eclass: Make heredocs consistent

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index e2bf667..815dbae 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -933,11 +933,11 @@ python_wrapper_setup() {
 
 		local x
 		for x in "${nonsupp[@]}"; do
-			cat >"${workdir}"/bin/${x} <<__EOF__ || die
-#!/bin/sh
-echo "${x} is not supported by ${EPYTHON}" >&2
-exit 127
-__EOF__
+			cat >"${workdir}"/bin/${x} <<-_EOF_ || die
+				#!/bin/sh
+				echo "${x} is not supported by ${EPYTHON}" >&2
+				exit 127
+_EOF_
 			chmod +x "${workdir}"/bin/${x} || die
 		done
 

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

[Michał Górny]

commit:     b5adab3fadc609b2d3b204c8fd419d6853458bc4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 15:25:49 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 15:25:49 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5adab3f

python-utils-r1.eclass: Move ||die out of command substitution subshells

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 815dbae..6eeba31 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -281,12 +281,14 @@ python_export() {
 				# sysconfig can't be used because:
 				# 1) pypy doesn't give site-packages but stdlib
 				# 2) jython gives paths with wrong case
-				export PYTHON_SITEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_lib())' || die)
+				PYTHON_SITEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_lib())') || die
+				export PYTHON_SITEDIR
 				debug-print "${FUNCNAME}: PYTHON_SITEDIR = ${PYTHON_SITEDIR}"
 				;;
 			PYTHON_INCLUDEDIR)
 				[[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it"
-				export PYTHON_INCLUDEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())' || die)
+				PYTHON_INCLUDEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())') || die
+				export PYTHON_INCLUDEDIR
 				debug-print "${FUNCNAME}: PYTHON_INCLUDEDIR = ${PYTHON_INCLUDEDIR}"
 
 				# Jython gives a non-existing directory
@@ -296,7 +298,8 @@ python_export() {
 				;;
 			PYTHON_LIBPATH)
 				[[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it"
-				export PYTHON_LIBPATH=$("${PYTHON}" -c 'import os.path, sysconfig; print(os.path.join(sysconfig.get_config_var("LIBDIR"), sysconfig.get_config_var("LDLIBRARY")) if sysconfig.get_config_var("LDLIBRARY") else "")' || die)
+				PYTHON_LIBPATH=$("${PYTHON}" -c 'import os.path, sysconfig; print(os.path.join(sysconfig.get_config_var("LIBDIR"), sysconfig.get_config_var("LDLIBRARY")) if sysconfig.get_config_var("LDLIBRARY") else "")') || die
+				export PYTHON_LIBPATH
 				debug-print "${FUNCNAME}: PYTHON_LIBPATH = ${PYTHON_LIBPATH}"
 
 				if [[ ! ${PYTHON_LIBPATH} ]]; then
@@ -309,7 +312,7 @@ python_export() {
 				case "${impl}" in
 					python*)
 						# python-2.7, python-3.2, etc.
-						val=$($(tc-getPKG_CONFIG) --cflags ${impl/n/n-} || die)
+						val=$($(tc-getPKG_CONFIG) --cflags ${impl/n/n-}) || die
 						;;
 					*)
 						die "${impl}: obtaining ${var} not supported"
@@ -325,7 +328,7 @@ python_export() {
 				case "${impl}" in
 					python*)
 						# python-2.7, python-3.2, etc.
-						val=$($(tc-getPKG_CONFIG) --libs ${impl/n/n-} || die)
+						val=$($(tc-getPKG_CONFIG) --libs ${impl/n/n-}) || die
 						;;
 					*)
 						die "${impl}: obtaining ${var} not supported"
@@ -341,7 +344,7 @@ python_export() {
 				case "${impl}" in
 					python*)
 						[[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it"
-						flags=$("${PYTHON}" -c 'import sysconfig; print(sysconfig.get_config_var("ABIFLAGS") or "")' || die)
+						flags=$("${PYTHON}" -c 'import sysconfig; print(sysconfig.get_config_var("ABIFLAGS") or "")') || die
 						val=${PYTHON}${flags}-config
 						;;
 					*)

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

[Michał Górny]

commit:     7c84209d2bbac3a4335eb98fe76b0762c8f86916
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:11:24 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 09:00:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c84209d

python-any-r1.eclass: Enable EAPI=6, no changes needed

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

diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
index c00cc3a..b6c2258 100644
--- a/eclass/python-any-r1.eclass
+++ b/eclass/python-any-r1.eclass
@@ -37,8 +37,7 @@
 # https://wiki.gentoo.org/wiki/Project:Python/python-any-r1
 
 case "${EAPI:-0}" in
-	0|1|2|3|4|5)
-		# EAPI=4 needed by python-r1
+	0|1|2|3|4|5|6)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"

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

[Michał Górny]

commit:     f3ea861ecd87043988c70e5c56e480e0ce635fdf
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:31:10 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 09:00:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3ea861e

python-utils-r1.eclass: Remove unneeded multilib inherit in EAPI 6

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index d8ced41..59e8799 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -33,8 +33,8 @@ fi
 
 if [[ ! ${_PYTHON_UTILS_R1} ]]; then
 
-[[ ${EAPI:-0} == [012345] ]] && inherit eutils
-inherit multilib toolchain-funcs
+[[ ${EAPI:-0} == [012345] ]] && inherit eutils multilib
+inherit toolchain-funcs
 
 # @ECLASS-VARIABLE: _PYTHON_ALL_IMPLS
 # @INTERNAL

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

[Michał Górny]

commit:     3a4cf33195fdda2a3e08deefb683cbe16e0191d0
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:31:41 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 09:00:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a4cf331

python-utils-r1.eclass: Enable EAPI 6

 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 7617c3f..e2bf667 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -20,7 +20,7 @@
 # https://wiki.gentoo.org/wiki/Project:Python/python-utils-r1
 
 case "${EAPI:-0}" in
-	0|1|2|3|4|5)
+	0|1|2|3|4|5|6)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"

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

[Michał Górny]

commit:     c8a6d4a8a8387cb76a9c8e4b1d38271e3125a9c2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:12:38 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 09:00:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8a6d4a8

python-single-r1.eclass: Enable EAPI=6, no changes needed

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

diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
index 1c27285..d9fc34b 100644
--- a/eclass/python-single-r1.eclass
+++ b/eclass/python-single-r1.eclass
@@ -55,7 +55,7 @@ case "${EAPI:-0}" in
 			die "Unsupported EAPI=${EAPI:-4} (too old, allowed only on restricted set of packages) for ${ECLASS}"
 		fi
 		;;
-	5)
+	5|6)
 		# EAPI=5 is required for sane USE_EXPAND dependencies
 		;;
 	*)

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

[Michał Górny]

commit:     c673a0517e754600145a4e409c72114099f53e76
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:41:29 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 09:00:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c673a051

python-utils-r1.eclass: Ban installation helpers in EAPIs < 5

Ban python_do* and python_new* helpers in EAPIs older than 5. We should
ban them in python-any-r1 uses, actually but that would break
dev-python/pypy* ebuilds as they are written now.

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index e690e09..99ee58b 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -662,6 +662,9 @@ python_newexe() {
 
 	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
 	[[ ${#} -eq 2 ]] || die "Usage: ${FUNCNAME} <path> <new-name>"
+	if [[ ${EAPI:-0} == [01234] ]]; then
+		die "python_do* and python_new* helpers are banned in EAPIs older than 5."
+	fi
 
 	local wrapd=${python_scriptroot:-${DESTTREE}/bin}
 
@@ -789,6 +792,9 @@ python_domodule() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
+	if [[ ${EAPI:-0} == [01234] ]]; then
+		die "python_do* and python_new* helpers are banned in EAPIs older than 5."
+	fi
 
 	local d
 	if [[ ${python_moduleroot} == /* ]]; then
@@ -827,6 +833,9 @@ python_doheader() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
+	if [[ ${EAPI:-0} == [01234] ]]; then
+		die "python_do* and python_new* helpers are banned in EAPIs older than 5."
+	fi
 
 	local d PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR}
 	[[ ${PYTHON_INCLUDEDIR} ]] || python_export PYTHON_INCLUDEDIR

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

[Michał Górny]

commit:     2f64ccec8edb41dd85eea698a52f01ca74901400
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:30:10 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 09:00:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f64ccec

python-utils-r1.eclass: Make python_fix_shebang QAwarns fatal in EAPI 6

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 99ee58b..d8ced41 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -33,7 +33,8 @@ fi
 
 if [[ ! ${_PYTHON_UTILS_R1} ]]; then
 
-inherit eutils multilib toolchain-funcs
+[[ ${EAPI:-0} == [012345] ]] && inherit eutils
+inherit multilib toolchain-funcs
 
 # @ECLASS-VARIABLE: _PYTHON_ALL_IMPLS
 # @INTERNAL
@@ -1137,12 +1138,17 @@ python_fix_shebang() {
 		done < <(find "${path}" -type f -print0 || die)
 
 		if [[ ! ${any_fixed} ]]; then
-			eqawarn "QA warning: ${FUNCNAME}, ${path#${D}} did not match any fixable files."
+			local cmd=eerror
+			[[ ${EAPI:-0} == [012345] ]] && cmd=eqawarn
+
+			"${cmd}" "QA warning: ${FUNCNAME}, ${path#${D}} did not match any fixable files."
 			if [[ ${any_correct} ]]; then
-				eqawarn "All files have ${EPYTHON} shebang already."
+				"${cmd}" "All files have ${EPYTHON} shebang already."
 			else
-				eqawarn "There are no Python files in specified directory."
+				"${cmd}" "There are no Python files in specified directory."
 			fi
+
+			[[ ${cmd} == eerror ]] && die "${FUNCNAME} did not match any fixable files (QA warning fatal in EAPI ${EAPI})"
 		fi
 	done
 }

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

[Michał Górny]

commit:     4b1f68fb1c9911424b4e1174c348f1882809aea8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:44:27 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 09:00:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b1f68fb

python-utils-r1.eclass: Support nonfatal in python_do* and python_new*

 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 59e8799..7617c3f 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -679,7 +679,7 @@ python_newexe() {
 	(
 		dodir "${wrapd}"
 		exeinto "${d}"
-		newexe "${f}" "${newfn}" || die
+		newexe "${f}" "${newfn}" || return ${?}
 	)
 
 	# install the wrapper
@@ -811,7 +811,7 @@ python_domodule() {
 
 	(
 		insinto "${d}"
-		doins -r "${@}" || die
+		doins -r "${@}" || return ${?}
 	)
 
 	python_optimize "${ED}/${d}"
@@ -845,7 +845,7 @@ python_doheader() {
 
 	(
 		insinto "${d}"
-		doins -r "${@}" || die
+		doins -r "${@}" || return ${?}
 	)
 }
 

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

[Michał Górny]

commit:     30c7bb8f7d7efa0c80500ff060872a91fe23bd24
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 22:00:48 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 09:00:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30c7bb8f

distutils-r1.eclass: Make default _all impl call warning fatal in EAPI 6

 eclass/distutils-r1.eclass | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 6054f27..1f0b74a 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -729,7 +729,10 @@ distutils-r1_src_prepare() {
 	fi
 
 	if [[ ! ${_DISTUTILS_DEFAULT_CALLED} ]]; then
-		eqawarn "QA warning: python_prepare_all() didn't call distutils-r1_python_prepare_all"
+		local cmd=die
+		[[ ${EAPI} == [45] ]] && cmd=eqawarn
+
+		"${cmd}" "QA: python_prepare_all() didn't call distutils-r1_python_prepare_all"
 	fi
 
 	if declare -f python_prepare >/dev/null; then
@@ -800,7 +803,10 @@ distutils-r1_src_install() {
 	fi
 
 	if [[ ! ${_DISTUTILS_DEFAULT_CALLED} ]]; then
-		eqawarn "QA warning: python_install_all() didn't call distutils-r1_python_install_all"
+		local cmd=die
+		[[ ${EAPI} == [45] ]] && cmd=eqawarn
+
+		"${cmd}" "QA: python_install_all() didn't call distutils-r1_python_install_all"
 	fi
 }
 

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

[Michał Górny]

commit:     3be3ecade1975e7726b29fac7512c4f309884524
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:57:04 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 09:00:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3be3ecad

distutils-r1.eclass: Ban EXAMPLES in EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index e632202..e55e2e4 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -583,6 +583,8 @@ distutils-r1_python_install_all() {
 	einstalldocs
 
 	if declare -p EXAMPLES &>/dev/null; then
+		[[ ${EAPI} == [45] ]] && die "EXAMPLES are banned in EAPI ${EAPI}"
+
 		local INSDESTTREE=/usr/share/doc/${PF}/examples
 		doins -r "${EXAMPLES[@]}"
 		docompress -x "${INSDESTTREE}"

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

[Michał Górny]

commit:     1a80c4ab4f394ac7f012d031f60a38d2a77629aa
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:50:57 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 09:00:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a80c4ab

distutils-r1.eclass: Ban no-op default phase implementations in EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index f9cff5c..47b09b0 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -343,7 +343,7 @@ distutils-r1_python_prepare_all() {
 distutils-r1_python_prepare() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	:
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI 6 (it was a no-op)"
 }
 
 # @FUNCTION: distutils-r1_python_configure
@@ -352,7 +352,7 @@ distutils-r1_python_prepare() {
 distutils-r1_python_configure() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	:
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI 6 (it was a no-op)"
 }
 
 # @FUNCTION: _distutils-r1_create_setup_cfg

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

[Michał Górny]

commit:     da756fb6a294aef0daacd2917e2fdd388b95d58d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:50:57 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 09:00:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da756fb6

distutils-r1.eclass: Make pypy/share QA error fatal in EAPI 6

 eclass/distutils-r1.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 47b09b0..e632202 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -563,7 +563,9 @@ distutils-r1_python_install() {
 		fi
 	done
 	if [[ -d ${root}/usr/$(get_libdir)/pypy/share ]]; then
-		eqawarn "Package installs 'share' in PyPy prefix, see bug #465546."
+		local cmd=die
+		[[ ${EAPI} == [45] ]] && cmd=eqawarn
+		"${cmd}" "Package installs 'share' in PyPy prefix, see bug #465546."
 	fi
 
 	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then

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

[Michał Górny]

commit:     76930b8649f13c93fd9edef53d304775507aa140
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:27:15 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 09:00:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76930b86

python-r1.eclass: Ban python_parallel_foreach_impl in EAPI 6

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

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index d3b4f1d..1531442 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -526,6 +526,8 @@ python_foreach_impl() {
 python_parallel_foreach_impl() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}"
+
 	if [[ ! ${_PYTHON_PARALLEL_WARNED} ]]; then
 		eqawarn "python_parallel_foreach_impl() is no longer meaningful. All runs"
 		eqawarn "are non-parallel now. Please replace the call with python_foreach_impl."

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

[Michał Górny]

commit:     a9a51b581848e72309f6bf9e77b235273149ffdb
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:27:52 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 09:00:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9a51b58

python-r1.eclass: Ban python_export_best in EAPI 6

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

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 1531442..de83bb5 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -603,6 +603,8 @@ python_setup() {
 python_export_best() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}"
+
 	eqawarn "python_export_best() is deprecated. Please use python_setup instead,"
 	eqawarn "combined with python_export if necessary."
 

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

[Michał Górny]

commit:     fd84ee372d328e0eb094591e9c05d17fb8b1b534
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:26:08 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 09:00:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd84ee37

multibuild.eclass: Enable EAPI 6

 eclass/multibuild.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass
index 0bdbed1..d21008c 100644
--- a/eclass/multibuild.eclass
+++ b/eclass/multibuild.eclass
@@ -17,7 +17,7 @@ case "${EAPI:-0}" in
 	0|1|2|3)
 		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
 		;;
-	4|5)
+	4|5|6)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"

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

[Michał Górny]

commit:     807bc1a38a72b4d60462a5214a529bd17a9fdb11
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:44:54 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 09:00:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=807bc1a3

distutils-r1.eclass: Use default_src_prepare to apply patches in EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 256c893..f9cff5c 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -312,9 +312,12 @@ _distutils-r1_disable_ez_setup() {
 distutils-r1_python_prepare_all() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	[[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
-
-	epatch_user
+	if [[ ${EAPI} != [45] ]]; then
+		default
+	else
+		[[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
+		epatch_user
+	fi
 
 	# by default, use in-source build if python_prepare() is used
 	if [[ ! ${DISTUTILS_IN_SOURCE_BUILD+1} ]]; then

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

[Michał Górny]

commit:     b26483becb7d2b87aa89135a62178308239dbc93
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:28:48 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 09:00:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b26483be

python-r1.eclass: Fix missing explicit eutils inherit for EAPI < 6

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

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index de83bb5..92fa5de 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -63,6 +63,7 @@ elif [[ ${_PYTHON_ANY_R1} ]]; then
 	die 'python-r1.eclass can not be used with python-any-r1.eclass.'
 fi
 
+[[ ${EAPI} == [45] ]] && inherit eutils
 inherit multibuild python-utils-r1
 
 # @ECLASS-VARIABLE: PYTHON_COMPAT

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

[Michał Górny]

commit:     15c937c49f0117ef3fd050235d7591ff63114a76
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:20:59 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 09:00:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15c937c4

multibuild.eclass: Ban multibuild_parallel_foreach_variant in EAPI 6

 eclass/multibuild.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass
index 3115ac9..0bdbed1 100644
--- a/eclass/multibuild.eclass
+++ b/eclass/multibuild.eclass
@@ -146,6 +146,8 @@ multibuild_foreach_variant() {
 multibuild_parallel_foreach_variant() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}"
+
 	multibuild_foreach_variant "${@}"
 }
 

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

[Michał Górny]

commit:     12f81d379ec8240436f4500bc37be4198f3d0157
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:58:19 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 09:00:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12f81d37

distutils-r1.eclass: Ban DISTUTILS_NO_PARALLEL_BUILD in EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index e55e2e4..6054f27 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -691,6 +691,8 @@ _distutils-r1_run_foreach_impl() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	if [[ ${DISTUTILS_NO_PARALLEL_BUILD} ]]; then
+		[[ ${EAPI} == [45] ]] || die "DISTUTILS_NO_PARALLEL_BUILD is banned in EAPI ${EAPI}"
+
 		eqawarn "DISTUTILS_NO_PARALLEL_BUILD is no longer meaningful. Now all builds"
 		eqawarn "are non-parallel. Please remove it from the ebuild."
 

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

[Michał Górny]

commit:     3e57c6707669421ee29231f9cf257df4c85a2c12
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:29:15 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 09:00:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e57c670

python-r1.eclass: Enable EAPI 6

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

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 92fa5de..91f0436 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -47,7 +47,7 @@ case "${EAPI:-0}" in
 			die "Unsupported EAPI=${EAPI:-4} (too old, allowed only on restricted set of packages) for ${ECLASS}"
 		fi
 		;;
-	5)
+	5|6)
 		# EAPI=5 is required for sane USE_EXPAND dependencies
 		;;
 	*)

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

[Michał Górny]

commit:     42d0374b2fdd6651dee478e1b8efcd8285593299
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:41:51 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 09:00:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42d0374b

distutils-r1.eclass: esetup.py, respect nonfatal in EAPI 6

 eclass/distutils-r1.eclass | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 185dd4f..256c893 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -236,10 +236,13 @@ fi
 esetup.py() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	local die_args=()
+	[[ ${EAPI} != [45] ]] && die_args+=( -n )
+
 	set -- "${PYTHON:-python}" setup.py "${mydistutilsargs[@]}" "${@}"
 
 	echo "${@}" >&2
-	"${@}" || die
+	"${@}" || die "${die_args[@]}" || return ${?}
 }
 
 # @FUNCTION: distutils_install_for_testing

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

[Michał Górny]

commit:     c970021fb4c99ffc914a53c124a13074f04a6972
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 22:02:59 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 09:00:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c970021f

distutils-r1.eclass: Enable EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 7cb37c8..a2356f4 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -47,7 +47,7 @@ case "${EAPI:-0}" in
 	0|1|2|3)
 		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
 		;;
-	4|5)
+	4|5|6)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"

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

[Michał Górny]

commit:     beaa363972897c278c93830a620ddb20521cc5b9
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 15:25:49 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 09:00:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=beaa3639

python-utils-r1.eclass: Move ||die out of command substitution subshells

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 815dbae..6eeba31 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -281,12 +281,14 @@ python_export() {
 				# sysconfig can't be used because:
 				# 1) pypy doesn't give site-packages but stdlib
 				# 2) jython gives paths with wrong case
-				export PYTHON_SITEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_lib())' || die)
+				PYTHON_SITEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_lib())') || die
+				export PYTHON_SITEDIR
 				debug-print "${FUNCNAME}: PYTHON_SITEDIR = ${PYTHON_SITEDIR}"
 				;;
 			PYTHON_INCLUDEDIR)
 				[[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it"
-				export PYTHON_INCLUDEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())' || die)
+				PYTHON_INCLUDEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())') || die
+				export PYTHON_INCLUDEDIR
 				debug-print "${FUNCNAME}: PYTHON_INCLUDEDIR = ${PYTHON_INCLUDEDIR}"
 
 				# Jython gives a non-existing directory
@@ -296,7 +298,8 @@ python_export() {
 				;;
 			PYTHON_LIBPATH)
 				[[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it"
-				export PYTHON_LIBPATH=$("${PYTHON}" -c 'import os.path, sysconfig; print(os.path.join(sysconfig.get_config_var("LIBDIR"), sysconfig.get_config_var("LDLIBRARY")) if sysconfig.get_config_var("LDLIBRARY") else "")' || die)
+				PYTHON_LIBPATH=$("${PYTHON}" -c 'import os.path, sysconfig; print(os.path.join(sysconfig.get_config_var("LIBDIR"), sysconfig.get_config_var("LDLIBRARY")) if sysconfig.get_config_var("LDLIBRARY") else "")') || die
+				export PYTHON_LIBPATH
 				debug-print "${FUNCNAME}: PYTHON_LIBPATH = ${PYTHON_LIBPATH}"
 
 				if [[ ! ${PYTHON_LIBPATH} ]]; then
@@ -309,7 +312,7 @@ python_export() {
 				case "${impl}" in
 					python*)
 						# python-2.7, python-3.2, etc.
-						val=$($(tc-getPKG_CONFIG) --cflags ${impl/n/n-} || die)
+						val=$($(tc-getPKG_CONFIG) --cflags ${impl/n/n-}) || die
 						;;
 					*)
 						die "${impl}: obtaining ${var} not supported"
@@ -325,7 +328,7 @@ python_export() {
 				case "${impl}" in
 					python*)
 						# python-2.7, python-3.2, etc.
-						val=$($(tc-getPKG_CONFIG) --libs ${impl/n/n-} || die)
+						val=$($(tc-getPKG_CONFIG) --libs ${impl/n/n-}) || die
 						;;
 					*)
 						die "${impl}: obtaining ${var} not supported"
@@ -341,7 +344,7 @@ python_export() {
 				case "${impl}" in
 					python*)
 						[[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it"
-						flags=$("${PYTHON}" -c 'import sysconfig; print(sysconfig.get_config_var("ABIFLAGS") or "")' || die)
+						flags=$("${PYTHON}" -c 'import sysconfig; print(sysconfig.get_config_var("ABIFLAGS") or "")') || die
 						val=${PYTHON}${flags}-config
 						;;
 					*)

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

[Michał Górny]

commit:     8dbc0765f619dd388376dd2df95cfc8a2bb8f810
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 22 08:59:28 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 09:00:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dbc0765

python-utils-r1.eclass: Use in-band signalling for exit status of find

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 6eeba31..61fa486 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -1048,6 +1048,11 @@ python_fix_shebang() {
 			local shebang i
 			local error= from=
 
+			# normally ${f} starts with ${path}
+			if [[ ${f} != "${path}"* && ${f} -ne 0 ]]; then
+				die "'find ${path} -type f -print0' failed"
+			fi
+
 			IFS= read -r shebang <"${f}" || die
 
 			# First, check if it's shebang at all...
@@ -1138,7 +1143,7 @@ python_fix_shebang() {
 				eerror "  requested impl: ${EPYTHON}"
 				die "${FUNCNAME}: conversion of incompatible shebang requested"
 			fi
-		done < <(find "${path}" -type f -print0 || die)
+		done < <(find "${path}" -type f -print0; echo "${?}")
 
 		if [[ ! ${any_fixed} ]]; then
 			local cmd=eerror

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

[Michał Górny]

commit:     623d447bfd845cbd9a1c2effb6c3094e1ed88e55
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 22:02:39 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 09:00:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=623d447b

distutils-r1.eclass: Remove unnecessary eutils inherit in EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 1f0b74a..7cb37c8 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -79,7 +79,8 @@ esac
 
 if [[ ! ${_DISTUTILS_R1} ]]; then
 
-inherit eutils toolchain-funcs
+[[ ${EAPI} == [45] ]] && inherit eutils
+inherit toolchain-funcs
 
 if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
 	inherit multiprocessing python-r1

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

[Michał Górny]

commit:     9464daa2444ad35cb072495752147241bdcb1189
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 15:21:40 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 09:00:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9464daa2

python-utils-r1.eclass: Make heredocs consistent

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index e2bf667..815dbae 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -933,11 +933,11 @@ python_wrapper_setup() {
 
 		local x
 		for x in "${nonsupp[@]}"; do
-			cat >"${workdir}"/bin/${x} <<__EOF__ || die
-#!/bin/sh
-echo "${x} is not supported by ${EPYTHON}" >&2
-exit 127
-__EOF__
+			cat >"${workdir}"/bin/${x} <<-_EOF_ || die
+				#!/bin/sh
+				echo "${x} is not supported by ${EPYTHON}" >&2
+				exit 127
+_EOF_
 			chmod +x "${workdir}"/bin/${x} || die
 		done
 

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

[Michał Górny]

commit:     8d54af6ea9a0993c097542399ad1af1e510caee2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 18:44:22 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 11:55:34 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d54af6e

python-utils-r1.eclass: Replace local INSDESTTREE with subshells

Replace the 'local INSDESTTREE' hacks (which are PMS-valid yet
deprecated) with safer subshells.

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 9f3c750..e690e09 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -802,10 +802,10 @@ python_domodule() {
 		d=${PYTHON_SITEDIR#${EPREFIX}}/${python_moduleroot}
 	fi
 
-	local INSDESTTREE
-
-	insinto "${d}"
-	doins -r "${@}" || die
+	(
+		insinto "${d}"
+		doins -r "${@}" || die
+	)
 
 	python_optimize "${ED}/${d}"
 }
@@ -833,10 +833,10 @@ python_doheader() {
 
 	d=${PYTHON_INCLUDEDIR#${EPREFIX}}
 
-	local INSDESTTREE
-
-	insinto "${d}"
-	doins -r "${@}" || die
+	(
+		insinto "${d}"
+		doins -r "${@}" || die
+	)
 }
 
 # @FUNCTION: python_wrapper_setup

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

[Michał Górny]

commit:     e4dad59f0aaf70f365c56309fab1a275af6e4b0e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:41:29 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 11:55:37 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4dad59f

python-utils-r1.eclass: Ban installation helpers in EAPIs < 5

Ban python_do* and python_new* helpers in EAPIs older than 5. We should
ban them in python-any-r1 uses, actually but that would break
dev-python/pypy* ebuilds as they are written now.

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index e690e09..99ee58b 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -662,6 +662,9 @@ python_newexe() {
 
 	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
 	[[ ${#} -eq 2 ]] || die "Usage: ${FUNCNAME} <path> <new-name>"
+	if [[ ${EAPI:-0} == [01234] ]]; then
+		die "python_do* and python_new* helpers are banned in EAPIs older than 5."
+	fi
 
 	local wrapd=${python_scriptroot:-${DESTTREE}/bin}
 
@@ -789,6 +792,9 @@ python_domodule() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
+	if [[ ${EAPI:-0} == [01234] ]]; then
+		die "python_do* and python_new* helpers are banned in EAPIs older than 5."
+	fi
 
 	local d
 	if [[ ${python_moduleroot} == /* ]]; then
@@ -827,6 +833,9 @@ python_doheader() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
+	if [[ ${EAPI:-0} == [01234] ]]; then
+		die "python_do* and python_new* helpers are banned in EAPIs older than 5."
+	fi
 
 	local d PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR}
 	[[ ${PYTHON_INCLUDEDIR} ]] || python_export PYTHON_INCLUDEDIR

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

[Michał Górny]

commit:     7e499e43d8f43fe2be90192676753598a075ef49
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:12:38 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 11:56:06 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e499e43

python-single-r1.eclass: Enable EAPI=6, no changes needed

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

diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
index 1c27285..d9fc34b 100644
--- a/eclass/python-single-r1.eclass
+++ b/eclass/python-single-r1.eclass
@@ -55,7 +55,7 @@ case "${EAPI:-0}" in
 			die "Unsupported EAPI=${EAPI:-4} (too old, allowed only on restricted set of packages) for ${ECLASS}"
 		fi
 		;;
-	5)
+	5|6)
 		# EAPI=5 is required for sane USE_EXPAND dependencies
 		;;
 	*)

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

[Michał Górny]

commit:     7287dce862a051388ec4e8cefbb489a35d2b2e99
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:28:48 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 11:56:22 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7287dce8

python-r1.eclass: Fix missing explicit eutils inherit for EAPI < 6

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

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index de83bb5..92fa5de 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -63,6 +63,7 @@ elif [[ ${_PYTHON_ANY_R1} ]]; then
 	die 'python-r1.eclass can not be used with python-any-r1.eclass.'
 fi
 
+[[ ${EAPI} == [45] ]] && inherit eutils
 inherit multibuild python-utils-r1
 
 # @ECLASS-VARIABLE: PYTHON_COMPAT

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

[Michał Górny]

commit:     091be91967045436ae5dce6f336db1da0a90fd16
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:30:10 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 11:55:40 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=091be919

python-utils-r1.eclass: Make python_fix_shebang QAwarns fatal in EAPI 6

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 99ee58b..d8ced41 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -33,7 +33,8 @@ fi
 
 if [[ ! ${_PYTHON_UTILS_R1} ]]; then
 
-inherit eutils multilib toolchain-funcs
+[[ ${EAPI:-0} == [012345] ]] && inherit eutils
+inherit multilib toolchain-funcs
 
 # @ECLASS-VARIABLE: _PYTHON_ALL_IMPLS
 # @INTERNAL
@@ -1137,12 +1138,17 @@ python_fix_shebang() {
 		done < <(find "${path}" -type f -print0 || die)
 
 		if [[ ! ${any_fixed} ]]; then
-			eqawarn "QA warning: ${FUNCNAME}, ${path#${D}} did not match any fixable files."
+			local cmd=eerror
+			[[ ${EAPI:-0} == [012345] ]] && cmd=eqawarn
+
+			"${cmd}" "QA warning: ${FUNCNAME}, ${path#${D}} did not match any fixable files."
 			if [[ ${any_correct} ]]; then
-				eqawarn "All files have ${EPYTHON} shebang already."
+				"${cmd}" "All files have ${EPYTHON} shebang already."
 			else
-				eqawarn "There are no Python files in specified directory."
+				"${cmd}" "There are no Python files in specified directory."
 			fi
+
+			[[ ${cmd} == eerror ]] && die "${FUNCNAME} did not match any fixable files (QA warning fatal in EAPI ${EAPI})"
 		fi
 	done
 }

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

[Michał Górny]

commit:     7159f9fb11403a514022e5ff32cd25e2386a8802
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:11:24 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 11:56:03 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7159f9fb

python-any-r1.eclass: Enable EAPI=6, no changes needed

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

diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
index c00cc3a..b6c2258 100644
--- a/eclass/python-any-r1.eclass
+++ b/eclass/python-any-r1.eclass
@@ -37,8 +37,7 @@
 # https://wiki.gentoo.org/wiki/Project:Python/python-any-r1
 
 case "${EAPI:-0}" in
-	0|1|2|3|4|5)
-		# EAPI=4 needed by python-r1
+	0|1|2|3|4|5|6)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"

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

[Michał Górny]

commit:     458f9151287c19ffae9c14882bdfc9ec4c1d1f0c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 15:25:49 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 11:55:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=458f9151

python-utils-r1.eclass: Move ||die out of command substitution subshells

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 4307142..c0ca9ec 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -281,12 +281,14 @@ python_export() {
 				# sysconfig can't be used because:
 				# 1) pypy doesn't give site-packages but stdlib
 				# 2) jython gives paths with wrong case
-				export PYTHON_SITEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_lib())' || die)
+				PYTHON_SITEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_lib())') || die
+				export PYTHON_SITEDIR
 				debug-print "${FUNCNAME}: PYTHON_SITEDIR = ${PYTHON_SITEDIR}"
 				;;
 			PYTHON_INCLUDEDIR)
 				[[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it"
-				export PYTHON_INCLUDEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())' || die)
+				PYTHON_INCLUDEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())') || die
+				export PYTHON_INCLUDEDIR
 				debug-print "${FUNCNAME}: PYTHON_INCLUDEDIR = ${PYTHON_INCLUDEDIR}"
 
 				# Jython gives a non-existing directory
@@ -296,7 +298,8 @@ python_export() {
 				;;
 			PYTHON_LIBPATH)
 				[[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it"
-				export PYTHON_LIBPATH=$("${PYTHON}" -c 'import os.path, sysconfig; print(os.path.join(sysconfig.get_config_var("LIBDIR"), sysconfig.get_config_var("LDLIBRARY")) if sysconfig.get_config_var("LDLIBRARY") else "")' || die)
+				PYTHON_LIBPATH=$("${PYTHON}" -c 'import os.path, sysconfig; print(os.path.join(sysconfig.get_config_var("LIBDIR"), sysconfig.get_config_var("LDLIBRARY")) if sysconfig.get_config_var("LDLIBRARY") else "")') || die
+				export PYTHON_LIBPATH
 				debug-print "${FUNCNAME}: PYTHON_LIBPATH = ${PYTHON_LIBPATH}"
 
 				if [[ ! ${PYTHON_LIBPATH} ]]; then
@@ -309,7 +312,7 @@ python_export() {
 				case "${impl}" in
 					python*)
 						# python-2.7, python-3.2, etc.
-						val=$($(tc-getPKG_CONFIG) --cflags ${impl/n/n-} || die)
+						val=$($(tc-getPKG_CONFIG) --cflags ${impl/n/n-}) || die
 						;;
 					*)
 						die "${impl}: obtaining ${var} not supported"
@@ -325,7 +328,7 @@ python_export() {
 				case "${impl}" in
 					python*)
 						# python-2.7, python-3.2, etc.
-						val=$($(tc-getPKG_CONFIG) --libs ${impl/n/n-} || die)
+						val=$($(tc-getPKG_CONFIG) --libs ${impl/n/n-}) || die
 						;;
 					*)
 						die "${impl}: obtaining ${var} not supported"
@@ -341,7 +344,7 @@ python_export() {
 				case "${impl}" in
 					python*)
 						[[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it"
-						flags=$("${PYTHON}" -c 'import sysconfig; print(sysconfig.get_config_var("ABIFLAGS") or "")' || die)
+						flags=$("${PYTHON}" -c 'import sysconfig; print(sysconfig.get_config_var("ABIFLAGS") or "")') || die
 						val=${PYTHON}${flags}-config
 						;;
 					*)

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

[Michał Górny]

commit:     9fe2128e8d7342eb504ff66cad6545a8c95377e7
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:29:15 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 11:56:26 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fe2128e

python-r1.eclass: Enable EAPI 6

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

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 92fa5de..91f0436 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -47,7 +47,7 @@ case "${EAPI:-0}" in
 			die "Unsupported EAPI=${EAPI:-4} (too old, allowed only on restricted set of packages) for ${ECLASS}"
 		fi
 		;;
-	5)
+	5|6)
 		# EAPI=5 is required for sane USE_EXPAND dependencies
 		;;
 	*)

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

[Michał Górny]

commit:     41d63d717f26d861559415ab344c981ade1061f4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 15:21:40 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 11:55:53 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41d63d71

python-utils-r1.eclass: Make heredocs consistent

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 7617c3f..4307142 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -933,11 +933,11 @@ python_wrapper_setup() {
 
 		local x
 		for x in "${nonsupp[@]}"; do
-			cat >"${workdir}"/bin/${x} <<__EOF__ || die
-#!/bin/sh
-echo "${x} is not supported by ${EPYTHON}" >&2
-exit 127
-__EOF__
+			cat >"${workdir}"/bin/${x} <<-_EOF_ || die
+				#!/bin/sh
+				echo "${x} is not supported by ${EPYTHON}" >&2
+				exit 127
+			_EOF_
 			chmod +x "${workdir}"/bin/${x} || die
 		done
 

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

[Michał Górny]

commit:     c1cc538d7188f357c98e4e2a32da1365b833e773
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:20:59 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 11:56:10 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1cc538d

multibuild.eclass: Ban multibuild_parallel_foreach_variant in EAPI 6

 eclass/multibuild.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass
index 3115ac9..0bdbed1 100644
--- a/eclass/multibuild.eclass
+++ b/eclass/multibuild.eclass
@@ -146,6 +146,8 @@ multibuild_foreach_variant() {
 multibuild_parallel_foreach_variant() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}"
+
 	multibuild_foreach_variant "${@}"
 }
 

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

[Michał Górny]

commit:     e3ca5282893c2bee17612d33c778fa899e413caa
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:31:10 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 11:55:44 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3ca5282

python-utils-r1.eclass: Remove unneeded multilib inherit in EAPI 6

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index d8ced41..59e8799 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -33,8 +33,8 @@ fi
 
 if [[ ! ${_PYTHON_UTILS_R1} ]]; then
 
-[[ ${EAPI:-0} == [012345] ]] && inherit eutils
-inherit multilib toolchain-funcs
+[[ ${EAPI:-0} == [012345] ]] && inherit eutils multilib
+inherit toolchain-funcs
 
 # @ECLASS-VARIABLE: _PYTHON_ALL_IMPLS
 # @INTERNAL

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

[Michał Górny]

commit:     6829c29a96fd5a357c4ce8058eb5480ef3fc89b1
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:27:52 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 11:56:19 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6829c29a

python-r1.eclass: Ban python_export_best in EAPI 6

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

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 1531442..de83bb5 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -603,6 +603,8 @@ python_setup() {
 python_export_best() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}"
+
 	eqawarn "python_export_best() is deprecated. Please use python_setup instead,"
 	eqawarn "combined with python_export if necessary."
 

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

[Michał Górny]

commit:     3d19a17951ff0d0a63e2f7a2a2e1c24943721933
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:44:27 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 11:55:47 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d19a179

python-utils-r1.eclass: Support nonfatal in python_do* and python_new*

 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 59e8799..7617c3f 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -679,7 +679,7 @@ python_newexe() {
 	(
 		dodir "${wrapd}"
 		exeinto "${d}"
-		newexe "${f}" "${newfn}" || die
+		newexe "${f}" "${newfn}" || return ${?}
 	)
 
 	# install the wrapper
@@ -811,7 +811,7 @@ python_domodule() {
 
 	(
 		insinto "${d}"
-		doins -r "${@}" || die
+		doins -r "${@}" || return ${?}
 	)
 
 	python_optimize "${ED}/${d}"
@@ -845,7 +845,7 @@ python_doheader() {
 
 	(
 		insinto "${d}"
-		doins -r "${@}" || die
+		doins -r "${@}" || return ${?}
 	)
 }
 

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

[Michał Górny]

commit:     939f27b7e5542dc238786cffb45655bed2d573fa
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:27:15 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 11:56:16 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=939f27b7

python-r1.eclass: Ban python_parallel_foreach_impl in EAPI 6

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

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index d3b4f1d..1531442 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -526,6 +526,8 @@ python_foreach_impl() {
 python_parallel_foreach_impl() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}"
+
 	if [[ ! ${_PYTHON_PARALLEL_WARNED} ]]; then
 		eqawarn "python_parallel_foreach_impl() is no longer meaningful. All runs"
 		eqawarn "are non-parallel now. Please replace the call with python_foreach_impl."

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

[Michał Górny]

commit:     4ff708036396aa320f42c03299ec399ae64ffdcd
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:26:08 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 11:56:13 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ff70803

multibuild.eclass: Enable EAPI 6

 eclass/multibuild.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass
index 0bdbed1..d21008c 100644
--- a/eclass/multibuild.eclass
+++ b/eclass/multibuild.eclass
@@ -17,7 +17,7 @@ case "${EAPI:-0}" in
 	0|1|2|3)
 		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
 		;;
-	4|5)
+	4|5|6)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"

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

[Michał Górny]

commit:     bc67cdf3d426d9ccac83ac49a952e1e4b6d4f4f6
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:31:41 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 11:56:00 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc67cdf3

python-utils-r1.eclass: Enable EAPI 6

 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 c0ca9ec..a7575bf 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -20,7 +20,7 @@
 # https://wiki.gentoo.org/wiki/Project:Python/python-utils-r1
 
 case "${EAPI:-0}" in
-	0|1|2|3|4|5)
+	0|1|2|3|4|5|6)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"

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

[Michał Górny]

commit:     27288099aa786160d1634816c0614a3daa47c823
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:44:54 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 11:56:32 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27288099

distutils-r1.eclass: Use default_src_prepare to apply patches in EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 256c893..f9cff5c 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -312,9 +312,12 @@ _distutils-r1_disable_ez_setup() {
 distutils-r1_python_prepare_all() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	[[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
-
-	epatch_user
+	if [[ ${EAPI} != [45] ]]; then
+		default
+	else
+		[[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
+		epatch_user
+	fi
 
 	# by default, use in-source build if python_prepare() is used
 	if [[ ! ${DISTUTILS_IN_SOURCE_BUILD+1} ]]; then

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

[Michał Górny]

commit:     17773e3b5fb4253524f60b42a375fa05c6e4a886
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:58:19 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 11:56:48 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17773e3b

distutils-r1.eclass: Ban DISTUTILS_NO_PARALLEL_BUILD in EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 1cf2a49..551bc09 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -693,6 +693,8 @@ _distutils-r1_run_foreach_impl() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	if [[ ${DISTUTILS_NO_PARALLEL_BUILD} ]]; then
+		[[ ${EAPI} == [45] ]] || die "DISTUTILS_NO_PARALLEL_BUILD is banned in EAPI ${EAPI}"
+
 		eqawarn "DISTUTILS_NO_PARALLEL_BUILD is no longer meaningful. Now all builds"
 		eqawarn "are non-parallel. Please remove it from the ebuild."
 

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

[Michał Górny]

commit:     bbde7cbb98fa98bce4220537f58c594e58e2940e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:57:04 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 11:56:45 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbde7cbb

distutils-r1.eclass: Ban EXAMPLES in EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index e632202..1cf2a49 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -150,6 +150,8 @@ fi
 # @ECLASS-VARIABLE: EXAMPLES
 # @DEFAULT_UNSET
 # @DESCRIPTION:
+# OBSOLETE: this variable is deprecated and banned in EAPI 6
+#
 # An array containing examples installed into 'examples' doc
 # subdirectory. The files and directories listed there must exist
 # in the directory from which distutils-r1_python_install_all() is run
@@ -583,6 +585,8 @@ distutils-r1_python_install_all() {
 	einstalldocs
 
 	if declare -p EXAMPLES &>/dev/null; then
+		[[ ${EAPI} != [45] ]] && die "EXAMPLES are banned in EAPI ${EAPI}"
+
 		local INSDESTTREE=/usr/share/doc/${PF}/examples
 		doins -r "${EXAMPLES[@]}"
 		docompress -x "${INSDESTTREE}"

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

[Michał Górny]

commit:     835e59662923fed5611b879d77ff8e9440605c81
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:50:57 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 11:56:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=835e5966

distutils-r1.eclass: Ban no-op default phase implementations in EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index f9cff5c..47b09b0 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -343,7 +343,7 @@ distutils-r1_python_prepare_all() {
 distutils-r1_python_prepare() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	:
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI 6 (it was a no-op)"
 }
 
 # @FUNCTION: distutils-r1_python_configure
@@ -352,7 +352,7 @@ distutils-r1_python_prepare() {
 distutils-r1_python_configure() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	:
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI 6 (it was a no-op)"
 }
 
 # @FUNCTION: _distutils-r1_create_setup_cfg

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

[Michał Górny]

commit:     e3cfc01dd17e1089e22b93efc955493d3aceff78
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:50:57 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 11:56:39 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3cfc01d

distutils-r1.eclass: Make pypy/share QA error fatal in EAPI 6

 eclass/distutils-r1.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 47b09b0..e632202 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -563,7 +563,9 @@ distutils-r1_python_install() {
 		fi
 	done
 	if [[ -d ${root}/usr/$(get_libdir)/pypy/share ]]; then
-		eqawarn "Package installs 'share' in PyPy prefix, see bug #465546."
+		local cmd=die
+		[[ ${EAPI} == [45] ]] && cmd=eqawarn
+		"${cmd}" "Package installs 'share' in PyPy prefix, see bug #465546."
 	fi
 
 	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then

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

[Michał Górny]

commit:     a455dd9608c34cb562890dc02f9b782f211f83df
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 22:02:59 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 11:56:59 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a455dd96

distutils-r1.eclass: Enable EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 7ebcaa5..36b3436 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -47,7 +47,7 @@ case "${EAPI:-0}" in
 	0|1|2|3)
 		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
 		;;
-	4|5)
+	4|5|6)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"

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

[Michał Górny]

commit:     7ff3be2fd34b6b1e13e6e934819e52b10681e26e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 22:02:39 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 11:56:55 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ff3be2f

distutils-r1.eclass: Remove unnecessary eutils inherit in EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index b249985..7ebcaa5 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -79,7 +79,8 @@ esac
 
 if [[ ! ${_DISTUTILS_R1} ]]; then
 
-inherit eutils toolchain-funcs
+[[ ${EAPI} == [45] ]] && inherit eutils
+inherit toolchain-funcs
 
 if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
 	inherit multiprocessing python-r1

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

[Michał Górny]

commit:     98fafe289b579c1d7452766b1b94b55c865beaab
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 22:00:48 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 11:56:52 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98fafe28

distutils-r1.eclass: Make default _all impl call warning fatal in EAPI 6

 eclass/distutils-r1.eclass | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 551bc09..b249985 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -731,7 +731,10 @@ distutils-r1_src_prepare() {
 	fi
 
 	if [[ ! ${_DISTUTILS_DEFAULT_CALLED} ]]; then
-		eqawarn "QA warning: python_prepare_all() didn't call distutils-r1_python_prepare_all"
+		local cmd=die
+		[[ ${EAPI} == [45] ]] && cmd=eqawarn
+
+		"${cmd}" "QA: python_prepare_all() didn't call distutils-r1_python_prepare_all"
 	fi
 
 	if declare -f python_prepare >/dev/null; then
@@ -802,7 +805,10 @@ distutils-r1_src_install() {
 	fi
 
 	if [[ ! ${_DISTUTILS_DEFAULT_CALLED} ]]; then
-		eqawarn "QA warning: python_install_all() didn't call distutils-r1_python_install_all"
+		local cmd=die
+		[[ ${EAPI} == [45] ]] && cmd=eqawarn
+
+		"${cmd}" "QA: python_install_all() didn't call distutils-r1_python_install_all"
 	fi
 }
 

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

[Michał Górny]

commit:     9a1a5b9563723424896179747a4cc767d09e46b1
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:41:51 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 11:56:29 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a1a5b95

distutils-r1.eclass: esetup.py, respect nonfatal in EAPI 6

 eclass/distutils-r1.eclass | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 185dd4f..256c893 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -236,10 +236,13 @@ fi
 esetup.py() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	local die_args=()
+	[[ ${EAPI} != [45] ]] && die_args+=( -n )
+
 	set -- "${PYTHON:-python}" setup.py "${mydistutilsargs[@]}" "${@}"
 
 	echo "${@}" >&2
-	"${@}" || die
+	"${@}" || die "${die_args[@]}" || return ${?}
 }
 
 # @FUNCTION: distutils_install_for_testing

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

[Michał Górny]

commit:     6679272fb78ab0ad7f82793499955950dd5c2ee3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:44:27 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 13:43:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6679272f

python-utils-r1.eclass: Support nonfatal in python_do* and python_new*

 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 59e8799..7617c3f 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -679,7 +679,7 @@ python_newexe() {
 	(
 		dodir "${wrapd}"
 		exeinto "${d}"
-		newexe "${f}" "${newfn}" || die
+		newexe "${f}" "${newfn}" || return ${?}
 	)
 
 	# install the wrapper
@@ -811,7 +811,7 @@ python_domodule() {
 
 	(
 		insinto "${d}"
-		doins -r "${@}" || die
+		doins -r "${@}" || return ${?}
 	)
 
 	python_optimize "${ED}/${d}"
@@ -845,7 +845,7 @@ python_doheader() {
 
 	(
 		insinto "${d}"
-		doins -r "${@}" || die
+		doins -r "${@}" || return ${?}
 	)
 }
 

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

[Michał Górny]

commit:     ace224cbda82fe33bb13b7088941619b64b0b9c3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 18:44:22 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 13:43:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ace224cb

python-utils-r1.eclass: Replace local INSDESTTREE with subshells

Replace the 'local INSDESTTREE' hacks (which are PMS-valid yet
deprecated) with safer subshells.

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 9f3c750..e690e09 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -802,10 +802,10 @@ python_domodule() {
 		d=${PYTHON_SITEDIR#${EPREFIX}}/${python_moduleroot}
 	fi
 
-	local INSDESTTREE
-
-	insinto "${d}"
-	doins -r "${@}" || die
+	(
+		insinto "${d}"
+		doins -r "${@}" || die
+	)
 
 	python_optimize "${ED}/${d}"
 }
@@ -833,10 +833,10 @@ python_doheader() {
 
 	d=${PYTHON_INCLUDEDIR#${EPREFIX}}
 
-	local INSDESTTREE
-
-	insinto "${d}"
-	doins -r "${@}" || die
+	(
+		insinto "${d}"
+		doins -r "${@}" || die
+	)
 }
 
 # @FUNCTION: python_wrapper_setup

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

[Michał Górny]

commit:     d13228de5aaae9d1c4f51613439388e82b108810
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:20:59 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 13:43:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d13228de

multibuild.eclass: Ban multibuild_parallel_foreach_variant in EAPI 6

 eclass/multibuild.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass
index 3115ac9..0bdbed1 100644
--- a/eclass/multibuild.eclass
+++ b/eclass/multibuild.eclass
@@ -146,6 +146,8 @@ multibuild_foreach_variant() {
 multibuild_parallel_foreach_variant() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}"
+
 	multibuild_foreach_variant "${@}"
 }
 

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

[Michał Górny]

commit:     a4f74a554893dccf044fb1764917a4425a567ee0
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:26:08 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 13:43:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4f74a55

multibuild.eclass: Enable EAPI 6

 eclass/multibuild.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass
index 0bdbed1..d21008c 100644
--- a/eclass/multibuild.eclass
+++ b/eclass/multibuild.eclass
@@ -17,7 +17,7 @@ case "${EAPI:-0}" in
 	0|1|2|3)
 		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
 		;;
-	4|5)
+	4|5|6)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"

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

[Michał Górny]

commit:     a916a0cab52e9a45af158ad7c8ee5c8aaf0de61b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:30:10 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 13:43:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a916a0ca

python-utils-r1.eclass: Make python_fix_shebang QAwarns fatal in EAPI 6

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 99ee58b..d8ced41 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -33,7 +33,8 @@ fi
 
 if [[ ! ${_PYTHON_UTILS_R1} ]]; then
 
-inherit eutils multilib toolchain-funcs
+[[ ${EAPI:-0} == [012345] ]] && inherit eutils
+inherit multilib toolchain-funcs
 
 # @ECLASS-VARIABLE: _PYTHON_ALL_IMPLS
 # @INTERNAL
@@ -1137,12 +1138,17 @@ python_fix_shebang() {
 		done < <(find "${path}" -type f -print0 || die)
 
 		if [[ ! ${any_fixed} ]]; then
-			eqawarn "QA warning: ${FUNCNAME}, ${path#${D}} did not match any fixable files."
+			local cmd=eerror
+			[[ ${EAPI:-0} == [012345] ]] && cmd=eqawarn
+
+			"${cmd}" "QA warning: ${FUNCNAME}, ${path#${D}} did not match any fixable files."
 			if [[ ${any_correct} ]]; then
-				eqawarn "All files have ${EPYTHON} shebang already."
+				"${cmd}" "All files have ${EPYTHON} shebang already."
 			else
-				eqawarn "There are no Python files in specified directory."
+				"${cmd}" "There are no Python files in specified directory."
 			fi
+
+			[[ ${cmd} == eerror ]] && die "${FUNCNAME} did not match any fixable files (QA warning fatal in EAPI ${EAPI})"
 		fi
 	done
 }

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

[Michał Górny]

commit:     74c2220bcafeadffe8520be0b751ec7288d7f608
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:27:15 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 13:43:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74c2220b

python-r1.eclass: Ban python_parallel_foreach_impl in EAPI 6

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

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index d3b4f1d..1531442 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -526,6 +526,8 @@ python_foreach_impl() {
 python_parallel_foreach_impl() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}"
+
 	if [[ ! ${_PYTHON_PARALLEL_WARNED} ]]; then
 		eqawarn "python_parallel_foreach_impl() is no longer meaningful. All runs"
 		eqawarn "are non-parallel now. Please replace the call with python_foreach_impl."

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

[Michał Górny]

commit:     cce6510a8e561564467046bc12e2bb96cf998ad2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 15:21:40 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 13:43:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cce6510a

python-utils-r1.eclass: Make heredocs consistent

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 7617c3f..4307142 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -933,11 +933,11 @@ python_wrapper_setup() {
 
 		local x
 		for x in "${nonsupp[@]}"; do
-			cat >"${workdir}"/bin/${x} <<__EOF__ || die
-#!/bin/sh
-echo "${x} is not supported by ${EPYTHON}" >&2
-exit 127
-__EOF__
+			cat >"${workdir}"/bin/${x} <<-_EOF_ || die
+				#!/bin/sh
+				echo "${x} is not supported by ${EPYTHON}" >&2
+				exit 127
+			_EOF_
 			chmod +x "${workdir}"/bin/${x} || die
 		done
 

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

[Michał Górny]

commit:     71d3acab5362cfb46db73e7deaf1d0fdc1d118de
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 15:25:49 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 13:43:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71d3acab

python-utils-r1.eclass: Move ||die out of command substitution subshells

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 4307142..c0ca9ec 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -281,12 +281,14 @@ python_export() {
 				# sysconfig can't be used because:
 				# 1) pypy doesn't give site-packages but stdlib
 				# 2) jython gives paths with wrong case
-				export PYTHON_SITEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_lib())' || die)
+				PYTHON_SITEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_lib())') || die
+				export PYTHON_SITEDIR
 				debug-print "${FUNCNAME}: PYTHON_SITEDIR = ${PYTHON_SITEDIR}"
 				;;
 			PYTHON_INCLUDEDIR)
 				[[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it"
-				export PYTHON_INCLUDEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())' || die)
+				PYTHON_INCLUDEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())') || die
+				export PYTHON_INCLUDEDIR
 				debug-print "${FUNCNAME}: PYTHON_INCLUDEDIR = ${PYTHON_INCLUDEDIR}"
 
 				# Jython gives a non-existing directory
@@ -296,7 +298,8 @@ python_export() {
 				;;
 			PYTHON_LIBPATH)
 				[[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it"
-				export PYTHON_LIBPATH=$("${PYTHON}" -c 'import os.path, sysconfig; print(os.path.join(sysconfig.get_config_var("LIBDIR"), sysconfig.get_config_var("LDLIBRARY")) if sysconfig.get_config_var("LDLIBRARY") else "")' || die)
+				PYTHON_LIBPATH=$("${PYTHON}" -c 'import os.path, sysconfig; print(os.path.join(sysconfig.get_config_var("LIBDIR"), sysconfig.get_config_var("LDLIBRARY")) if sysconfig.get_config_var("LDLIBRARY") else "")') || die
+				export PYTHON_LIBPATH
 				debug-print "${FUNCNAME}: PYTHON_LIBPATH = ${PYTHON_LIBPATH}"
 
 				if [[ ! ${PYTHON_LIBPATH} ]]; then
@@ -309,7 +312,7 @@ python_export() {
 				case "${impl}" in
 					python*)
 						# python-2.7, python-3.2, etc.
-						val=$($(tc-getPKG_CONFIG) --cflags ${impl/n/n-} || die)
+						val=$($(tc-getPKG_CONFIG) --cflags ${impl/n/n-}) || die
 						;;
 					*)
 						die "${impl}: obtaining ${var} not supported"
@@ -325,7 +328,7 @@ python_export() {
 				case "${impl}" in
 					python*)
 						# python-2.7, python-3.2, etc.
-						val=$($(tc-getPKG_CONFIG) --libs ${impl/n/n-} || die)
+						val=$($(tc-getPKG_CONFIG) --libs ${impl/n/n-}) || die
 						;;
 					*)
 						die "${impl}: obtaining ${var} not supported"
@@ -341,7 +344,7 @@ python_export() {
 				case "${impl}" in
 					python*)
 						[[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it"
-						flags=$("${PYTHON}" -c 'import sysconfig; print(sysconfig.get_config_var("ABIFLAGS") or "")' || die)
+						flags=$("${PYTHON}" -c 'import sysconfig; print(sysconfig.get_config_var("ABIFLAGS") or "")') || die
 						val=${PYTHON}${flags}-config
 						;;
 					*)

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

[Michał Górny]

commit:     e310dbcaf599f5a7d5a266b951c60c19dc10106c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:11:24 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 13:43:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e310dbca

python-any-r1.eclass: Enable EAPI=6, no changes needed

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

diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
index c00cc3a..b6c2258 100644
--- a/eclass/python-any-r1.eclass
+++ b/eclass/python-any-r1.eclass
@@ -37,8 +37,7 @@
 # https://wiki.gentoo.org/wiki/Project:Python/python-any-r1
 
 case "${EAPI:-0}" in
-	0|1|2|3|4|5)
-		# EAPI=4 needed by python-r1
+	0|1|2|3|4|5|6)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"

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

[Michał Górny]

commit:     68d09ac2a25996b32da1336598615adc9678e9ac
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:27:52 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 13:43:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68d09ac2

python-r1.eclass: Ban python_export_best in EAPI 6

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

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 1531442..de83bb5 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -603,6 +603,8 @@ python_setup() {
 python_export_best() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}"
+
 	eqawarn "python_export_best() is deprecated. Please use python_setup instead,"
 	eqawarn "combined with python_export if necessary."
 

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

[Michał Górny]

commit:     64e322db5d927d0a7814bbe78a7da1102b753bc2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:12:38 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 13:43:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64e322db

python-single-r1.eclass: Enable EAPI=6, no changes needed

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

diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
index 1c27285..d9fc34b 100644
--- a/eclass/python-single-r1.eclass
+++ b/eclass/python-single-r1.eclass
@@ -55,7 +55,7 @@ case "${EAPI:-0}" in
 			die "Unsupported EAPI=${EAPI:-4} (too old, allowed only on restricted set of packages) for ${ECLASS}"
 		fi
 		;;
-	5)
+	5|6)
 		# EAPI=5 is required for sane USE_EXPAND dependencies
 		;;
 	*)

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

[Michał Górny]

commit:     7b326f3a06e19ad09a3696eecbeeb6d1554b57e4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:31:10 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 13:43:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b326f3a

python-utils-r1.eclass: Remove unneeded multilib inherit in EAPI 6

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index d8ced41..59e8799 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -33,8 +33,8 @@ fi
 
 if [[ ! ${_PYTHON_UTILS_R1} ]]; then
 
-[[ ${EAPI:-0} == [012345] ]] && inherit eutils
-inherit multilib toolchain-funcs
+[[ ${EAPI:-0} == [012345] ]] && inherit eutils multilib
+inherit toolchain-funcs
 
 # @ECLASS-VARIABLE: _PYTHON_ALL_IMPLS
 # @INTERNAL

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

[Michał Górny]

commit:     267e8b178c24420ec3b38c840e63626247156159
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:31:41 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 13:43:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=267e8b17

python-utils-r1.eclass: Enable EAPI 6

 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 c0ca9ec..a7575bf 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -20,7 +20,7 @@
 # https://wiki.gentoo.org/wiki/Project:Python/python-utils-r1
 
 case "${EAPI:-0}" in
-	0|1|2|3|4|5)
+	0|1|2|3|4|5|6)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"

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

[Michał Górny]

commit:     7889a9e7eea53fd3ebfade4c63b10578bde42e22
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:41:29 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 13:43:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7889a9e7

python-utils-r1.eclass: Ban installation helpers in EAPIs < 5

Ban python_do* and python_new* helpers in EAPIs older than 5. We should
ban them in python-any-r1 uses, actually but that would break
dev-python/pypy* ebuilds as they are written now.

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index e690e09..99ee58b 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -662,6 +662,9 @@ python_newexe() {
 
 	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
 	[[ ${#} -eq 2 ]] || die "Usage: ${FUNCNAME} <path> <new-name>"
+	if [[ ${EAPI:-0} == [01234] ]]; then
+		die "python_do* and python_new* helpers are banned in EAPIs older than 5."
+	fi
 
 	local wrapd=${python_scriptroot:-${DESTTREE}/bin}
 
@@ -789,6 +792,9 @@ python_domodule() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
+	if [[ ${EAPI:-0} == [01234] ]]; then
+		die "python_do* and python_new* helpers are banned in EAPIs older than 5."
+	fi
 
 	local d
 	if [[ ${python_moduleroot} == /* ]]; then
@@ -827,6 +833,9 @@ python_doheader() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
+	if [[ ${EAPI:-0} == [01234] ]]; then
+		die "python_do* and python_new* helpers are banned in EAPIs older than 5."
+	fi
 
 	local d PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR}
 	[[ ${PYTHON_INCLUDEDIR} ]] || python_export PYTHON_INCLUDEDIR

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

[Michał Górny]

commit:     4a19a62842d1075dc6a00add95d60755ed8f79b8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:50:57 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 13:43:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a19a628

distutils-r1.eclass: Ban no-op default phase implementations in EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index f9cff5c..47b09b0 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -343,7 +343,7 @@ distutils-r1_python_prepare_all() {
 distutils-r1_python_prepare() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	:
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI 6 (it was a no-op)"
 }
 
 # @FUNCTION: distutils-r1_python_configure
@@ -352,7 +352,7 @@ distutils-r1_python_prepare() {
 distutils-r1_python_configure() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	:
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI 6 (it was a no-op)"
 }
 
 # @FUNCTION: _distutils-r1_create_setup_cfg

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

[Michał Górny]

commit:     aa34350a380592a42f131974144c14795cc5fcb5
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 22:00:48 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 13:43:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa34350a

distutils-r1.eclass: Make default _all impl call warning fatal in EAPI 6

 eclass/distutils-r1.eclass | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 551bc09..b249985 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -731,7 +731,10 @@ distutils-r1_src_prepare() {
 	fi
 
 	if [[ ! ${_DISTUTILS_DEFAULT_CALLED} ]]; then
-		eqawarn "QA warning: python_prepare_all() didn't call distutils-r1_python_prepare_all"
+		local cmd=die
+		[[ ${EAPI} == [45] ]] && cmd=eqawarn
+
+		"${cmd}" "QA: python_prepare_all() didn't call distutils-r1_python_prepare_all"
 	fi
 
 	if declare -f python_prepare >/dev/null; then
@@ -802,7 +805,10 @@ distutils-r1_src_install() {
 	fi
 
 	if [[ ! ${_DISTUTILS_DEFAULT_CALLED} ]]; then
-		eqawarn "QA warning: python_install_all() didn't call distutils-r1_python_install_all"
+		local cmd=die
+		[[ ${EAPI} == [45] ]] && cmd=eqawarn
+
+		"${cmd}" "QA: python_install_all() didn't call distutils-r1_python_install_all"
 	fi
 }
 

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

[Michał Górny]

commit:     0768d1c69511bd90f36ec448bba0e1b7ec28ed20
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:58:19 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 13:43:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0768d1c6

distutils-r1.eclass: Ban DISTUTILS_NO_PARALLEL_BUILD in EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 1cf2a49..551bc09 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -693,6 +693,8 @@ _distutils-r1_run_foreach_impl() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	if [[ ${DISTUTILS_NO_PARALLEL_BUILD} ]]; then
+		[[ ${EAPI} == [45] ]] || die "DISTUTILS_NO_PARALLEL_BUILD is banned in EAPI ${EAPI}"
+
 		eqawarn "DISTUTILS_NO_PARALLEL_BUILD is no longer meaningful. Now all builds"
 		eqawarn "are non-parallel. Please remove it from the ebuild."
 

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

[Michał Górny]

commit:     6fdbd4198acfb3911374b237742210a03b98422b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:41:51 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 13:43:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fdbd419

distutils-r1.eclass: esetup.py, respect nonfatal in EAPI 6

 eclass/distutils-r1.eclass | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 185dd4f..256c893 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -236,10 +236,13 @@ fi
 esetup.py() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	local die_args=()
+	[[ ${EAPI} != [45] ]] && die_args+=( -n )
+
 	set -- "${PYTHON:-python}" setup.py "${mydistutilsargs[@]}" "${@}"
 
 	echo "${@}" >&2
-	"${@}" || die
+	"${@}" || die "${die_args[@]}" || return ${?}
 }
 
 # @FUNCTION: distutils_install_for_testing

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

[Michał Górny]

commit:     0519beb71a1b287ddf9a17d618ce238c0c1a55b4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:50:57 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 13:43:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0519beb7

distutils-r1.eclass: Make pypy/share QA error fatal in EAPI 6

 eclass/distutils-r1.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 47b09b0..e632202 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -563,7 +563,9 @@ distutils-r1_python_install() {
 		fi
 	done
 	if [[ -d ${root}/usr/$(get_libdir)/pypy/share ]]; then
-		eqawarn "Package installs 'share' in PyPy prefix, see bug #465546."
+		local cmd=die
+		[[ ${EAPI} == [45] ]] && cmd=eqawarn
+		"${cmd}" "Package installs 'share' in PyPy prefix, see bug #465546."
 	fi
 
 	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then

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

[Michał Górny]

commit:     be4946024d35f969adf9110d7aa91e0378d82911
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 22:02:59 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 13:43:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be494602

distutils-r1.eclass: Enable EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 7ebcaa5..36b3436 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -47,7 +47,7 @@ case "${EAPI:-0}" in
 	0|1|2|3)
 		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
 		;;
-	4|5)
+	4|5|6)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"

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

[Michał Górny]

commit:     6eed0080089813557a56bdc5987e2a0f6f23d9dc
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:57:04 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 13:43:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6eed0080

distutils-r1.eclass: Ban EXAMPLES in EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index e632202..1cf2a49 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -150,6 +150,8 @@ fi
 # @ECLASS-VARIABLE: EXAMPLES
 # @DEFAULT_UNSET
 # @DESCRIPTION:
+# OBSOLETE: this variable is deprecated and banned in EAPI 6
+#
 # An array containing examples installed into 'examples' doc
 # subdirectory. The files and directories listed there must exist
 # in the directory from which distutils-r1_python_install_all() is run
@@ -583,6 +585,8 @@ distutils-r1_python_install_all() {
 	einstalldocs
 
 	if declare -p EXAMPLES &>/dev/null; then
+		[[ ${EAPI} != [45] ]] && die "EXAMPLES are banned in EAPI ${EAPI}"
+
 		local INSDESTTREE=/usr/share/doc/${PF}/examples
 		doins -r "${EXAMPLES[@]}"
 		docompress -x "${INSDESTTREE}"

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

[Michał Górny]

commit:     13b9b7fd595b9d74b859d4e95df09cc783c191ff
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 22:02:39 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 13:43:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13b9b7fd

distutils-r1.eclass: Remove unnecessary eutils inherit in EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index b249985..7ebcaa5 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -79,7 +79,8 @@ esac
 
 if [[ ! ${_DISTUTILS_R1} ]]; then
 
-inherit eutils toolchain-funcs
+[[ ${EAPI} == [45] ]] && inherit eutils
+inherit toolchain-funcs
 
 if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
 	inherit multiprocessing python-r1

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

[Michał Górny]

commit:     a0d00bf8b99f87bddfb450cce924ebf8984e6cef
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:29:15 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 13:43:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0d00bf8

python-r1.eclass: Enable EAPI 6

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

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 92fa5de..91f0436 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -47,7 +47,7 @@ case "${EAPI:-0}" in
 			die "Unsupported EAPI=${EAPI:-4} (too old, allowed only on restricted set of packages) for ${ECLASS}"
 		fi
 		;;
-	5)
+	5|6)
 		# EAPI=5 is required for sane USE_EXPAND dependencies
 		;;
 	*)

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

[Michał Górny]

commit:     0e20c7bf8e674f69f11e6131e9636682e3d4692e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:44:54 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 13:43:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e20c7bf

distutils-r1.eclass: Use default_src_prepare to apply patches in EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 256c893..f9cff5c 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -312,9 +312,12 @@ _distutils-r1_disable_ez_setup() {
 distutils-r1_python_prepare_all() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	[[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
-
-	epatch_user
+	if [[ ${EAPI} != [45] ]]; then
+		default
+	else
+		[[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
+		epatch_user
+	fi
 
 	# by default, use in-source build if python_prepare() is used
 	if [[ ! ${DISTUTILS_IN_SOURCE_BUILD+1} ]]; then

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

[Michał Górny]

commit:     a7762020c58e7b3133c6ecde85f048095450e7ae
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:28:48 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 13:43:57 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7762020

python-r1.eclass: Fix missing explicit eutils inherit for EAPI < 6

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

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index de83bb5..92fa5de 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -63,6 +63,7 @@ elif [[ ${_PYTHON_ANY_R1} ]]; then
 	die 'python-r1.eclass can not be used with python-any-r1.eclass.'
 fi
 
+[[ ${EAPI} == [45] ]] && inherit eutils
 inherit multibuild python-utils-r1
 
 # @ECLASS-VARIABLE: PYTHON_COMPAT

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

[Michał Górny]

commit:     336e1627bdb580d2f8e542a5deb407f6335c92bd
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:11:24 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 22:33:06 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=336e1627

python-any-r1.eclass: Enable EAPI=6, no changes needed

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

diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
index c00cc3a..b6c2258 100644
--- a/eclass/python-any-r1.eclass
+++ b/eclass/python-any-r1.eclass
@@ -37,8 +37,7 @@
 # https://wiki.gentoo.org/wiki/Project:Python/python-any-r1
 
 case "${EAPI:-0}" in
-	0|1|2|3|4|5)
-		# EAPI=4 needed by python-r1
+	0|1|2|3|4|5|6)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"

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

[Michał Górny]

commit:     21a87fb808d7deb1a9e75bae922ab07fc6beea39
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:41:29 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 22:32:46 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21a87fb8

python-utils-r1.eclass: Ban installation helpers in EAPIs < 5

Ban python_do* and python_new* helpers in EAPIs older than 5. We should
ban them in python-any-r1 uses, actually but that would break
dev-python/pypy* ebuilds as they are written now.

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 4e493ac..e467d27 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -662,6 +662,9 @@ python_newexe() {
 
 	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
 	[[ ${#} -eq 2 ]] || die "Usage: ${FUNCNAME} <path> <new-name>"
+	if [[ ${EAPI:-0} == [01234] ]]; then
+		die "python_do* and python_new* helpers are banned in EAPIs older than 5."
+	fi
 
 	local wrapd=${python_scriptroot:-${DESTTREE}/bin}
 
@@ -789,6 +792,9 @@ python_domodule() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
+	if [[ ${EAPI:-0} == [01234] ]]; then
+		die "python_do* and python_new* helpers are banned in EAPIs older than 5."
+	fi
 
 	local d
 	if [[ ${python_moduleroot} == /* ]]; then
@@ -827,6 +833,9 @@ python_doheader() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
+	if [[ ${EAPI:-0} == [01234] ]]; then
+		die "python_do* and python_new* helpers are banned in EAPIs older than 5."
+	fi
 
 	local d PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR}
 	[[ ${PYTHON_INCLUDEDIR} ]] || python_export PYTHON_INCLUDEDIR

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

[Michał Górny]

commit:     f6211cde420e16d33b0479fd02f60fec1393b918
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:31:10 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 22:32:52 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6211cde

python-utils-r1.eclass: Remove unneeded multilib inherit in EAPI 6

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index e92e9d0..6dbbe6d 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -33,8 +33,8 @@ fi
 
 if [[ ! ${_PYTHON_UTILS_R1} ]]; then
 
-[[ ${EAPI:-0} == [012345] ]] && inherit eutils
-inherit multilib toolchain-funcs
+[[ ${EAPI:-0} == [012345] ]] && inherit eutils multilib
+inherit toolchain-funcs
 
 # @ECLASS-VARIABLE: _PYTHON_ALL_IMPLS
 # @INTERNAL

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

[Michał Górny]

commit:     ce7cb9756510477dc53a5f4d0fb063df296caa0b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:31:41 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 22:33:04 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce7cb975

python-utils-r1.eclass: Enable EAPI 6

 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 83a31b2..581276e 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -20,7 +20,7 @@
 # https://wiki.gentoo.org/wiki/Project:Python/python-utils-r1
 
 case "${EAPI:-0}" in
-	0|1|2|3|4|5)
+	0|1|2|3|4|5|6)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"

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

[Michał Górny]

commit:     1069bc7325f5d7f145bfa5c6a27b53c3ae75e91a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 15:25:49 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 22:33:01 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1069bc73

python-utils-r1.eclass: Move ||die out of command substitution subshells

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 5487158..83a31b2 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -281,12 +281,14 @@ python_export() {
 				# sysconfig can't be used because:
 				# 1) pypy doesn't give site-packages but stdlib
 				# 2) jython gives paths with wrong case
-				export PYTHON_SITEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_lib())' || die)
+				PYTHON_SITEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_lib())') || die
+				export PYTHON_SITEDIR
 				debug-print "${FUNCNAME}: PYTHON_SITEDIR = ${PYTHON_SITEDIR}"
 				;;
 			PYTHON_INCLUDEDIR)
 				[[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it"
-				export PYTHON_INCLUDEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())' || die)
+				PYTHON_INCLUDEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())') || die
+				export PYTHON_INCLUDEDIR
 				debug-print "${FUNCNAME}: PYTHON_INCLUDEDIR = ${PYTHON_INCLUDEDIR}"
 
 				# Jython gives a non-existing directory
@@ -296,7 +298,8 @@ python_export() {
 				;;
 			PYTHON_LIBPATH)
 				[[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it"
-				export PYTHON_LIBPATH=$("${PYTHON}" -c 'import os.path, sysconfig; print(os.path.join(sysconfig.get_config_var("LIBDIR"), sysconfig.get_config_var("LDLIBRARY")) if sysconfig.get_config_var("LDLIBRARY") else "")' || die)
+				PYTHON_LIBPATH=$("${PYTHON}" -c 'import os.path, sysconfig; print(os.path.join(sysconfig.get_config_var("LIBDIR"), sysconfig.get_config_var("LDLIBRARY")) if sysconfig.get_config_var("LDLIBRARY") else "")') || die
+				export PYTHON_LIBPATH
 				debug-print "${FUNCNAME}: PYTHON_LIBPATH = ${PYTHON_LIBPATH}"
 
 				if [[ ! ${PYTHON_LIBPATH} ]]; then
@@ -309,7 +312,7 @@ python_export() {
 				case "${impl}" in
 					python*)
 						# python-2.7, python-3.2, etc.
-						val=$($(tc-getPKG_CONFIG) --cflags ${impl/n/n-} || die)
+						val=$($(tc-getPKG_CONFIG) --cflags ${impl/n/n-}) || die
 						;;
 					*)
 						die "${impl}: obtaining ${var} not supported"
@@ -325,7 +328,7 @@ python_export() {
 				case "${impl}" in
 					python*)
 						# python-2.7, python-3.2, etc.
-						val=$($(tc-getPKG_CONFIG) --libs ${impl/n/n-} || die)
+						val=$($(tc-getPKG_CONFIG) --libs ${impl/n/n-}) || die
 						;;
 					*)
 						die "${impl}: obtaining ${var} not supported"
@@ -341,7 +344,7 @@ python_export() {
 				case "${impl}" in
 					python*)
 						[[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it"
-						flags=$("${PYTHON}" -c 'import sysconfig; print(sysconfig.get_config_var("ABIFLAGS") or "")' || die)
+						flags=$("${PYTHON}" -c 'import sysconfig; print(sysconfig.get_config_var("ABIFLAGS") or "")') || die
 						val=${PYTHON}${flags}-config
 						;;
 					*)

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

[Michał Górny]

commit:     e0ba7f54bbc5d7c9b888b783ab32a02fc62f0701
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 18:44:22 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 22:32:43 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0ba7f54

python-utils-r1.eclass: Replace local INSDESTTREE with subshells

Replace the 'local INSDESTTREE' hacks (which are PMS-valid yet
deprecated) with safer subshells.

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 1cf06e2..4e493ac 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -802,10 +802,10 @@ python_domodule() {
 		d=${PYTHON_SITEDIR#${EPREFIX}}/${python_moduleroot}
 	fi
 
-	local INSDESTTREE
-
-	insinto "${d}"
-	doins -r "${@}" || die
+	(
+		insinto "${d}"
+		doins -r "${@}" || die
+	)
 
 	python_optimize "${ED}/${d}"
 }
@@ -833,10 +833,10 @@ python_doheader() {
 
 	d=${PYTHON_INCLUDEDIR#${EPREFIX}}
 
-	local INSDESTTREE
-
-	insinto "${d}"
-	doins -r "${@}" || die
+	(
+		insinto "${d}"
+		doins -r "${@}" || die
+	)
 }
 
 # @FUNCTION: python_wrapper_setup

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

[Michał Górny]

commit:     6e5294877778fc28f1f89fa4a0be5b50e8c87b92
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:44:27 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 22:32:55 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e529487

python-utils-r1.eclass: Support nonfatal in python_do* and python_new*

 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 6dbbe6d..5693297 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -679,7 +679,7 @@ python_newexe() {
 	(
 		dodir "${wrapd}"
 		exeinto "${d}"
-		newexe "${f}" "${newfn}" || die
+		newexe "${f}" "${newfn}" || return ${?}
 	)
 
 	# install the wrapper
@@ -811,7 +811,7 @@ python_domodule() {
 
 	(
 		insinto "${d}"
-		doins -r "${@}" || die
+		doins -r "${@}" || return ${?}
 	)
 
 	python_optimize "${ED}/${d}"
@@ -845,7 +845,7 @@ python_doheader() {
 
 	(
 		insinto "${d}"
-		doins -r "${@}" || die
+		doins -r "${@}" || return ${?}
 	)
 }
 

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

[Michał Górny]

commit:     a8fe129a0fef28d8782a4752384df3df9e820a29
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:30:10 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 22:32:49 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8fe129a

python-utils-r1.eclass: Make python_fix_shebang QAwarns fatal in EAPI 6

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index e467d27..e92e9d0 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -33,7 +33,8 @@ fi
 
 if [[ ! ${_PYTHON_UTILS_R1} ]]; then
 
-inherit eutils multilib toolchain-funcs
+[[ ${EAPI:-0} == [012345] ]] && inherit eutils
+inherit multilib toolchain-funcs
 
 # @ECLASS-VARIABLE: _PYTHON_ALL_IMPLS
 # @INTERNAL
@@ -1140,12 +1141,17 @@ python_fix_shebang() {
 		done < <(find -H "${path}" -type f "${find_args[@]}" -print0 || die)
 
 		if [[ ! ${any_fixed} ]]; then
-			eqawarn "QA warning: ${FUNCNAME}, ${path#${D}} did not match any fixable files."
+			local cmd=eerror
+			[[ ${EAPI:-0} == [012345] ]] && cmd=eqawarn
+
+			"${cmd}" "QA warning: ${FUNCNAME}, ${path#${D}} did not match any fixable files."
 			if [[ ${any_correct} ]]; then
-				eqawarn "All files have ${EPYTHON} shebang already."
+				"${cmd}" "All files have ${EPYTHON} shebang already."
 			else
-				eqawarn "There are no Python files in specified directory."
+				"${cmd}" "There are no Python files in specified directory."
 			fi
+
+			[[ ${cmd} == eerror ]] && die "${FUNCNAME} did not match any fixable files (QA warning fatal in EAPI ${EAPI})"
 		fi
 	done
 }

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

[Michał Górny]

commit:     adc4bae1b41f13b4b1313e41f4a2d9d8fde6f9bd
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 15:21:40 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 22:32:58 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adc4bae1

python-utils-r1.eclass: Make heredocs consistent

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 5693297..5487158 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -933,11 +933,11 @@ python_wrapper_setup() {
 
 		local x
 		for x in "${nonsupp[@]}"; do
-			cat >"${workdir}"/bin/${x} <<__EOF__ || die
-#!/bin/sh
-echo "${x} is not supported by ${EPYTHON}" >&2
-exit 127
-__EOF__
+			cat >"${workdir}"/bin/${x} <<-_EOF_ || die
+				#!/bin/sh
+				echo "${x} is not supported by ${EPYTHON}" >&2
+				exit 127
+			_EOF_
 			chmod +x "${workdir}"/bin/${x} || die
 		done
 

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

[Michał Górny]

commit:     7bb167ccc62a67950d14cd85c321699863ce20dc
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:41:51 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 22:33:30 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bb167cc

distutils-r1.eclass: esetup.py, respect nonfatal in EAPI 6

 eclass/distutils-r1.eclass | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 185dd4f..256c893 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -236,10 +236,13 @@ fi
 esetup.py() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	local die_args=()
+	[[ ${EAPI} != [45] ]] && die_args+=( -n )
+
 	set -- "${PYTHON:-python}" setup.py "${mydistutilsargs[@]}" "${@}"
 
 	echo "${@}" >&2
-	"${@}" || die
+	"${@}" || die "${die_args[@]}" || return ${?}
 }
 
 # @FUNCTION: distutils_install_for_testing

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

[Michał Górny]

commit:     11c7b35fa2fbeebad7b373ac39a16d3335988514
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:20:59 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 22:33:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11c7b35f

multibuild.eclass: Ban multibuild_parallel_foreach_variant in EAPI 6

 eclass/multibuild.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass
index 3115ac9..0bdbed1 100644
--- a/eclass/multibuild.eclass
+++ b/eclass/multibuild.eclass
@@ -146,6 +146,8 @@ multibuild_foreach_variant() {
 multibuild_parallel_foreach_variant() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}"
+
 	multibuild_foreach_variant "${@}"
 }
 

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

[Michał Górny]

commit:     33b41959ef0c39bba48a16bc23a270838fb8a57a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:27:15 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 22:33:18 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33b41959

python-r1.eclass: Ban python_parallel_foreach_impl in EAPI 6

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

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index d3b4f1d..1531442 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -526,6 +526,8 @@ python_foreach_impl() {
 python_parallel_foreach_impl() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}"
+
 	if [[ ! ${_PYTHON_PARALLEL_WARNED} ]]; then
 		eqawarn "python_parallel_foreach_impl() is no longer meaningful. All runs"
 		eqawarn "are non-parallel now. Please replace the call with python_foreach_impl."

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

[Michał Górny]

commit:     510621cbadf2404a89eef212fa2ee754b57067a8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 22:00:48 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 22:33:48 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=510621cb

distutils-r1.eclass: Make default _all impl call warning fatal in EAPI 6

 eclass/distutils-r1.eclass | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 551bc09..b249985 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -731,7 +731,10 @@ distutils-r1_src_prepare() {
 	fi
 
 	if [[ ! ${_DISTUTILS_DEFAULT_CALLED} ]]; then
-		eqawarn "QA warning: python_prepare_all() didn't call distutils-r1_python_prepare_all"
+		local cmd=die
+		[[ ${EAPI} == [45] ]] && cmd=eqawarn
+
+		"${cmd}" "QA: python_prepare_all() didn't call distutils-r1_python_prepare_all"
 	fi
 
 	if declare -f python_prepare >/dev/null; then
@@ -802,7 +805,10 @@ distutils-r1_src_install() {
 	fi
 
 	if [[ ! ${_DISTUTILS_DEFAULT_CALLED} ]]; then
-		eqawarn "QA warning: python_install_all() didn't call distutils-r1_python_install_all"
+		local cmd=die
+		[[ ${EAPI} == [45] ]] && cmd=eqawarn
+
+		"${cmd}" "QA: python_install_all() didn't call distutils-r1_python_install_all"
 	fi
 }
 

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

[Michał Górny]

commit:     877f653f87560d319329b84faceceb8c1782a485
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:50:57 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 22:33:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=877f653f

distutils-r1.eclass: Ban no-op default phase implementations in EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index f9cff5c..47b09b0 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -343,7 +343,7 @@ distutils-r1_python_prepare_all() {
 distutils-r1_python_prepare() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	:
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI 6 (it was a no-op)"
 }
 
 # @FUNCTION: distutils-r1_python_configure
@@ -352,7 +352,7 @@ distutils-r1_python_prepare() {
 distutils-r1_python_configure() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	:
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI 6 (it was a no-op)"
 }
 
 # @FUNCTION: _distutils-r1_create_setup_cfg

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

[Michał Górny]

commit:     8c8cc1f2a2b4d2ba0a97feaf9d032e85e41f4f76
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:44:54 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 22:33:32 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c8cc1f2

distutils-r1.eclass: Use default_src_prepare to apply patches in EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 256c893..f9cff5c 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -312,9 +312,12 @@ _distutils-r1_disable_ez_setup() {
 distutils-r1_python_prepare_all() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	[[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
-
-	epatch_user
+	if [[ ${EAPI} != [45] ]]; then
+		default
+	else
+		[[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
+		epatch_user
+	fi
 
 	# by default, use in-source build if python_prepare() is used
 	if [[ ! ${DISTUTILS_IN_SOURCE_BUILD+1} ]]; then

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

[Michał Górny]

commit:     7768fdd1023e84ab4e51671cf1efc2ffcf1c8642
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:28:48 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 22:33:24 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7768fdd1

python-r1.eclass: Fix missing explicit eutils inherit for EAPI < 6

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

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index de83bb5..92fa5de 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -63,6 +63,7 @@ elif [[ ${_PYTHON_ANY_R1} ]]; then
 	die 'python-r1.eclass can not be used with python-any-r1.eclass.'
 fi
 
+[[ ${EAPI} == [45] ]] && inherit eutils
 inherit multibuild python-utils-r1
 
 # @ECLASS-VARIABLE: PYTHON_COMPAT

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

[Michał Górny]

commit:     60bdef9faf101fa0570b6e225cc2acc5e350eefb
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:27:52 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 22:33:21 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60bdef9f

python-r1.eclass: Ban python_export_best in EAPI 6

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

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 1531442..de83bb5 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -603,6 +603,8 @@ python_setup() {
 python_export_best() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}"
+
 	eqawarn "python_export_best() is deprecated. Please use python_setup instead,"
 	eqawarn "combined with python_export if necessary."
 

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

[Michał Górny]

commit:     cc38434b594817535ade746efe538f91cffbdbe2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:50:57 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 22:33:38 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc38434b

distutils-r1.eclass: Make pypy/share QA error fatal in EAPI 6

 eclass/distutils-r1.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 47b09b0..e632202 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -563,7 +563,9 @@ distutils-r1_python_install() {
 		fi
 	done
 	if [[ -d ${root}/usr/$(get_libdir)/pypy/share ]]; then
-		eqawarn "Package installs 'share' in PyPy prefix, see bug #465546."
+		local cmd=die
+		[[ ${EAPI} == [45] ]] && cmd=eqawarn
+		"${cmd}" "Package installs 'share' in PyPy prefix, see bug #465546."
 	fi
 
 	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then

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

[Michał Górny]

commit:     04ce6c7ae413ea528c2366464d83c53ca238edb8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:57:04 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 22:33:41 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04ce6c7a

distutils-r1.eclass: Ban EXAMPLES in EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index e632202..1cf2a49 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -150,6 +150,8 @@ fi
 # @ECLASS-VARIABLE: EXAMPLES
 # @DEFAULT_UNSET
 # @DESCRIPTION:
+# OBSOLETE: this variable is deprecated and banned in EAPI 6
+#
 # An array containing examples installed into 'examples' doc
 # subdirectory. The files and directories listed there must exist
 # in the directory from which distutils-r1_python_install_all() is run
@@ -583,6 +585,8 @@ distutils-r1_python_install_all() {
 	einstalldocs
 
 	if declare -p EXAMPLES &>/dev/null; then
+		[[ ${EAPI} != [45] ]] && die "EXAMPLES are banned in EAPI ${EAPI}"
+
 		local INSDESTTREE=/usr/share/doc/${PF}/examples
 		doins -r "${EXAMPLES[@]}"
 		docompress -x "${INSDESTTREE}"

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

[Michał Górny]

commit:     f7080fcde6da4f7361bd6090a24207f61fe1652b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:26:08 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 22:33:15 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7080fcd

multibuild.eclass: Enable EAPI 6

 eclass/multibuild.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass
index 0bdbed1..d21008c 100644
--- a/eclass/multibuild.eclass
+++ b/eclass/multibuild.eclass
@@ -17,7 +17,7 @@ case "${EAPI:-0}" in
 	0|1|2|3)
 		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
 		;;
-	4|5)
+	4|5|6)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"

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

[Michał Górny]

commit:     41b56bcda763bde69b381d637ce85ca975e1f589
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:58:19 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 22:33:45 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41b56bcd

distutils-r1.eclass: Ban DISTUTILS_NO_PARALLEL_BUILD in EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 1cf2a49..551bc09 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -693,6 +693,8 @@ _distutils-r1_run_foreach_impl() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	if [[ ${DISTUTILS_NO_PARALLEL_BUILD} ]]; then
+		[[ ${EAPI} == [45] ]] || die "DISTUTILS_NO_PARALLEL_BUILD is banned in EAPI ${EAPI}"
+
 		eqawarn "DISTUTILS_NO_PARALLEL_BUILD is no longer meaningful. Now all builds"
 		eqawarn "are non-parallel. Please remove it from the ebuild."
 

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

[Michał Górny]

commit:     0ddf0f82368c66f09881de5401db5e8d08f32d80
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:12:38 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 22:33:09 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ddf0f82

python-single-r1.eclass: Enable EAPI=6, no changes needed

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

diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
index 1c27285..d9fc34b 100644
--- a/eclass/python-single-r1.eclass
+++ b/eclass/python-single-r1.eclass
@@ -55,7 +55,7 @@ case "${EAPI:-0}" in
 			die "Unsupported EAPI=${EAPI:-4} (too old, allowed only on restricted set of packages) for ${ECLASS}"
 		fi
 		;;
-	5)
+	5|6)
 		# EAPI=5 is required for sane USE_EXPAND dependencies
 		;;
 	*)

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

[Michał Górny]

commit:     179af13438307fd15abb4ce2ca5ce61746a1ab26
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:29:15 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 22:33:27 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=179af134

python-r1.eclass: Enable EAPI 6

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

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 92fa5de..91f0436 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -47,7 +47,7 @@ case "${EAPI:-0}" in
 			die "Unsupported EAPI=${EAPI:-4} (too old, allowed only on restricted set of packages) for ${ECLASS}"
 		fi
 		;;
-	5)
+	5|6)
 		# EAPI=5 is required for sane USE_EXPAND dependencies
 		;;
 	*)

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

[Michał Górny]

commit:     4dbb1c7807915bd18a4ef7aabc4ee22d0abc6706
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 22:02:39 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 22:33:51 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dbb1c78

distutils-r1.eclass: Remove unnecessary eutils inherit in EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index b249985..7ebcaa5 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -79,7 +79,8 @@ esac
 
 if [[ ! ${_DISTUTILS_R1} ]]; then
 
-inherit eutils toolchain-funcs
+[[ ${EAPI} == [45] ]] && inherit eutils
+inherit toolchain-funcs
 
 if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
 	inherit multiprocessing python-r1

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

[Michał Górny]

commit:     9320a733ed76291f9341f3faa243287903d7843c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 22:02:59 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 22:33:54 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9320a733

distutils-r1.eclass: Enable EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 7ebcaa5..36b3436 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -47,7 +47,7 @@ case "${EAPI:-0}" in
 	0|1|2|3)
 		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
 		;;
-	4|5)
+	4|5|6)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"

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

[Michał Górny]

commit:     d0c97a84e45269fdf7074f46f3d7bdfd754fb61a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:11:24 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 13:05:29 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0c97a84

python-any-r1.eclass: Enable EAPI=6, no changes needed

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

diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
index c00cc3a..b6c2258 100644
--- a/eclass/python-any-r1.eclass
+++ b/eclass/python-any-r1.eclass
@@ -37,8 +37,7 @@
 # https://wiki.gentoo.org/wiki/Project:Python/python-any-r1
 
 case "${EAPI:-0}" in
-	0|1|2|3|4|5)
-		# EAPI=4 needed by python-r1
+	0|1|2|3|4|5|6)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"

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

[Michał Górny]

commit:     430779f2e601cff35b702854e80c7c64b137e851
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 18:31:40 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 13:05:06 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=430779f2

python-utils-r1.eclass: Remove py2.6 note from python_optimize

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 16fc119..4474766 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -567,9 +567,6 @@ python_optimize() {
 	local PYTHON=${PYTHON}
 	[[ ${PYTHON} ]] || python_export PYTHON
 
-	# Note: python2.6 can't handle passing files to compileall...
-	# TODO: we do not support 2.6 any longer
-
 	# default to sys.path
 	if [[ ${#} -eq 0 ]]; then
 		local f

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

[Michał Górny]

commit:     f8e1755f039b44a1dd787080cea6190b5b117976
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:30:10 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 13:05:14 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8e1755f

python-utils-r1.eclass: Make python_fix_shebang QAwarns fatal in EAPI 6

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index d4c38f2..d9cb4ad 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -33,7 +33,8 @@ fi
 
 if [[ ! ${_PYTHON_UTILS_R1} ]]; then
 
-inherit eutils multilib toolchain-funcs
+[[ ${EAPI:-0} == [012345] ]] && inherit eutils
+inherit multilib toolchain-funcs
 
 # @ECLASS-VARIABLE: _PYTHON_ALL_IMPLS
 # @INTERNAL
@@ -1142,12 +1143,17 @@ python_fix_shebang() {
 		done < <(find -H "${path}" -type f -print0 || die)
 
 		if [[ ! ${any_fixed} ]]; then
-			eqawarn "QA warning: ${FUNCNAME}, ${path#${D}} did not match any fixable files."
+			local cmd=eerror
+			[[ ${EAPI:-0} == [012345] ]] && cmd=eqawarn
+
+			"${cmd}" "QA warning: ${FUNCNAME}, ${path#${D}} did not match any fixable files."
 			if [[ ${any_correct} ]]; then
-				eqawarn "All files have ${EPYTHON} shebang already."
+				"${cmd}" "All files have ${EPYTHON} shebang already."
 			else
-				eqawarn "There are no Python files in specified directory."
+				"${cmd}" "There are no Python files in specified directory."
 			fi
+
+			[[ ${cmd} == eerror ]] && die "${FUNCNAME} did not match any fixable files (QA warning fatal in EAPI ${EAPI})"
 		fi
 	done
 }

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

[Michał Górny]

commit:     a852afcfcd1b9a52c22f91d55634cf4a2c398ff0
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:44:27 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 13:05:20 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a852afcf

python-utils-r1.eclass: Support nonfatal in python_do* and python_new*

 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 cb22680..d7b37d0 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -682,7 +682,7 @@ python_newexe() {
 	(
 		dodir "${wrapd}"
 		exeinto "${d}"
-		newexe "${f}" "${newfn}" || die
+		newexe "${f}" "${newfn}" || return ${?}
 	)
 
 	# install the wrapper
@@ -814,7 +814,7 @@ python_domodule() {
 
 	(
 		insinto "${d}"
-		doins -r "${@}" || die
+		doins -r "${@}" || return ${?}
 	)
 
 	python_optimize "${ED}/${d}"
@@ -848,7 +848,7 @@ python_doheader() {
 
 	(
 		insinto "${d}"
-		doins -r "${@}" || die
+		doins -r "${@}" || return ${?}
 	)
 }
 

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

[Michał Górny]

commit:     5e79ead360fd3273237cceaf2f45c3755a275b7f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 19 15:21:40 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 13:05:23 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e79ead3

python-utils-r1.eclass: Make heredocs consistent

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index d7b37d0..ccaacb2 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -936,11 +936,11 @@ python_wrapper_setup() {
 
 		local x
 		for x in "${nonsupp[@]}"; do
-			cat >"${workdir}"/bin/${x} <<__EOF__ || die
-#!/bin/sh
-echo "${x} is not supported by ${EPYTHON}" >&2
-exit 127
-__EOF__
+			cat >"${workdir}"/bin/${x} <<-_EOF_ || die
+				#!/bin/sh
+				echo "${x} is not supported by ${EPYTHON}" >&2
+				exit 127
+			_EOF_
 			chmod +x "${workdir}"/bin/${x} || die
 		done
 

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

[Michał Górny]

commit:     c514e77de192917d9949ae6a7daa141bf5ad7994
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 18:44:22 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 13:05:09 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c514e77d

python-utils-r1.eclass: Replace local INSDESTTREE with subshells

Replace the 'local INSDESTTREE' hacks (which are PMS-valid yet
deprecated) with safer subshells.

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 4474766..58c82bd 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -805,10 +805,10 @@ python_domodule() {
 		d=${PYTHON_SITEDIR#${EPREFIX}}/${python_moduleroot}
 	fi
 
-	local INSDESTTREE
-
-	insinto "${d}"
-	doins -r "${@}" || die
+	(
+		insinto "${d}"
+		doins -r "${@}" || die
+	)
 
 	python_optimize "${ED}/${d}"
 }
@@ -836,10 +836,10 @@ python_doheader() {
 
 	d=${PYTHON_INCLUDEDIR#${EPREFIX}}
 
-	local INSDESTTREE
-
-	insinto "${d}"
-	doins -r "${@}" || die
+	(
+		insinto "${d}"
+		doins -r "${@}" || die
+	)
 }
 
 # @FUNCTION: python_wrapper_setup

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

[Michał Górny]

commit:     1528e78b76c20ffc192b959d9b1301ca49312005
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:31:41 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 13:05:26 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1528e78b

python-utils-r1.eclass: Enable EAPI 6

 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 ccaacb2..f294297 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -20,7 +20,7 @@
 # https://wiki.gentoo.org/wiki/Project:Python/python-utils-r1
 
 case "${EAPI:-0}" in
-	0|1|2|3|4|5)
+	0|1|2|3|4|5|6)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"

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

[Michał Górny]

commit:     252f5f92560f1eb2c824eeecb7f3445c38413db8
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:31:10 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 13:05:17 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=252f5f92

python-utils-r1.eclass: Remove unneeded multilib inherit in EAPI 6

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index d9cb4ad..cb22680 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -33,8 +33,8 @@ fi
 
 if [[ ! ${_PYTHON_UTILS_R1} ]]; then
 
-[[ ${EAPI:-0} == [012345] ]] && inherit eutils
-inherit multilib toolchain-funcs
+[[ ${EAPI:-0} == [012345] ]] && inherit eutils multilib
+inherit toolchain-funcs
 
 # @ECLASS-VARIABLE: _PYTHON_ALL_IMPLS
 # @INTERNAL

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

[Michał Górny]

commit:     357b831b39a9108f1680946b09b8fcf3c82f3a92
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 19:41:29 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 13:05:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=357b831b

python-utils-r1.eclass: Ban installation helpers in EAPIs < 5

Ban python_do* and python_new* helpers in EAPIs older than 5. We should
ban them in python-any-r1 uses, actually but that would break
dev-python/pypy* ebuilds as they are written now.

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

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 58c82bd..d4c38f2 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -665,6 +665,9 @@ python_newexe() {
 
 	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
 	[[ ${#} -eq 2 ]] || die "Usage: ${FUNCNAME} <path> <new-name>"
+	if [[ ${EAPI:-0} == [01234] ]]; then
+		die "python_do* and python_new* helpers are banned in EAPIs older than 5."
+	fi
 
 	local wrapd=${python_scriptroot:-${DESTTREE}/bin}
 
@@ -792,6 +795,9 @@ python_domodule() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
+	if [[ ${EAPI:-0} == [01234] ]]; then
+		die "python_do* and python_new* helpers are banned in EAPIs older than 5."
+	fi
 
 	local d
 	if [[ ${python_moduleroot} == /* ]]; then
@@ -830,6 +836,9 @@ python_doheader() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	[[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
+	if [[ ${EAPI:-0} == [01234] ]]; then
+		die "python_do* and python_new* helpers are banned in EAPIs older than 5."
+	fi
 
 	local d PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR}
 	[[ ${PYTHON_INCLUDEDIR} ]] || python_export PYTHON_INCLUDEDIR

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

[Michał Górny]

commit:     454fde9b8fa191e7fe3cafe7988e32a58244d545
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:27:15 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 13:05:40 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=454fde9b

python-r1.eclass: Ban python_parallel_foreach_impl in EAPI 6

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

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index d3b4f1d..1531442 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -526,6 +526,8 @@ python_foreach_impl() {
 python_parallel_foreach_impl() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}"
+
 	if [[ ! ${_PYTHON_PARALLEL_WARNED} ]]; then
 		eqawarn "python_parallel_foreach_impl() is no longer meaningful. All runs"
 		eqawarn "are non-parallel now. Please replace the call with python_foreach_impl."

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

[Michał Górny]

commit:     ca5b5498d1df37e87684824714ab392b8d64c377
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:57:04 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 13:06:04 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca5b5498

distutils-r1.eclass: Ban EXAMPLES in EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index e632202..1cf2a49 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -150,6 +150,8 @@ fi
 # @ECLASS-VARIABLE: EXAMPLES
 # @DEFAULT_UNSET
 # @DESCRIPTION:
+# OBSOLETE: this variable is deprecated and banned in EAPI 6
+#
 # An array containing examples installed into 'examples' doc
 # subdirectory. The files and directories listed there must exist
 # in the directory from which distutils-r1_python_install_all() is run
@@ -583,6 +585,8 @@ distutils-r1_python_install_all() {
 	einstalldocs
 
 	if declare -p EXAMPLES &>/dev/null; then
+		[[ ${EAPI} != [45] ]] && die "EXAMPLES are banned in EAPI ${EAPI}"
+
 		local INSDESTTREE=/usr/share/doc/${PF}/examples
 		doins -r "${EXAMPLES[@]}"
 		docompress -x "${INSDESTTREE}"

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

[Michał Górny]

commit:     4c2f63ea7c704fc6b5d0a9860b5ba97dfa020ca2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:58:19 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 13:06:07 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c2f63ea

distutils-r1.eclass: Ban DISTUTILS_NO_PARALLEL_BUILD in EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 1cf2a49..551bc09 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -693,6 +693,8 @@ _distutils-r1_run_foreach_impl() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	if [[ ${DISTUTILS_NO_PARALLEL_BUILD} ]]; then
+		[[ ${EAPI} == [45] ]] || die "DISTUTILS_NO_PARALLEL_BUILD is banned in EAPI ${EAPI}"
+
 		eqawarn "DISTUTILS_NO_PARALLEL_BUILD is no longer meaningful. Now all builds"
 		eqawarn "are non-parallel. Please remove it from the ebuild."
 

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

[Michał Górny]

commit:     e2faf80a2031d745740f0597a321099e2fcd50bc
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:29:15 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 13:05:49 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2faf80a

python-r1.eclass: Enable EAPI 6

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

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 92fa5de..91f0436 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -47,7 +47,7 @@ case "${EAPI:-0}" in
 			die "Unsupported EAPI=${EAPI:-4} (too old, allowed only on restricted set of packages) for ${ECLASS}"
 		fi
 		;;
-	5)
+	5|6)
 		# EAPI=5 is required for sane USE_EXPAND dependencies
 		;;
 	*)

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

[Michał Górny]

commit:     361298b8e23b44dfdb87e9833a90722941fcd081
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:27:52 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 13:05:43 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=361298b8

python-r1.eclass: Ban python_export_best in EAPI 6

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

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 1531442..de83bb5 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -603,6 +603,8 @@ python_setup() {
 python_export_best() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}"
+
 	eqawarn "python_export_best() is deprecated. Please use python_setup instead,"
 	eqawarn "combined with python_export if necessary."
 

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

[Michał Górny]

commit:     1648d92354c64321910312929678f136d28a0114
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 22:00:48 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 13:06:10 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1648d923

distutils-r1.eclass: Make default _all impl call warning fatal in EAPI 6

 eclass/distutils-r1.eclass | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 551bc09..b249985 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -731,7 +731,10 @@ distutils-r1_src_prepare() {
 	fi
 
 	if [[ ! ${_DISTUTILS_DEFAULT_CALLED} ]]; then
-		eqawarn "QA warning: python_prepare_all() didn't call distutils-r1_python_prepare_all"
+		local cmd=die
+		[[ ${EAPI} == [45] ]] && cmd=eqawarn
+
+		"${cmd}" "QA: python_prepare_all() didn't call distutils-r1_python_prepare_all"
 	fi
 
 	if declare -f python_prepare >/dev/null; then
@@ -802,7 +805,10 @@ distutils-r1_src_install() {
 	fi
 
 	if [[ ! ${_DISTUTILS_DEFAULT_CALLED} ]]; then
-		eqawarn "QA warning: python_install_all() didn't call distutils-r1_python_install_all"
+		local cmd=die
+		[[ ${EAPI} == [45] ]] && cmd=eqawarn
+
+		"${cmd}" "QA: python_install_all() didn't call distutils-r1_python_install_all"
 	fi
 }
 

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

[Michał Górny]

commit:     fdd4c884ace634ebf3ba40d1e6118487afb09cb4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:44:54 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 13:05:55 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdd4c884

distutils-r1.eclass: Use default_src_prepare to apply patches in EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 256c893..f9cff5c 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -312,9 +312,12 @@ _distutils-r1_disable_ez_setup() {
 distutils-r1_python_prepare_all() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	[[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
-
-	epatch_user
+	if [[ ${EAPI} != [45] ]]; then
+		default
+	else
+		[[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
+		epatch_user
+	fi
 
 	# by default, use in-source build if python_prepare() is used
 	if [[ ! ${DISTUTILS_IN_SOURCE_BUILD+1} ]]; then

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

[Michał Górny]

commit:     9b74f5ccba169a3c4c48c2607c1a1144821d1b70
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:50:57 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 13:06:01 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b74f5cc

distutils-r1.eclass: Make pypy/share QA error fatal in EAPI 6

 eclass/distutils-r1.eclass | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 47b09b0..e632202 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -563,7 +563,9 @@ distutils-r1_python_install() {
 		fi
 	done
 	if [[ -d ${root}/usr/$(get_libdir)/pypy/share ]]; then
-		eqawarn "Package installs 'share' in PyPy prefix, see bug #465546."
+		local cmd=die
+		[[ ${EAPI} == [45] ]] && cmd=eqawarn
+		"${cmd}" "Package installs 'share' in PyPy prefix, see bug #465546."
 	fi
 
 	if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then

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

[Michał Górny]

commit:     ee209ef12544ebde6e8e2cdd8acd669f5e38287d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:28:48 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 13:05:46 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee209ef1

python-r1.eclass: Fix missing explicit eutils inherit for EAPI < 6

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

diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index de83bb5..92fa5de 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -63,6 +63,7 @@ elif [[ ${_PYTHON_ANY_R1} ]]; then
 	die 'python-r1.eclass can not be used with python-any-r1.eclass.'
 fi
 
+[[ ${EAPI} == [45] ]] && inherit eutils
 inherit multibuild python-utils-r1
 
 # @ECLASS-VARIABLE: PYTHON_COMPAT

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

[Michał Górny]

commit:     87c45d813ecb7c35f914a8fd08379b70d8d099cd
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:20:59 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 13:05:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87c45d81

multibuild.eclass: Ban multibuild_parallel_foreach_variant in EAPI 6

 eclass/multibuild.eclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass
index 3115ac9..0bdbed1 100644
--- a/eclass/multibuild.eclass
+++ b/eclass/multibuild.eclass
@@ -146,6 +146,8 @@ multibuild_foreach_variant() {
 multibuild_parallel_foreach_variant() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI ${EAPI}"
+
 	multibuild_foreach_variant "${@}"
 }
 

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

[Michał Górny]

commit:     3776886ad5abe3d023537b4fbcf733d9d4178f32
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:50:57 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 13:05:58 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3776886a

distutils-r1.eclass: Ban no-op default phase implementations in EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index f9cff5c..47b09b0 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -343,7 +343,7 @@ distutils-r1_python_prepare_all() {
 distutils-r1_python_prepare() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	:
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI 6 (it was a no-op)"
 }
 
 # @FUNCTION: distutils-r1_python_configure
@@ -352,7 +352,7 @@ distutils-r1_python_prepare() {
 distutils-r1_python_configure() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	:
+	[[ ${EAPI} == [45] ]] || die "${FUNCNAME} is banned in EAPI 6 (it was a no-op)"
 }
 
 # @FUNCTION: _distutils-r1_create_setup_cfg

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

[Michał Górny]

commit:     c1f4f07d1375c236090ef7a765981c362ff1472e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:26:08 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 13:05:37 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1f4f07d

multibuild.eclass: Enable EAPI 6

 eclass/multibuild.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/multibuild.eclass b/eclass/multibuild.eclass
index 0bdbed1..d21008c 100644
--- a/eclass/multibuild.eclass
+++ b/eclass/multibuild.eclass
@@ -17,7 +17,7 @@ case "${EAPI:-0}" in
 	0|1|2|3)
 		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
 		;;
-	4|5)
+	4|5|6)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"

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

[Michał Górny]

commit:     e6c3a7094a246046704aa5096804c7cb93ed2b51
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:12:38 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 13:05:32 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6c3a709

python-single-r1.eclass: Enable EAPI=6, no changes needed

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

diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
index 1c27285..d9fc34b 100644
--- a/eclass/python-single-r1.eclass
+++ b/eclass/python-single-r1.eclass
@@ -55,7 +55,7 @@ case "${EAPI:-0}" in
 			die "Unsupported EAPI=${EAPI:-4} (too old, allowed only on restricted set of packages) for ${ECLASS}"
 		fi
 		;;
-	5)
+	5|6)
 		# EAPI=5 is required for sane USE_EXPAND dependencies
 		;;
 	*)

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

[Michał Górny]

commit:     7fd3ed4f55066912b1b5452e977d8ff215aae56a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 21:41:51 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 13:05:52 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fd3ed4f

distutils-r1.eclass: esetup.py, respect nonfatal in EAPI 6

 eclass/distutils-r1.eclass | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 185dd4f..256c893 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -236,10 +236,13 @@ fi
 esetup.py() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	local die_args=()
+	[[ ${EAPI} != [45] ]] && die_args+=( -n )
+
 	set -- "${PYTHON:-python}" setup.py "${mydistutilsargs[@]}" "${@}"
 
 	echo "${@}" >&2
-	"${@}" || die
+	"${@}" || die "${die_args[@]}" || return ${?}
 }
 
 # @FUNCTION: distutils_install_for_testing

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

[Michał Górny]

commit:     ff2e81869155a0d5264917ece2980ba1c5dbc34c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 22:02:59 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 13:06:15 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff2e8186

distutils-r1.eclass: Enable EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 7ebcaa5..36b3436 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -47,7 +47,7 @@ case "${EAPI:-0}" in
 	0|1|2|3)
 		die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}"
 		;;
-	4|5)
+	4|5|6)
 		;;
 	*)
 		die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}"

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

[Michał Górny]

commit:     bd5ef26c9fa675547fdccc3462beca02404d8d3d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 22:02:39 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 13:06:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd5ef26c

distutils-r1.eclass: Remove unnecessary eutils inherit in EAPI 6

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

diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index b249985..7ebcaa5 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -79,7 +79,8 @@ esac
 
 if [[ ! ${_DISTUTILS_R1} ]]; then
 
-inherit eutils toolchain-funcs
+[[ ${EAPI} == [45] ]] && inherit eutils
+inherit toolchain-funcs
 
 if [[ ! ${DISTUTILS_SINGLE_IMPL} ]]; then
 	inherit multiprocessing python-r1