Diff rust-1.35.0 with a rust-1.36.0

/usr/portage/dev-lang/rust/rust-1.36.0.ebuild 2019-10-02 22:09:00.000000000 +0300
18 18
	SLOT="stable/${ABI_VER}"
19 19
	MY_P="rustc-${PV}"
20 20
	SRC="${MY_P}-src.tar.xz"
21
	KEYWORDS="~amd64 arm64 ~ppc64 ~x86"
21
	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
22 22
fi
23 23

  
24
RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).2"
24
RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
25 25

  
26 26
DESCRIPTION="Systems programming language from Mozilla"
27 27
HOMEPAGE="https://www.rust-lang.org/"
......
89 89

  
90 90
PATCHES=(
91 91
	"${FILESDIR}"/0001-llvm-cmake-Add-additional-headers-only-if-they-exist.patch
92
	"${FILESDIR}"/1.34.2-fix-custom-libdir.patch
92 93
	"${FILESDIR}"/1.35.0-revert-commits-triggering-multiple-llvm-rebuilds.patch
93
	"${FILESDIR}"/1.34.0-libressl.patch # bug 684224
94
	"${FILESDIR}"/1.36.0-libressl.patch
94 95
)
95 96

  
96 97
S="${WORKDIR}/${MY_P}-src"
......
126 127

  
127 128
	"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig --destdir="${rust_stage0_root}" --prefix=/ || die
128 129

  
129
	# ugly hack for https://bugs.gentoo.org/679806
130
	# we have to keep it until we switch to 1.35.x bootstrap tarball.
131
	if use ppc64; then
132
		sed -i 's/getentropy/gEtEnTrOpY/g' "${rust_stage0_root}"/bin/cargo || die
133
		export OPENSSL_ppccap=0
134
	fi
135

  
136 130
	default
137 131
}
138 132

  
......
269 263
		fi
270 264
		abi_libdir=$(get_abi_LIBDIR ${v##*.})
271 265
		rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
272
		mkdir -p "${ED}/usr/${abi_libdir}"
266
		mkdir -p "${ED}/usr/${abi_libdir}/${P}"
273 267
		cp "${ED}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/lib"/*.so \
274
		   "${ED}/usr/${abi_libdir}" || die
268
		   "${ED}/usr/${abi_libdir}/${P}" || die
275 269
	done
276 270

  
277
	# temp fix for https://bugs.gentoo.org/672816
278
	# FIXME: this should handle libdir=lib, not exact arches
279
	if { use x86 || use arm; }; then
280
		local rust_target wrongdir rightdir
281
		rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
282
		wrongdir="${ED}/usr/$(get_libdir)/${P}/${P}/rustlib/${rust_target}/codegen-backends"
283
		rightdir="${ED}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/codegen-backends"
284
		if [[ -e ${wrongdir}/librustc_codegen_llvm-llvm.so ]]; then
285
			einfo "fixing bug #672816"
286
			mv "${wrongdir}" "${rightdir}" || die
287
			rm -r "${ED}/usr/$(get_libdir)/${P}/${P}" || die
288
		fi
289
	fi # end temp fix
290

  
291 271
	dodoc COPYRIGHT
292 272

  
293 273
	# FIXME:
......
339 319
	if has_version app-editors/gvim || has_version app-editors/vim; then
340 320
		elog "install app-vim/rust-vim to get vim support for rust."
341 321
	fi
342

  
343
	if has_version 'app-shells/zsh'; then
344
		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
345
	fi
346 322
}
347 323

  
348 324
pkg_postrm() {
349
	eselect rust unset --if-invalid
325
	eselect rust cleanup
350 326
}
Thank you!