--- a/dev-lang/rust/rust-1.44.1.ebuild
+++ b/dev-lang/rust/rust-1.44.1.ebuild
@@ -58,14 +58,26 @@
 "
 LLVM_MAX_SLOT=10
 
-BOOTSTRAP_DEPEND="|| ( >=dev-lang/rust-1.$(($(ver_cut 2) - 1)) >=dev-lang/rust-bin-1.$(($(ver_cut 2) - 1)) )"
+BDEPEND="
+	>=app-eselect/eselect-rust-20190311
+	system-bootstrap? (
+		|| (
+			>=dev-lang/rust-1.$(($(ver_cut 2) - 1))
+			>=dev-lang/rust-bin-1.$(($(ver_cut 2) - 1))
+		)
+	)
+	!system-llvm? (
+		dev-util/cmake
+		dev-util/ninja
+	)
+"
 
 # libgit2 should be at least same as bundled into libgit-sys #707746
 COMMON_DEPEND="
 	>=dev-libs/libgit2-0.99:=
 	net-libs/libssh2:=
 	net-libs/http-parser:=
-	net-misc/curl:=[ssl]
+	net-misc/curl:=[http2,ssl]
 	sys-libs/zlib:=
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
@@ -81,11 +93,6 @@ DEPEND="${COMMON_DEPEND}
 		>=sys-devel/gcc-4.7
 		>=sys-devel/clang-3.5
 	)
-	system-bootstrap? ( ${BOOTSTRAP_DEPEND}	)
-	!system-llvm? (
-		dev-util/cmake
-		dev-util/ninja
-	)
 "
 
 RDEPEND="${COMMON_DEPEND}
@@ -222,7 +229,7 @@ src_configure() {
 		experimental-targets = ""
 		link-shared = $(toml_usex system-llvm)
 		[build]
-		build = "${rust_target}"
+		build = "$(rust_abi "${CBUILD}")"
 		host = ["${rust_target}"]
 		target = [${rust_targets}]
 		cargo = "${rust_stage0_root}/bin/cargo"
@@ -266,6 +273,7 @@ src_configure() {
 		src-tarball = false
 	EOF
 
+	echo "CFLAGS_$(rust_abi "${CBUILD}")=-O2" >> "${S}"/config.env
 	for v in $(multilib_get_enabled_abi_pairs); do
 		rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
 		arch_cflags="$(get_abi_CFLAGS ${v##*.})"
@@ -276,10 +284,11 @@ src_configure() {
 
 		cat <<- EOF >> "${S}"/config.toml
 			[target.${rust_target}]
-			cc = "$(tc-getBUILD_CC)"
-			cxx = "$(tc-getBUILD_CXX)"
+			cc = "$(tc-getCC)"
+			cxx = "$(tc-getCXX)"
 			linker = "$(tc-getCC)"
 			ar = "$(tc-getAR)"
+			ranlib = "$(tc-getRANLIB)"
 		EOF
 		# librustc_target/spec/linux_musl_base.rs sets base.crt_static_default = true;
 		if use elibc_musl; then
@@ -346,6 +355,7 @@ src_configure() {
 			cxx = "${cross_toolchain}-g++"
 			linker = "${cross_toolchain}-gcc"
 			ar = "${cross_toolchain}-ar"
+			ranlib = "${cross_toolchain}-ranlib"
 		EOF
 		if use system-llvm; then
 			cat <<- EOF >> "${S}"/config.toml