From 032a3dbb5d4ea63ec6c2ceb39c067ea6424b5792 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 20 Jan 2020 19:28:42 +0000
Subject: gentoo resync : 20.01.2020

---
 eclass/Manifest.gz           | Bin 36962 -> 36966 bytes
 eclass/rust-toolchain.eclass |  70 +++++++++++++++++++++----------------------
 2 files changed, 35 insertions(+), 35 deletions(-)

(limited to 'eclass')

diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index de2585ad8c52..029557a853b5 100644
Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ
diff --git a/eclass/rust-toolchain.eclass b/eclass/rust-toolchain.eclass
index 6a559842f07f..304ee9052457 100644
--- a/eclass/rust-toolchain.eclass
+++ b/eclass/rust-toolchain.eclass
@@ -33,22 +33,22 @@ inherit multilib-build
 # environment if none is specified.
 
 rust_abi() {
-  local CTARGET=${1:-${CHOST}}
-  case ${CTARGET%%*-} in
-    aarch64*)     echo aarch64-unknown-linux-gnu;;
-    mips64*)      echo mips64-unknown-linux-gnuabi64;;
-    powerpc64le*) echo powerpc64le-unknown-linux-gnu;;
-    powerpc64*)   echo powerpc64-unknown-linux-gnu;;
-    x86_64*)      echo x86_64-unknown-linux-gnu;;
-    armv6j*s*)    echo arm-unknown-linux-gnueabi;;
-    armv6j*h*)    echo arm-unknown-linux-gnueabihf;;
-    armv7a*h*)    echo armv7-unknown-linux-gnueabihf;;
-    i?86*)        echo i686-unknown-linux-gnu;;
-    mipsel*)      echo mipsel-unknown-linux-gnu;;
-    mips*)        echo mips-unknown-linux-gnu;;
-    powerpc*)     echo powerpc-unknown-linux-gnu;;
-    s390x*)       echo s390x-unknown-linux-gnu;;
-    *)            echo ${CTARGET};;
+	local CTARGET=${1:-${CHOST}}
+	case ${CTARGET%%*-} in
+		aarch64*)	  echo aarch64-unknown-linux-gnu;;
+		mips64*)	  echo mips64-unknown-linux-gnuabi64;;
+		powerpc64le*) echo powerpc64le-unknown-linux-gnu;;
+		powerpc64*)   echo powerpc64-unknown-linux-gnu;;
+		x86_64*)	  echo x86_64-unknown-linux-gnu;;
+		armv6j*s*)	  echo arm-unknown-linux-gnueabi;;
+		armv6j*h*)	  echo arm-unknown-linux-gnueabihf;;
+		armv7a*h*)	  echo armv7-unknown-linux-gnueabihf;;
+		i?86*)		  echo i686-unknown-linux-gnu;;
+		mipsel*)	  echo mipsel-unknown-linux-gnu;;
+		mips*)		  echo mips-unknown-linux-gnu;;
+		powerpc*)	  echo powerpc-unknown-linux-gnu;;
+		s390x*)		  echo s390x-unknown-linux-gnu;;
+		*)			  echo ${CTARGET};;
   esac
 }
 
@@ -56,18 +56,18 @@ rust_abi() {
 # @DESCRIPTION:
 # Outputs a list of all the enabled Rust ABIs
 rust_all_abis() {
-  if use multilib; then
-    local abi
-    local ALL_ABIS=()
-    for abi in $(multilib_get_enabled_abis); do
-      ALL_ABIS+=( $(rust_abi $(get_abi_CHOST ${abi})) )
-    done
-    local abi_list
-    IFS=, eval 'abi_list=${ALL_ABIS[*]}'
-    echo ${abi_list}
-  else
-    rust_abi
-  fi
+	if use multilib; then
+		local abi
+		local ALL_ABIS=()
+		for abi in $(multilib_get_enabled_abis); do
+			ALL_ABIS+=( $(rust_abi $(get_abi_CHOST ${abi})) )
+		done
+		local abi_list
+		IFS=, eval 'abi_list=${ALL_ABIS[*]}'
+		echo ${abi_list}
+	else
+		rust_abi
+	fi
 }
 
 # @FUNCTION: rust_arch_uri
@@ -79,22 +79,22 @@ rust_all_abis() {
 #
 # @EXAMPLE:
 # SRC_URI="amd64? (
-#    $(rust_arch_uri x86_64-unknown-linux-gnu rustc-${STAGE0_VERSION})
+#	 $(rust_arch_uri x86_64-unknown-linux-gnu rustc-${STAGE0_VERSION})
 # )"
 #
 rust_arch_uri() {
-  if [ -n "$3" ]; then
-    echo "${RUST_TOOLCHAIN_BASEURL}${2}-${1}.tar.xz -> ${3}-${1}.tar.xz"
-  else
-    echo "${RUST_TOOLCHAIN_BASEURL}${2}-${1}.tar.xz"
-  fi
+	if [ -n "$3" ]; then
+		echo "${RUST_TOOLCHAIN_BASEURL}${2}-${1}.tar.xz -> ${3}-${1}.tar.xz"
+	else
+		echo "${RUST_TOOLCHAIN_BASEURL}${2}-${1}.tar.xz"
+	fi
 }
 
 # @FUNCTION: rust_all_arch_uris
 # @USAGE: <base-uri> [alt-distfile-basename]
 # @DESCRIPTION:
 # Outputs the URIs for SRC_URI to help fetch dependencies, using a base URI
-# provided as an argument.  Optionally allows for distfile renaming via a specified
+# provided as an argument. Optionally allows for distfile renaming via a specified
 # basename.
 #
 # @EXAMPLE:
-- 
cgit v1.2.3