eclass/python-multilib{,-utils}-r1: best->native

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

2 files changed, 11 insertions, 11 deletions

diff --git a/eclass/python-multilib-r1.eclass b/eclass/python-multilib-r1.eclass
index b5192bb..481fa27 100644
--- a/eclass/python-multilib-r1.eclass
+++ b/eclass/python-multilib-r1.eclass
@@ -691,7 +691,7 @@ _python_obtain_impls() {
 
 	MULTIBUILD_VARIANTS=()
 
-	local impl ml_impl best_ml_abi=$(multilib_get_best_abi)
+	local impl ml_impl best_ml_abi=$(multilib_get_native_abi)
 	for impl in "${_PYTHON_ACTIVE_NOMULTILIB_IMPL_CACHE}" ; do
 		for ml_impl in "${_PYTHON_ACTIVE_MULTILIB_IMPL_CACHE}" ; do
 			if [[ $(_python_strip_multilib_impl_abi ${ml_impl}) == ${impl} ]] ; then
diff --git a/eclass/python-multilib-utils-r1.eclass b/eclass/python-multilib-utils-r1.eclass
index 959fc60..294ff8e 100644
--- a/eclass/python-multilib-utils-r1.eclass
+++ b/eclass/python-multilib-utils-r1.eclass
@@ -154,8 +154,8 @@ _PYTHON_NOMULTILIB_HISTORICAL_IMPLS=(
 #  (mips_n32 mips_n64 mips_o32 x86_32 x86_64 x86_x32)
 # @CODE@
 #
-# During ebuild phases other than depend, the best abi is placed
-# last in this list; this may be exploited to create best-abi-last
+# During ebuild phases other than depend, the native abi is placed
+# last in this list; this may be exploited to create native-abi-last
 # lists where convenient.  During the depend phase, the ordering
 # is arbitrary, so this must not be exploited for cached metadata
 # generation.
@@ -221,14 +221,14 @@ _generate-python-multilib-utils-r1_globals() {
 	)
 	if [[ ${EBUILD_PHASE} != depend ]] ; then
 		# put the most preferred _CACHED_MULTILIB_FLAG last in the list
-		# if the best abi isn't represented there, we don't care, as
+		# if the native abi isn't represented there, we don't care, as
 		# we are not affected by it.
 		_CACHED_MULTILIB_FLAGS=(
 			$(
 				found=
 				# we dont have the mappings cached yet -- so use multilib_flag_abi
 				# note that we havent yet stripped off the abi_ part.
-				bestabiflag="$(multilib_abi_flag "$(multilib_get_best_abi)")"
+				bestabiflag="$(multilib_abi_flag "$(multilib_get_native_abi)")"
 				for flag in "${_CACHED_MULTILIB_FLAGS[@]}" ; do
 					if [[ ${flag} == ${bestabiflag} ]]; then
 						found=1
@@ -677,7 +677,7 @@ epythonize() {
 		bestabi="default"
 		all_abis=( $(get_multilib_build_abis --dependmode) )
 	else
-		bestabi=$(multilib_get_best_abi)
+		bestabi=$(multilib_get_native_abi)
 		all_abis=( $(multilib_get_enabled_abis) )
 	fi
 	local implmap implmap_impl implmap_epython scratch_abi
@@ -731,7 +731,7 @@ epythonize() {
 		# a partial match: we suspect ${scratch_abi} of being a usable multilib abi
 		if [[ ${scratch_abi} == ${bestabi} ]] ; then
 			echo "${implmap_epython}"
-			debug-print "${FUNCNAME}: result (best abi): ${implmap_epython}"
+			debug-print "${FUNCNAME}: result (native abi): ${implmap_epython}"
 			return 0
 		elif [[ " ${all_abis[*]} " == *" ${scratch_abi} "* ]] ; then
 			# scratch_abi is a valid non-best-multilib-abi; so just prepend nomultilib EPYTHON
@@ -821,7 +821,7 @@ _python_impl_abi() {
 	[[ ${impl} ]] || die "${FUNCNAME}: ${1} is not a recognizable impl"
 	local simpl=$(_python_strip_multilib_epython_abi "${impl}")
 	if [[ ${impl} == ${simpl} ]] ; then
-		echo "$(multilib_get_best_abi)"
+		echo "$(multilib_get_native_abi)"
 	else
 		echo "${impl#${simpl}-}"
 	fi
@@ -836,7 +836,7 @@ _python_impl_abi() {
 # The optional first parameter may specify the requested Python
 # implementation (either as PYTHON_TARGETS_MULTILIB value, e.g.
 # python2_7_x86, a PYTHON_TARGETS value, e.g. python2_7, or an
-# EPYTHON one, e.g. python2.7-x86, or, for the best abi, e.g.
+# EPYTHON one, e.g. python2.7-x86, or, for the native abi, e.g.
 # python2.7 or python2.7-${DEFAULT_ABI} would be equivalent).
 #
 # If no implementation is passed, the current one will be obtained from
@@ -856,7 +856,7 @@ python_export() {
 	if [[ ${EBUILD_PHASE} == depend ]]; then
 		bestabi=default
 	else
-		bestabi=$(multilib_get_best_abi)
+		bestabi=$(multilib_get_native_abi)
 	fi
 
 	impl=$(epythonize ${1})
@@ -1257,7 +1257,7 @@ python_get_scriptdir() {
 #
 # If --nomultilib or -n is specified (and, no, I guess this API doesn't
 # support files with those names), then all the files on the command-line
-# after that point will receive best-abi-only shebangs.  So for example if
+# after that point will receive native-abi-only shebangs.  So for example if
 # your ABI is amd64, but the multilib ABI is x32 at the moment, and
 # EPYTHON="pypy3.3-x86_x32", absolutely none of that will matter, you'll still
 # end up with shebangs ending in just "pypy3.3", just like in the old