gentoo resync : 15.12.2019

1 files changed, 189 insertions, 132 deletions

diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
index 8ac17b7815e2..f042bf4e1167 100644
--- a/eclass/python-single-r1.eclass
+++ b/eclass/python-single-r1.eclass
@@ -12,12 +12,17 @@
 # @DESCRIPTION:
 # An extension of the python-r1 eclass suite for packages which
 # don't support being installed for multiple Python implementations.
-# This mostly includes tools embedding Python.
+# This mostly includes tools embedding Python and packages using foreign
+# build systems.
 #
-# This eclass extends the IUSE and REQUIRED_USE set by python-r1
-# to request the PYTHON_SINGLE_TARGET when the inheriting ebuild
-# can be supported by more than one Python implementation. It also
-# replaces PYTHON_USEDEP and PYTHON_DEPS with a more suitable form.
+# This eclass sets correct IUSE.  It also provides PYTHON_DEPS
+# and PYTHON_REQUIRED_USE that need to be added to appropriate ebuild
+# metadata variables.
+#
+# The eclass exports PYTHON_SINGLE_USEDEP that is suitable for depending
+# on other packages using the eclass.  Dependencies on packages using
+# python-r1 should be created via python_gen_cond_dep() function,
+# using PYTHON_MULTI_USEDEP placeholder.
 #
 # Please note that packages support multiple Python implementations
 # (using python-r1 eclass) can not depend on packages not supporting
@@ -136,6 +141,9 @@ EXPORT_FUNCTIONS pkg_setup
 
 # @ECLASS-VARIABLE: PYTHON_USEDEP
 # @DESCRIPTION:
+# DEPRECATED.  Use PYTHON_SINGLE_USEDEP or python_gen_cond_dep with
+# PYTHON_MULTI_USEDEP placeholder instead.
+#
 # This is an eclass-generated USE-dependency string which can be used to
 # depend on another Python package being built for the same Python
 # implementations.
@@ -154,6 +162,43 @@ EXPORT_FUNCTIONS pkg_setup
 # python_targets_python2_7(-)?,python_single_target_python3_4(+)?
 # @CODE
 
+# @ECLASS-VARIABLE: PYTHON_SINGLE_USEDEP
+# @DESCRIPTION:
+# This is an eclass-generated USE-dependency string which can be used to
+# depend on another python-single-r1 package being built for the same
+# Python implementations.
+#
+# If you need to depend on a multi-impl (python-r1) package, use
+# python_gen_cond_dep with PYTHON_MULTI_USEDEP placeholder instead.
+#
+# Example use:
+# @CODE
+# RDEPEND="dev-python/foo[${PYTHON_SINGLE_USEDEP}]"
+# @CODE
+#
+# Example value:
+# @CODE
+# python_single_target_python3_4(-)?
+# @CODE
+
+# @ECLASS-VARIABLE: PYTHON_MULTI_USEDEP
+# @DESCRIPTION:
+# This is a placeholder variable supported by python_gen_cond_dep,
+# in order to depend on python-r1 packages built for the same Python
+# implementations.
+#
+# Example use:
+# @CODE
+# RDEPEND="$(python_gen_cond_dep '
+#     dev-python/foo[${PYTHON_MULTI_USEDEP}]
+#   ')"
+# @CODE
+#
+# Example value:
+# @CODE
+# python_targets_python3_4(-)
+# @CODE
+
 # @ECLASS-VARIABLE: PYTHON_REQUIRED_USE
 # @DESCRIPTION:
 # This is an eclass-generated required-use expression which ensures the following
@@ -179,58 +224,42 @@ EXPORT_FUNCTIONS pkg_setup
 _python_single_set_globals() {
 	_python_set_impls
 
-	local i PYTHON_PKG_DEP
-
 	local flags_mt=( "${_PYTHON_SUPPORTED_IMPLS[@]/#/python_targets_}" )
 	local flags=( "${_PYTHON_SUPPORTED_IMPLS[@]/#/python_single_target_}" )
 	local unflags=( "${_PYTHON_UNSUPPORTED_IMPLS[@]/#/-python_single_target_}" )
 
-	local optflags=${flags_mt[@]/%/(-)?},${unflags[@]/%/(-)}
-
-	IUSE="${flags_mt[*]}"
-
-	local deps requse usedep
 	if [[ ${#_PYTHON_SUPPORTED_IMPLS[@]} -eq 1 ]]; then
-		# There is only one supported implementation; set IUSE and other
-		# variables without PYTHON_SINGLE_TARGET.
-		requse=${flags_mt[*]}
-		python_export "${_PYTHON_SUPPORTED_IMPLS[0]}" PYTHON_PKG_DEP
-		deps="${flags_mt[*]}? ( ${PYTHON_PKG_DEP} ) "
-		# Force on the python_single_target_* flag for this impl, so
-		# that any dependencies that inherit python-single-r1 and
-		# happen to have multiple implementations will still need
-		# to bound by the implementation used by this package.
-		optflags+=,${flags[0]/%/(+)}
-	else
-		# Multiple supported implementations; honor PYTHON_SINGLE_TARGET.
-		IUSE+=" ${flags[*]}"
-		requse="^^ ( ${flags[*]} )"
-		# Ensure deps honor the same python_single_target_* flag as is set
-		# on this package.
-		optflags+=,${flags[@]/%/(+)?}
-
-		for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
-			# The chosen targets need to be in PYTHON_TARGETS as well.
-			# This is in order to enforce correct dependencies on packages
-			# supporting multiple implementations.
-			requse+=" python_single_target_${i}? ( python_targets_${i} )"
-
-			python_export "${i}" PYTHON_PKG_DEP
-			deps+="python_single_target_${i}? ( ${PYTHON_PKG_DEP} ) "
-		done
-	fi
-	usedep=${optflags// /,}
-
-	# 1) well, python-exec would suffice as an RDEP
-	# but no point in making this overcomplex, BDEP doesn't hurt anyone
-	# 2) python-exec should be built with all targets forced anyway
-	# but if new targets were added, we may need to force a rebuild
-	if [[ ${_PYTHON_WANT_PYTHON_EXEC2} == 0 ]]; then
-		die "python-exec:0 is no longer supported, please fix your ebuild to work with python-exec:2"
+		# if only one implementation is supported, use IUSE defaults
+		# to avoid requesting the user to enable it
+		IUSE="+${flags_mt[0]} +${flags[0]}"
 	else
-		deps+=">=dev-lang/python-exec-2:=[${usedep}]"
+		IUSE="${flags_mt[*]} ${flags[*]}"
 	fi
 
+	local requse="^^ ( ${flags[*]} )"
+	local optflags="${flags_mt[@]/%/(-)?},${unflags[@]/%/(-)},${flags[@]/%/(+)?}"
+	local usedep="${optflags// /,}"
+	local single_flags="${flags[@]/%/(-)?}"
+	local single_usedep=${single_flags// /,}
+
+	local deps= i PYTHON_PKG_DEP
+	for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
+		# The chosen targets need to be in PYTHON_TARGETS as well.
+		# This is in order to enforce correct dependencies on packages
+		# supporting multiple implementations.
+		requse+=" python_single_target_${i}? ( python_targets_${i} )"
+
+		python_export "${i}" PYTHON_PKG_DEP
+		# 1) well, python-exec would suffice as an RDEP
+		# but no point in making this overcomplex, BDEP doesn't hurt anyone
+		# 2) python-exec should be built with all targets forced anyway
+		# but if new targets were added, we may need to force a rebuild
+		deps+="python_single_target_${i}? (
+			${PYTHON_PKG_DEP}
+			>=dev-lang/python-exec-2:=[python_targets_${i}]
+		) "
+	done
+
 	if [[ ${PYTHON_DEPS+1} ]]; then
 		if [[ ${PYTHON_DEPS} != "${deps}" ]]; then
 			eerror "PYTHON_DEPS have changed between inherits (PYTHON_REQ_USE?)!"
@@ -253,11 +282,20 @@ _python_single_set_globals() {
 			eerror "Now   : ${usedep}"
 			die "PYTHON_USEDEP integrity check failed"
 		fi
+
+		if [[ ${PYTHON_SINGLE_USEDEP} != "${single_usedep}" ]]; then
+			eerror "PYTHON_SINGLE_USEDEP have changed between inherits!"
+			eerror "Before: ${PYTHON_SINGLE_USEDEP}"
+			eerror "Now   : ${single_usedep}"
+			die "PYTHON_SINGLE_USEDEP integrity check failed"
+		fi
 	else
 		PYTHON_DEPS=${deps}
 		PYTHON_REQUIRED_USE=${requse}
 		PYTHON_USEDEP=${usedep}
-		readonly PYTHON_DEPS PYTHON_REQUIRED_USE PYTHON_USEDEP
+		PYTHON_SINGLE_USEDEP=${single_usedep}
+		readonly PYTHON_DEPS PYTHON_REQUIRED_USE PYTHON_USEDEP \
+			PYTHON_SINGLE_USEDEP
 	fi
 }
 _python_single_set_globals
@@ -265,9 +303,61 @@ unset -f _python_single_set_globals
 
 if [[ ! ${_PYTHON_SINGLE_R1} ]]; then
 
+# @FUNCTION: _python_gen_usedep
+# @INTERNAL
+# @USAGE: <-s|-u> [<pattern>...]
+# @DESCRIPTION:
+# Output a USE dependency string for Python implementations which
+# are both in PYTHON_COMPAT and match any of the patterns passed
+# as parameters to the function.
+#
+# The first argument specifies USE-dependency type: '-s' for new-style
+# PYTHON_SINGLE_USEDEP, '-u' for backwards-compatible PYTHON_USEDEP.
+#
+# The patterns can be either fnmatch-style patterns (matched via bash
+# == operator against PYTHON_COMPAT values) or '-2' / '-3' to indicate
+# appropriately all enabled Python 2/3 implementations (alike
+# python_is_python3). Remember to escape or quote the fnmatch patterns
+# to prevent accidental shell filename expansion.
+#
+# This is an internal function used to implement python_gen_cond_dep
+# and deprecated python_gen_usedep.
+_python_gen_usedep() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	local mode=${1}
+	shift
+	local impl matches=()
+
+	for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
+		if _python_impl_matches "${impl}" "${@}"; then
+			case ${mode} in
+				-s)
+					matches+=(
+						"python_single_target_${impl}(-)?"
+					)
+					;;
+				-u)
+					matches+=(
+						"python_targets_${impl}(-)?"
+						"python_single_target_${impl}(+)?"
+					)
+				;;
+			esac
+		fi
+	done
+
+	[[ ${matches[@]} ]] || die "No supported implementations match python_gen_usedep patterns: ${@}"
+
+	local out=${matches[@]}
+	echo "${out// /,}"
+}
+
 # @FUNCTION: python_gen_usedep
 # @USAGE: <pattern> [...]
 # @DESCRIPTION:
+# DEPRECATED.  Please use python_gen_cond_dep instead.
+#
 # Output a USE dependency string for Python implementations which
 # are both in PYTHON_COMPAT and match any of the patterns passed
 # as parameters to the function.
@@ -295,25 +385,16 @@ if [[ ! ${_PYTHON_SINGLE_R1} ]]; then
 python_gen_usedep() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	local impl matches=()
-
-	for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
-		if _python_impl_matches "${impl}" "${@}"; then
-			matches+=(
-				"python_targets_${impl}(-)?"
-				"python_single_target_${impl}(+)?"
-			)
-		fi
-	done
-
-	[[ ${matches[@]} ]] || die "No supported implementations match python_gen_usedep patterns: ${@}"
-
-	local out=${matches[@]}
-	echo "${out// /,}"
+	# output only once, during some reasonable phase
+	# (avoid spamming cache regen runs)
+	if [[ ${EBUILD_PHASE} == setup ]]; then
+		eqawarn "python_gen_usedep() is deprecated. Please use python_gen_cond_dep instead."
+	fi
+	_python_gen_usedep -u "${@}"
 }
 
 # @FUNCTION: python_gen_useflags
-# @USAGE: <pattern> [...]
+# @USAGE: [<pattern>...]
 # @DESCRIPTION:
 # Output a list of USE flags for Python implementations which
 # are both in PYTHON_COMPAT and match any of the patterns passed
@@ -338,17 +419,11 @@ python_gen_usedep() {
 python_gen_useflags() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	local flag_prefix impl matches=()
-
-	if [[ ${#_PYTHON_SUPPORTED_IMPLS[@]} -eq 1 ]]; then
-		flag_prefix=python_targets
-	else
-		flag_prefix=python_single_target
-	fi
+	local impl matches=()
 
 	for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
 		if _python_impl_matches "${impl}" "${@}"; then
-			matches+=( "${flag_prefix}_${impl}" )
+			matches+=( "python_single_target_${impl}" )
 		fi
 	done
 
@@ -356,7 +431,7 @@ python_gen_useflags() {
 }
 
 # @FUNCTION: python_gen_cond_dep
-# @USAGE: <dependency> <pattern> [...]
+# @USAGE: <dependency> [<pattern>...]
 # @DESCRIPTION:
 # Output a list of <dependency>-ies made conditional to USE flags
 # of Python implementations which are both in PYTHON_COMPAT and match
@@ -369,7 +444,8 @@ python_gen_useflags() {
 # to prevent accidental shell filename expansion.
 #
 # In order to enforce USE constraints on the packages, verbatim
-# '${PYTHON_USEDEP}' (quoted!) may be placed in the dependency
+# '${PYTHON_USEDEP}', '${PYTHON_SINGLE_USEDEP}'
+# and '${PYTHON_MULTI_USEDEP}' (quoted!) may be placed in the dependency
 # specification. It will get expanded within the function into a proper
 # USE dependency string.
 #
@@ -377,7 +453,7 @@ python_gen_useflags() {
 # @CODE
 # PYTHON_COMPAT=( python{2_7,3_{3,4}} pypy )
 # RDEPEND="$(python_gen_cond_dep \
-#   'dev-python/unittest2[${PYTHON_USEDEP}]' python2_7 pypy )"
+#   'dev-python/unittest2[${PYTHON_MULTI_USEDEP}]' python2_7 pypy )"
 # @CODE
 #
 # It will cause the variable to look like:
@@ -390,13 +466,7 @@ python_gen_useflags() {
 python_gen_cond_dep() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	local flag_prefix impl matches=()
-
-	if [[ ${#_PYTHON_SUPPORTED_IMPLS[@]} -eq 1 ]]; then
-		flag_prefix=python_targets
-	else
-		flag_prefix=python_single_target
-	fi
+	local impl matches=()
 
 	local dep=${1}
 	shift
@@ -407,11 +477,17 @@ python_gen_cond_dep() {
 			# (since python_gen_usedep() will not return ${PYTHON_USEDEP}
 			#  the code is run at most once)
 			if [[ ${dep} == *'${PYTHON_USEDEP}'* ]]; then
-				local usedep=$(python_gen_usedep "${@}")
+				local usedep=$(_python_gen_usedep -u "${@}")
 				dep=${dep//\$\{PYTHON_USEDEP\}/${usedep}}
 			fi
+			if [[ ${dep} == *'${PYTHON_SINGLE_USEDEP}'* ]]; then
+				local usedep=$(_python_gen_usedep -s "${@}")
+				dep=${dep//\$\{PYTHON_SINGLE_USEDEP\}/${usedep}}
+			fi
+			local multi_usedep="python_targets_${impl}(-)"
 
-			matches+=( "${flag_prefix}_${impl}? ( ${dep} )" )
+			matches+=( "python_single_target_${impl}? (
+				${dep//\$\{PYTHON_MULTI_USEDEP\}/${multi_usedep}} )" )
 		fi
 	done
 
@@ -455,24 +531,17 @@ python_gen_cond_dep() {
 python_gen_impl_dep() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	local impl pattern
+	local impl
 	local matches=()
 
-	if [[ ${#_PYTHON_SUPPORTED_IMPLS[@]} -eq 1 ]]; then
-		flag_prefix=python_targets
-	else
-		flag_prefix=python_single_target
-	fi
-
 	local PYTHON_REQ_USE=${1}
 	shift
 
-	local patterns=( "${@-*}" )
 	for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
-		if _python_impl_matches "${impl}" "${patterns[@]}"; then
+		if _python_impl_matches "${impl}" "${@}"; then
 			local PYTHON_PKG_DEP
 			python_export "${impl}" PYTHON_PKG_DEP
-			matches+=( "${flag_prefix}_${impl}? ( ${PYTHON_PKG_DEP} )" )
+			matches+=( "python_single_target_${impl}? ( ${PYTHON_PKG_DEP} )" )
 		fi
 	done
 
@@ -505,47 +574,35 @@ python_setup() {
 		return
 	fi
 
-	if [[ ${#_PYTHON_SUPPORTED_IMPLS[@]} -eq 1 ]]; then
-		if use "python_targets_${_PYTHON_SUPPORTED_IMPLS[0]}"; then
-			# Only one supported implementation, enable it explicitly
-			python_export "${_PYTHON_SUPPORTED_IMPLS[0]}" EPYTHON PYTHON
+	local impl
+	for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
+		if use "python_single_target_${impl}"; then
+			if [[ ${EPYTHON} ]]; then
+				eerror "Your PYTHON_SINGLE_TARGET setting lists more than a single Python"
+				eerror "implementation. Please set it to just one value. If you need"
+				eerror "to override the value for a single package, please use package.env"
+				eerror "or an equivalent solution (man 5 portage)."
+				echo
+				die "More than one implementation in PYTHON_SINGLE_TARGET."
+			fi
+
+			if ! use "python_targets_${impl}"; then
+				eerror "The implementation chosen as PYTHON_SINGLE_TARGET must be added"
+				eerror "to PYTHON_TARGETS as well. This is in order to ensure that"
+				eerror "dependencies are satisfied correctly. We're sorry"
+				eerror "for the inconvenience."
+				echo
+				die "Build target (${impl}) not in PYTHON_TARGETS."
+			fi
+
+			python_export "${impl}" EPYTHON PYTHON
 			python_wrapper_setup
 		fi
-	else
-		local impl
-		for impl in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
-			if use "python_single_target_${impl}"; then
-				if [[ ${EPYTHON} ]]; then
-					eerror "Your PYTHON_SINGLE_TARGET setting lists more than a single Python"
-					eerror "implementation. Please set it to just one value. If you need"
-					eerror "to override the value for a single package, please use package.env"
-					eerror "or an equivalent solution (man 5 portage)."
-					echo
-					die "More than one implementation in PYTHON_SINGLE_TARGET."
-				fi
-
-				if ! use "python_targets_${impl}"; then
-					eerror "The implementation chosen as PYTHON_SINGLE_TARGET must be added"
-					eerror "to PYTHON_TARGETS as well. This is in order to ensure that"
-					eerror "dependencies are satisfied correctly. We're sorry"
-					eerror "for the inconvenience."
-					echo
-					die "Build target (${impl}) not in PYTHON_TARGETS."
-				fi
-
-				python_export "${impl}" EPYTHON PYTHON
-				python_wrapper_setup
-			fi
-		done
-	fi
+	done
 
 	if [[ ! ${EPYTHON} ]]; then
 		eerror "No Python implementation selected for the build. Please set"
-		if [[ ${#_PYTHON_SUPPORTED_IMPLS[@]} -eq 1 ]]; then
-			eerror "the PYTHON_TARGETS variable in your make.conf to include one"
-		else
-			eerror "the PYTHON_SINGLE_TARGET variable in your make.conf to one"
-		fi
+		eerror "the PYTHON_SINGLE_TARGET variable in your make.conf to one"
 		eerror "of the following values:"
 		eerror
 		eerror "${_PYTHON_SUPPORTED_IMPLS[@]}"