Gentoo Archives: gentoo-commits

From: Mikhail Pukhlikov <cynede@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: virtual/rust/, dev-lang/rust/
Date: Wed, 27 Jun 2018 14:12:28
Message-Id: 1530108731.79cdcd1f0a81f5224b79fdda2193c9a9af35d553.cynede@gentoo
1 commit: 79cdcd1f0a81f5224b79fdda2193c9a9af35d553
2 Author: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 27 14:10:51 2018 +0000
4 Commit: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 27 14:12:11 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79cdcd1f
7
8 dev-lang/rust: bump to 1.27.0
9 drop some old versions
10 virtual/rust: bump to 1.27.0
11 update EAPI to 7
12
13 dev-lang/rust/Manifest | 6 +-
14 dev-lang/rust/rust-1.26.0.ebuild | 181 -----------------
15 dev-lang/rust/rust-1.26.1.ebuild | 221 ---------------------
16 .../{rust-1.26.0-r3.ebuild => rust-1.27.0.ebuild} | 27 ++-
17 virtual/rust/rust-1.26.1.ebuild | 15 --
18 .../{rust-1.26.0.ebuild => rust-1.27.0.ebuild} | 4 +-
19 6 files changed, 26 insertions(+), 428 deletions(-)
20
21 diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
22 index 4522591cc25..01a3f45e06b 100644
23 --- a/dev-lang/rust/Manifest
24 +++ b/dev-lang/rust/Manifest
25 @@ -4,7 +4,9 @@ DIST rust-1.24.0-x86_64-unknown-linux-gnu.tar.gz 199663002 BLAKE2B 2373637eb4410
26 DIST rust-1.25.0-aarch64-unknown-linux-gnu.tar.xz 83752132 BLAKE2B a0d49238ccaa3547764c07a215a0e02c813ae18cd6aca3baae1d9a10dee87d73526552b7ff6e4936ec414794d1143041aa8f92d244e2e4fe5aaefcb12a6dcb0a SHA512 404ecd4dc1e49fba41d7ade947877f621aa762e43eb5a8f604823fe297e8023f095cd449610240ed235723baaac96064eb38445794e27708edcdbca998d939e3
27 DIST rust-1.25.0-i686-unknown-linux-gnu.tar.xz 102453124 BLAKE2B 8986ebab6a7a9d00f716541484e0cfd4f33ca592880097217e718cb79cae77aad8ecaf6856f72386d2419b4dcc0d99425fb37f72b4830d6a20a74166f2c534d0 SHA512 75ad5cb5e00fabc24aaa46236cc6f2193a7543fd0944c0717c11a56d9c420d20463ad683558d86f5d42abacfb89d15f9cabf404c912a5e24a28e6716c8003e8f
28 DIST rust-1.25.0-x86_64-unknown-linux-gnu.tar.xz 111059260 BLAKE2B ae982976a735c2b5226722207a983bb638cb7c0cb0ceb6b438456d54fac86a5d1892b535f01ac463157205c0ae27ae876482f6ac1fa269a9ec3e1177be0cef2e SHA512 aea93ff64f620a1dd6b48d07ec3dcbc126b2f5c17b4697c096ec8cd02a3c7dfec7ae7d5df70a55eceb372897ad12f3d01c67d5aaea0167a80270931c61323f78
29 +DIST rust-1.26.2-aarch64-unknown-linux-gnu.tar.xz 90964988 BLAKE2B 7e5de737ff2b4711e0a5b3085f10c3f2918fc5823dcb52bc5f897a5617b65d648d5e59664dbfaa904ff08923d1bbd11aae21349760fefef6ff18ea0e45391e07 SHA512 b565ec988d3b946dabc8902eba60b446070e77b7c27aa98d981b7ba5e9285bda95565627600e6be057970de5006d9640ef77fa920849160f5cf98508b48d1673
30 +DIST rust-1.26.2-i686-unknown-linux-gnu.tar.xz 143090096 BLAKE2B 7871fa4e4d0f320ff949cd31cefa116bc7b741927626958e1d10197f05fc9a662b8d6c21ddd4d2910700e6f7273e4fc18738e6ff58cd85b9af4ed25eceea31d9 SHA512 859b5b72c78cca8cd473012599ca12539ef9a5ee38d1aaaad024019fd84220e344e1cd0efd2b027ef333555b158b23529f35ceb5d59d76c35e7946b5fe4a8a52
31 +DIST rust-1.26.2-x86_64-unknown-linux-gnu.tar.xz 138609432 BLAKE2B 54507a8ce3ab2676e6e66852b6d3f1a47ca07ad4b56383f6247149309a0f60f67fbf0a6ba27d968c24340c07d7d5074942c6eaccbc1207c5e75fd9a6f47b2481 SHA512 29e474b0eab4dd2ffa0b964d83f52ffce530e75c4193e307410ef6d20ef9ad2b300a4f467bdf06b3311157340e9295cb9b1efdcf08dafee66979b076c2afba7e
32 DIST rustc-1.25.0-src.tar.gz 98639156 BLAKE2B 1408d5dd0611d4830de3b6b3d00e3fad4198a47599b639d0ac0bd05aaba401f743056a942e9df04a4d192c6b12e8cfe9a9cdf8cd26e48b72104ce9b423df049e SHA512 7d8886f4d5a621eb794e814deb60be681fa38cf086f87ffa14e5a3500c640b237c549a632de1331a0f1b71963de41f6d31a4df3866b7e597424002316fed81ce
33 -DIST rustc-1.26.0-src.tar.xz 54613664 BLAKE2B 798985e4060c28828066118f39fc296e52b3796ae02f3917912680154047eb6f91806b3d45f3a0e9afcef55d95cea3079debae12d2ddf2d9c46f992e12519094 SHA512 563b910ecf4b2a0d798a1201177f733333e64efad49e5aceec5adc66a8c6903df391c9afc0fdd8284348c08082e0c4de1e5cb68efe6797594de43ca93e4ad7a2
34 -DIST rustc-1.26.1-src.tar.xz 54604108 BLAKE2B 73e14d835812a42f32342732db448294c98e5cfdcb76b4a5d11085bef6302ae340abadba564c38319882b558df6dbe826ed73347229599f2f8718085a6cdbe10 SHA512 219b8d4dbc1aa087422d8227de8a6be10c0579fd9d1aae83af0a0305baf2c3a72222c6bdca8635c550b5b754d08a7a5b03b81b8b28019b23250327be1c7f8b00
35 DIST rustc-1.26.2-src.tar.xz 54613640 BLAKE2B f361b7a0ed40ccb026750b4a70b99931f1abf52024e907b588e339902de2fbbd15501d237ac048d0537005834b0a2f49935f654a8c75d40ed95c65894f611481 SHA512 a598858ddce0e05d1d431be383400f44fc551eb2e368f37b01670c0b65ea5da6a7d5b2b68bb6ef806d2107cfa0d5007008442ad4d5ddb17d18d04e0ab31600b0
36 +DIST rustc-1.27.0-src.tar.xz 55455772 BLAKE2B 5c1b26a3e8c6e45aaa43b3ccb5819089cf03c32807ac1adc46ec4f9ff8cf803ec444587ccb737b5d701c4ef5fa634fc4c89de3d71e6202b64ec125f986e54ffd SHA512 b80af48c637741add1d2846e6e3153b0125fb22ed587036fb9d27ad3961419af64802aa91a79258277b1be20718281558989ea0283db0c482fe1512354ba79d8
37
38 diff --git a/dev-lang/rust/rust-1.26.0.ebuild b/dev-lang/rust/rust-1.26.0.ebuild
39 deleted file mode 100644
40 index c9210192141..00000000000
41 --- a/dev-lang/rust/rust-1.26.0.ebuild
42 +++ /dev/null
43 @@ -1,181 +0,0 @@
44 -# Copyright 1999-2018 Gentoo Foundation
45 -# Distributed under the terms of the GNU General Public License v2
46 -
47 -EAPI=6
48 -
49 -PYTHON_COMPAT=( python{2_7,3_5,3_6} )
50 -
51 -inherit multiprocessing python-any-r1 versionator toolchain-funcs
52 -
53 -if [[ ${PV} = *beta* ]]; then
54 - betaver=${PV//*beta}
55 - BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
56 - MY_P="rustc-beta"
57 - SLOT="beta/${PV}"
58 - SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz"
59 - KEYWORDS=""
60 -else
61 - ABI_VER="$(get_version_component_range 1-2)"
62 - SLOT="stable/${ABI_VER}"
63 - MY_P="rustc-${PV}"
64 - SRC="${MY_P}-src.tar.xz"
65 - KEYWORDS="~amd64 ~arm64 ~x86"
66 -fi
67 -
68 -CHOST_amd64=x86_64-unknown-linux-gnu
69 -CHOST_x86=i686-unknown-linux-gnu
70 -CHOST_arm64=aarch64-unknown-linux-gnu
71 -
72 -RUST_STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).0"
73 -RUST_STAGE0_amd64="rust-${RUST_STAGE0_VERSION}-${CHOST_amd64}"
74 -RUST_STAGE0_x86="rust-${RUST_STAGE0_VERSION}-${CHOST_x86}"
75 -RUST_STAGE0_arm64="rust-${RUST_STAGE0_VERSION}-${CHOST_arm64}"
76 -
77 -CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
78 -
79 -DESCRIPTION="Systems programming language from Mozilla"
80 -HOMEPAGE="https://www.rust-lang.org/"
81 -
82 -SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz
83 - amd64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_amd64}.tar.xz )
84 - x86? ( https://static.rust-lang.org/dist/${RUST_STAGE0_x86}.tar.xz )
85 - arm64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_arm64}.tar.xz )
86 -"
87 -
88 -ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
89 - NVPTX PowerPC Sparc SystemZ X86 XCore )
90 -ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
91 -LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
92 -
93 -LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
94 -
95 -IUSE="debug doc extended +jemalloc ${ALL_LLVM_TARGETS[*]}"
96 -
97 -RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
98 - jemalloc? ( dev-libs/jemalloc )"
99 -DEPEND="${RDEPEND}
100 - ${PYTHON_DEPS}
101 - || (
102 - >=sys-devel/gcc-4.7
103 - >=sys-devel/clang-3.5
104 - )
105 - dev-util/cmake
106 -"
107 -PDEPEND="!extended? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
108 -
109 -REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
110 -
111 -S="${WORKDIR}/${MY_P}-src"
112 -
113 -toml_usex() {
114 - usex "$1" true false
115 -}
116 -
117 -src_prepare() {
118 - local rust_stage0_root="${WORKDIR}"/rust-stage0
119 -
120 - local rust_stage0_name="RUST_STAGE0_${ARCH}"
121 - local rust_stage0="${!rust_stage0_name}"
122 -
123 - "${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig --destdir="${rust_stage0_root}" --prefix=/ || die
124 -
125 - default
126 -}
127 -
128 -src_configure() {
129 - local rust_stage0_root="${WORKDIR}"/rust-stage0
130 -
131 - local rust_target_name="CHOST_${ARCH}"
132 - local rust_target="${!rust_target_name}"
133 -
134 - cat <<- EOF > "${S}"/config.toml
135 - [llvm]
136 - optimize = $(toml_usex !debug)
137 - release-debuginfo = $(toml_usex debug)
138 - assertions = $(toml_usex debug)
139 - targets = "${LLVM_TARGETS// /;}"
140 - [build]
141 - build = "${rust_target}"
142 - host = ["${rust_target}"]
143 - target = ["${rust_target}"]
144 - cargo = "${rust_stage0_root}/bin/cargo"
145 - rustc = "${rust_stage0_root}/bin/rustc"
146 - docs = $(toml_usex doc)
147 - submodules = false
148 - python = "${EPYTHON}"
149 - locked-deps = true
150 - vendor = true
151 - verbose = 2
152 - extended = $(toml_usex extended)
153 - [install]
154 - prefix = "${EPREFIX}/usr"
155 - libdir = "$(get_libdir)"
156 - docdir = "share/doc/${P}"
157 - mandir = "share/${P}/man"
158 - [rust]
159 - optimize = $(toml_usex !debug)
160 - debuginfo = $(toml_usex debug)
161 - debug-assertions = $(toml_usex debug)
162 - use-jemalloc = $(toml_usex jemalloc)
163 - default-linker = "$(tc-getCC)"
164 - rpath = false
165 - [target.${rust_target}]
166 - cc = "$(tc-getBUILD_CC)"
167 - cxx = "$(tc-getBUILD_CXX)"
168 - linker = "$(tc-getCC)"
169 - ar = "$(tc-getAR)"
170 - EOF
171 -}
172 -
173 -src_compile() {
174 - ./x.py build --verbose --config="${S}"/config.toml -j$(makeopts_jobs) || die
175 -}
176 -
177 -src_install() {
178 - env DESTDIR="${D}" ./x.py install || die
179 -
180 - mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
181 - mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
182 - mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die
183 - mv "${D}/usr/bin/rust-lldb" "${D}/usr/bin/rust-lldb-${PV}" || die
184 -
185 - dodoc COPYRIGHT
186 -
187 - cat <<-EOF > "${T}"/50${P}
188 - LDPATH="/usr/$(get_libdir)/${P}"
189 - MANPATH="/usr/share/${P}/man"
190 - EOF
191 - doenvd "${T}"/50${P}
192 -
193 - cat <<-EOF > "${T}/provider-${P}"
194 - /usr/bin/rustdoc
195 - /usr/bin/rust-gdb
196 - /usr/bin/rust-lldb
197 - EOF
198 - dodir /etc/env.d/rust
199 - insinto /etc/env.d/rust
200 - doins "${T}/provider-${P}"
201 -}
202 -
203 -pkg_postinst() {
204 - eselect rust update --if-unset
205 -
206 - elog "Rust installs a helper script for calling GDB and LLDB,"
207 - elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
208 -
209 - if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
210 - elog "install app-emacs/rust-mode to get emacs support for rust."
211 - fi
212 -
213 - if has_version app-editors/gvim || has_version app-editors/vim; then
214 - elog "install app-vim/rust-vim to get vim support for rust."
215 - fi
216 -
217 - if has_version 'app-shells/zsh'; then
218 - elog "install app-shells/rust-zshcomp to get zsh completion for rust."
219 - fi
220 -}
221 -
222 -pkg_postrm() {
223 - eselect rust unset --if-invalid
224 -}
225
226 diff --git a/dev-lang/rust/rust-1.26.1.ebuild b/dev-lang/rust/rust-1.26.1.ebuild
227 deleted file mode 100644
228 index 2508fbe3ee3..00000000000
229 --- a/dev-lang/rust/rust-1.26.1.ebuild
230 +++ /dev/null
231 @@ -1,221 +0,0 @@
232 -# Copyright 1999-2018 Gentoo Foundation
233 -# Distributed under the terms of the GNU General Public License v2
234 -
235 -EAPI=6
236 -
237 -PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
238 -
239 -inherit multiprocessing multilib-build python-any-r1 versionator toolchain-funcs
240 -
241 -if [[ ${PV} = *beta* ]]; then
242 - betaver=${PV//*beta}
243 - BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
244 - MY_P="rustc-beta"
245 - SLOT="beta/${PV}"
246 - SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz"
247 - KEYWORDS=""
248 -else
249 - ABI_VER="$(get_version_component_range 1-2)"
250 - SLOT="stable/${ABI_VER}"
251 - MY_P="rustc-${PV}"
252 - SRC="${MY_P}-src.tar.xz"
253 - KEYWORDS="~amd64 ~arm64 ~x86"
254 -fi
255 -
256 -CHOST_amd64=x86_64-unknown-linux-gnu
257 -CHOST_x86=i686-unknown-linux-gnu
258 -CHOST_arm64=aarch64-unknown-linux-gnu
259 -
260 -RUST_STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).0"
261 -RUST_STAGE0_amd64="rust-${RUST_STAGE0_VERSION}-${CHOST_amd64}"
262 -RUST_STAGE0_x86="rust-${RUST_STAGE0_VERSION}-${CHOST_x86}"
263 -RUST_STAGE0_arm64="rust-${RUST_STAGE0_VERSION}-${CHOST_arm64}"
264 -
265 -CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
266 -
267 -DESCRIPTION="Systems programming language from Mozilla"
268 -HOMEPAGE="https://www.rust-lang.org/"
269 -
270 -SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz
271 - amd64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_amd64}.tar.xz )
272 - x86? ( https://static.rust-lang.org/dist/${RUST_STAGE0_x86}.tar.xz )
273 - arm64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_arm64}.tar.xz )
274 -"
275 -
276 -ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
277 - NVPTX PowerPC Sparc SystemZ X86 XCore )
278 -ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
279 -LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
280 -
281 -LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
282 -
283 -IUSE="debug doc extended +jemalloc ${ALL_LLVM_TARGETS[*]}"
284 -
285 -RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
286 - jemalloc? ( dev-libs/jemalloc )"
287 -DEPEND="${RDEPEND}
288 - ${PYTHON_DEPS}
289 - || (
290 - >=sys-devel/gcc-4.7
291 - >=sys-devel/clang-3.5
292 - )
293 - dev-util/cmake
294 -"
295 -PDEPEND="!extended? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
296 -
297 -REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
298 -
299 -S="${WORKDIR}/${MY_P}-src"
300 -
301 -toml_usex() {
302 - usex "$1" true false
303 -}
304 -
305 -src_prepare() {
306 - local rust_stage0_root="${WORKDIR}"/rust-stage0
307 -
308 - local rust_stage0_name="RUST_STAGE0_${ARCH}"
309 - local rust_stage0="${!rust_stage0_name}"
310 -
311 - "${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig --destdir="${rust_stage0_root}" --prefix=/ || die
312 -
313 - default
314 -}
315 -
316 -src_configure() {
317 - local rust_target="" rust_targets="" rust_target_name arch_cflags
318 -
319 - # Collect rust target names to compile standard libs for all ABIs.
320 - for v in $(multilib_get_enabled_abi_pairs); do
321 - rust_target_name="CHOST_${v##*.}"
322 - rust_targets="${rust_targets},\"${!rust_target_name}\""
323 - done
324 - rust_targets="${rust_targets#,}"
325 -
326 - local rust_stage0_root="${WORKDIR}"/rust-stage0
327 -
328 - rust_target_name="CHOST_${ARCH}"
329 - rust_target="${!rust_target_name}"
330 -
331 - cat <<- EOF > "${S}"/config.toml
332 - [llvm]
333 - optimize = $(toml_usex !debug)
334 - release-debuginfo = $(toml_usex debug)
335 - assertions = $(toml_usex debug)
336 - targets = "${LLVM_TARGETS// /;}"
337 - [build]
338 - build = "${rust_target}"
339 - host = ["${rust_target}"]
340 - target = [${rust_targets}]
341 - cargo = "${rust_stage0_root}/bin/cargo"
342 - rustc = "${rust_stage0_root}/bin/rustc"
343 - docs = $(toml_usex doc)
344 - submodules = false
345 - python = "${EPYTHON}"
346 - locked-deps = true
347 - vendor = true
348 - verbose = 2
349 - extended = $(toml_usex extended)
350 - [install]
351 - prefix = "${EPREFIX}/usr"
352 - libdir = "$(get_libdir)"
353 - docdir = "share/doc/${P}"
354 - mandir = "share/${P}/man"
355 - [rust]
356 - optimize = $(toml_usex !debug)
357 - debuginfo = $(toml_usex debug)
358 - debug-assertions = $(toml_usex debug)
359 - use-jemalloc = $(toml_usex jemalloc)
360 - default-linker = "$(tc-getCC)"
361 - rpath = false
362 - EOF
363 -
364 - for v in $(multilib_get_enabled_abi_pairs); do
365 - rust_target=$(get_abi_CHOST ${v##*.})
366 - arch_cflags="$(get_abi_CFLAGS ${v##*.})"
367 -
368 - cat <<- EOF >> "${S}"/config.env
369 - CFLAGS_${rust_target}=${arch_cflags}
370 - EOF
371 -
372 - cat <<- EOF >> "${S}"/config.toml
373 - [target.${rust_target}]
374 - cc = "$(tc-getBUILD_CC)"
375 - cxx = "$(tc-getBUILD_CXX)"
376 - linker = "$(tc-getCC)"
377 - ar = "$(tc-getAR)"
378 - EOF
379 - done
380 -}
381 -
382 -src_compile() {
383 - env $(cat "${S}"/config.env)\
384 - ./x.py build --verbose --config="${S}"/config.toml -j$(makeopts_jobs) || die
385 -}
386 -
387 -src_install() {
388 - local rust_target abi_libdir
389 -
390 - env DESTDIR="${D}" ./x.py install || die
391 -
392 - mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
393 - mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
394 - mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die
395 - mv "${D}/usr/bin/rust-lldb" "${D}/usr/bin/rust-lldb-${PV}" || die
396 -
397 - # Copy shared library versions of standard libraries for all targets
398 - # into the system's abi-dependent lib directories because the rust
399 - # installer only does so for the native ABI.
400 - for v in $(multilib_get_enabled_abi_pairs); do
401 - if [ ${v##*.} = ${DEFAULT_ABI} ]; then
402 - continue
403 - fi
404 - abi_libdir=$(get_abi_LIBDIR ${v##*.})
405 - rust_target=$(get_abi_CHOST ${v##*.})
406 - mkdir -p ${D}/usr/${abi_libdir}
407 - cp ${D}/usr/$(get_libdir)/rustlib/${rust_target}/lib/*.so \
408 - ${D}/usr/${abi_libdir} || die
409 - done
410 -
411 - dodoc COPYRIGHT
412 -
413 - # FIXME:
414 - # Really not sure if that env is needed, specailly LDPATH
415 - cat <<-EOF > "${T}"/50${P}
416 - LDPATH="/usr/$(get_libdir)/${P}"
417 - MANPATH="/usr/share/${P}/man"
418 - EOF
419 - doenvd "${T}"/50${P}
420 -
421 - cat <<-EOF > "${T}/provider-${P}"
422 - /usr/bin/rustdoc
423 - /usr/bin/rust-gdb
424 - /usr/bin/rust-lldb
425 - EOF
426 - dodir /etc/env.d/rust
427 - insinto /etc/env.d/rust
428 - doins "${T}/provider-${P}"
429 -}
430 -
431 -pkg_postinst() {
432 - eselect rust update --if-unset
433 -
434 - elog "Rust installs a helper script for calling GDB and LLDB,"
435 - elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
436 -
437 - if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
438 - elog "install app-emacs/rust-mode to get emacs support for rust."
439 - fi
440 -
441 - if has_version app-editors/gvim || has_version app-editors/vim; then
442 - elog "install app-vim/rust-vim to get vim support for rust."
443 - fi
444 -
445 - if has_version 'app-shells/zsh'; then
446 - elog "install app-shells/rust-zshcomp to get zsh completion for rust."
447 - fi
448 -}
449 -
450 -pkg_postrm() {
451 - eselect rust unset --if-invalid
452 -}
453
454 diff --git a/dev-lang/rust/rust-1.26.0-r3.ebuild b/dev-lang/rust/rust-1.27.0.ebuild
455 similarity index 89%
456 rename from dev-lang/rust/rust-1.26.0-r3.ebuild
457 rename to dev-lang/rust/rust-1.27.0.ebuild
458 index 2508fbe3ee3..46186c32ca1 100644
459 --- a/dev-lang/rust/rust-1.26.0-r3.ebuild
460 +++ b/dev-lang/rust/rust-1.27.0.ebuild
461 @@ -5,7 +5,7 @@ EAPI=6
462
463 PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
464
465 -inherit multiprocessing multilib-build python-any-r1 versionator toolchain-funcs
466 +inherit multiprocessing multilib-build python-any-r1 toolchain-funcs versionator
467
468 if [[ ${PV} = *beta* ]]; then
469 betaver=${PV//*beta}
470 @@ -26,12 +26,14 @@ CHOST_amd64=x86_64-unknown-linux-gnu
471 CHOST_x86=i686-unknown-linux-gnu
472 CHOST_arm64=aarch64-unknown-linux-gnu
473
474 -RUST_STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).0"
475 +RUST_STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).2"
476 RUST_STAGE0_amd64="rust-${RUST_STAGE0_VERSION}-${CHOST_amd64}"
477 RUST_STAGE0_x86="rust-${RUST_STAGE0_VERSION}-${CHOST_x86}"
478 RUST_STAGE0_arm64="rust-${RUST_STAGE0_VERSION}-${CHOST_arm64}"
479
480 -CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
481 +# there is no cargo 0.28 tag, so use 0.27
482 +#CARGO_DEPEND_VERSION="0.$(($(version_get_comp 2) + 1)).0"
483 +CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2))).0"
484
485 DESCRIPTION="Systems programming language from Mozilla"
486 HOMEPAGE="https://www.rust-lang.org/"
487 @@ -49,7 +51,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
488
489 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
490
491 -IUSE="debug doc extended +jemalloc ${ALL_LLVM_TARGETS[*]}"
492 +IUSE="debug doc extended +jemalloc wasm ${ALL_LLVM_TARGETS[*]}"
493
494 RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
495 jemalloc? ( dev-libs/jemalloc )"
496 @@ -90,6 +92,9 @@ src_configure() {
497 rust_target_name="CHOST_${v##*.}"
498 rust_targets="${rust_targets},\"${!rust_target_name}\""
499 done
500 + if use wasm; then
501 + rust_targets="${rust_targets},\"wasm32-unknown-unknown\""
502 + fi
503 rust_targets="${rust_targets#,}"
504
505 local rust_stage0_root="${WORKDIR}"/rust-stage0
506 @@ -128,6 +133,7 @@ src_configure() {
507 use-jemalloc = $(toml_usex jemalloc)
508 default-linker = "$(tc-getCC)"
509 rpath = false
510 + lld = $(toml_usex wasm)
511 EOF
512
513 for v in $(multilib_get_enabled_abi_pairs); do
514 @@ -146,6 +152,13 @@ src_configure() {
515 ar = "$(tc-getAR)"
516 EOF
517 done
518 +
519 + if use wasm; then
520 + cat <<- EOF >> "${S}"/config.toml
521 + [target.wasm32-unknown-unknown]
522 + linker = "lld"
523 + EOF
524 + fi
525 }
526
527 src_compile() {
528 @@ -172,9 +185,9 @@ src_install() {
529 fi
530 abi_libdir=$(get_abi_LIBDIR ${v##*.})
531 rust_target=$(get_abi_CHOST ${v##*.})
532 - mkdir -p ${D}/usr/${abi_libdir}
533 - cp ${D}/usr/$(get_libdir)/rustlib/${rust_target}/lib/*.so \
534 - ${D}/usr/${abi_libdir} || die
535 + mkdir -p "${D}/usr/${abi_libdir}"
536 + cp "${D}/usr/$(get_libdir)/rustlib/${rust_target}/lib"/*.so \
537 + "${D}/usr/${abi_libdir}" || die
538 done
539
540 dodoc COPYRIGHT
541
542 diff --git a/virtual/rust/rust-1.26.1.ebuild b/virtual/rust/rust-1.26.1.ebuild
543 deleted file mode 100644
544 index 26f2a40c593..00000000000
545 --- a/virtual/rust/rust-1.26.1.ebuild
546 +++ /dev/null
547 @@ -1,15 +0,0 @@
548 -# Copyright 1999-2018 Gentoo Foundation
549 -# Distributed under the terms of the GNU General Public License v2
550 -
551 -EAPI="6"
552 -
553 -DESCRIPTION="Virtual for Rust language compiler"
554 -HOMEPAGE=""
555 -SRC_URI=""
556 -
557 -LICENSE=""
558 -SLOT="0"
559 -KEYWORDS="~amd64 ~arm64 ~x86"
560 -
561 -DEPEND=""
562 -RDEPEND="|| ( =dev-lang/rust-${PV}* =dev-lang/rust-bin-${PV}* )"
563
564 diff --git a/virtual/rust/rust-1.26.0.ebuild b/virtual/rust/rust-1.27.0.ebuild
565 similarity index 94%
566 rename from virtual/rust/rust-1.26.0.ebuild
567 rename to virtual/rust/rust-1.27.0.ebuild
568 index 26f2a40c593..fa78c78a3e7 100644
569 --- a/virtual/rust/rust-1.26.0.ebuild
570 +++ b/virtual/rust/rust-1.27.0.ebuild
571 @@ -1,7 +1,7 @@
572 # Copyright 1999-2018 Gentoo Foundation
573 # Distributed under the terms of the GNU General Public License v2
574
575 -EAPI="6"
576 +EAPI=7
577
578 DESCRIPTION="Virtual for Rust language compiler"
579 HOMEPAGE=""
580 @@ -11,5 +11,5 @@ LICENSE=""
581 SLOT="0"
582 KEYWORDS="~amd64 ~arm64 ~x86"
583
584 -DEPEND=""
585 +BDEPEND=""
586 RDEPEND="|| ( =dev-lang/rust-${PV}* =dev-lang/rust-bin-${PV}* )"