--- /usr/portage/dev-lang/rust-bin/rust-bin-1.15.1.ebuild	2017-02-10 00:18:31.000000000 +0100
+++ /usr/local/portage/dev-lang/rust-bin/rust-bin-1.15.1.ebuild	2017-02-23 12:04:28.651120306 +0100
@@ -2,16 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit eutils bash-completion-r1
+inherit eutils bash-completion-r1 rust-toolchain
 
 MY_P="rust-${PV}"
 
 DESCRIPTION="Systems programming language from Mozilla"
 HOMEPAGE="http://www.rust-lang.org/"
-SRC_URI="amd64? ( http://static.rust-lang.org/dist/${MY_P}-x86_64-unknown-linux-gnu.tar.gz )
-	x86? ( http://static.rust-lang.org/dist/${MY_P}-i686-unknown-linux-gnu.tar.gz )"
+SRC_URI="$(rust_all_arch_uris http://static.rust-lang.org/dist/${MY_P})"
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 SLOT="stable"
@@ -33,10 +32,7 @@
 src_unpack() {
 	default
 
-	local postfix
-	use amd64 && postfix=x86_64-unknown-linux-gnu
-	use x86 && postfix=i686-unknown-linux-gnu
-	mv "${WORKDIR}/${MY_P}-${postfix}" "${S}" || die
+	mv "${WORKDIR}/${MY_P}-$(rust_abi)" "${S}" || die
 }
 
 src_install() {