Gentoo Archives: gentoo-commits

From: Mikhail Pukhlikov <cynede@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/rust:master commit in: virtual/rust/, dev-lang/rust/
Date: Fri, 09 Oct 2020 11:21:53
Message-Id: 1602242498.06c05640c2eae82b3a2d73b1abdf512b52314d1e.cynede@gentoo
1 commit: 06c05640c2eae82b3a2d73b1abdf512b52314d1e
2 Author: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 9 11:21:23 2020 +0000
4 Commit: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 9 11:21:38 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/rust.git/commit/?id=06c05640
7
8 drop non live rust ebuilds
9
10 Signed-off-by: Mikhail Pukhlikov <cynede <AT> gentoo.org>
11
12 dev-lang/rust/Manifest | 5 -
13 dev-lang/rust/rust-1.46.0-r666.ebuild | 289 ----------------------------------
14 virtual/rust/metadata.xml | 8 -
15 virtual/rust/rust-1.46.0-r666.ebuild | 17 --
16 4 files changed, 319 deletions(-)
17
18 diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
19 deleted file mode 100644
20 index a4547f6..0000000
21 --- a/dev-lang/rust/Manifest
22 +++ /dev/null
23 @@ -1,5 +0,0 @@
24 -DIST rust-1.45.1-aarch64-unknown-linux-gnu.tar.xz 110598096 SHA256 fae1dffd2f75d6a3bdca872b1080ac3f651f698e41b1ae8b389db82dc913465e SHA512 fd64aaa3d8137d62c838f0ef554ff159c84263a4734556c0e4ef911d3f87921f846d70d76983fe8ebe9679477915255ceea69c8a9769797893827d5d67e97b0b WHIRLPOOL 828d3a02311a3d9d9ff3c14e0ec9d0985a435aac22d0135ec4df1516d621c89574cb154b86c51ac3c503ca028a0e6c9a5eb849da531eaaaa25a2bd8fdf4301d2
25 -DIST rust-1.45.1-armv7-unknown-linux-gnueabihf.tar.xz 116371752 SHA256 25b5f5addb8869210af9bc90d00af94a06865b86c0945fbd7b4fb65922768608 SHA512 6dec92d112c0bbbe0434162d10df630505ba179b99fb51800140204fb2e52215d387162d97dadd3aff2324c81a4bbc944e45f4d39e55bf85e244d741e556a391 WHIRLPOOL 8f656830487ba44588681f084ce4532e92caa15e306b349aaab1ea59ac3cf3739f14b8e6a25a3e88cc76ecd6f885a68e319eca82d5a8ac6bccb7d2ca794f8685
26 -DIST rust-1.45.1-i686-unknown-linux-gnu.tar.xz 131991636 SHA256 24b11f969b261948e9a22eb653776c50650b351743ff51576a7b6728160941dd SHA512 80f3bb328666766e177587c11cac4fb0db515ea16fc0462a29816a8474669f49c69461d2939919833337f3a95fbd1da09a55307f3f1936220bc2065f760a2345 WHIRLPOOL 6d561f59f589e027337336edec4e685d2b3846b09fe24015f5163f68223425b229e856cd70ba2ef55cc3aa52589239bf23375fe387d91e9fab4b61f93b2fdfcd
27 -DIST rust-1.45.1-x86_64-unknown-linux-gnu.tar.xz 117764080 SHA256 6e5c709919dbb429681e969ddc39d7cb473b365f49f73e4ebcff8f01833231ac SHA512 13ee5ff7cae29440e32fb140404ff01414d66f0ea8d79777fb1586541de1ee6ef8e12f9249c35374501460a2352f7d0f6035b5bdc2f0daa91d772a157657ec0b WHIRLPOOL 77a5d12f6babd79f0a796a78506e44adc43df9744f6575df510ea9a12652d6686fd6626cc17e922ce8821e851c38b55fd9ad456fde4fd72d880829571ebd6aa6
28 -DIST rustc-1.46.0-src.tar.xz 101868452 SHA256 865dae1290a205f16ded8818c6a0254cc32862985fc250a602a70285b7d92b82 SHA512 099857f1d295043587a4e2a65ef3e6a90e12c8b6958e98535a1656c113c553f9a9b621aba8a19cf21bd8d2c79d27cbfa4b8e6fabbcb3cbfee23b545be7b450b4 WHIRLPOOL 4b744e718beaa47ae6b0a7ed4ee60ff8715a1ae4f4944a4e02e09a9afb75b7a6c7e92bdb663a9f1b6c3c291db069e1ad81b6e4ed82af5bbf136061d33878269c
29
30 diff --git a/dev-lang/rust/rust-1.46.0-r666.ebuild b/dev-lang/rust/rust-1.46.0-r666.ebuild
31 deleted file mode 100644
32 index 092d1fa..0000000
33 --- a/dev-lang/rust/rust-1.46.0-r666.ebuild
34 +++ /dev/null
35 @@ -1,289 +0,0 @@
36 -# Copyright 1999-2019 Gentoo Authors
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=6
40 -
41 -PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy )
42 -
43 -inherit multiprocessing multilib-build python-any-r1 toolchain-funcs versionator
44 -
45 -ABI_VER="$(get_version_component_range 1-2)"
46 -SLOT="dev/${ABI_VER}"
47 -MY_P="rustc-${PV}"
48 -SRC="${MY_P}-src.tar.xz"
49 -KEYWORDS="~amd64 ~arm64 ~x86"
50 -
51 -CHOST_amd64=x86_64-unknown-linux-gnu
52 -CHOST_x86=i686-unknown-linux-gnu
53 -CHOST_arm64=aarch64-unknown-linux-gnu
54 -CHOST_arm=armv7-unknown-linux-gnueabihf
55 -
56 -RUST_STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).1"
57 -RUST_STAGE0_amd64="rust-${RUST_STAGE0_VERSION}-${CHOST_amd64}"
58 -RUST_STAGE0_x86="rust-${RUST_STAGE0_VERSION}-${CHOST_x86}"
59 -RUST_STAGE0_arm64="rust-${RUST_STAGE0_VERSION}-${CHOST_arm64}"
60 -RUST_STAGE0_armv7="rust-${RUST_STAGE0_VERSION}-${CHOST_arm}"
61 -
62 -CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2))).1"
63 -
64 -DESCRIPTION="Systems programming language from Mozilla"
65 -HOMEPAGE="https://www.rust-lang.org/"
66 -
67 -SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz
68 - amd64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_amd64}.tar.xz )
69 - x86? ( https://static.rust-lang.org/dist/${RUST_STAGE0_x86}.tar.xz )
70 - arm64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_arm64}.tar.xz )
71 - arm? ( https://static.rust-lang.org/dist/${RUST_STAGE0_armv7}.tar.xz )
72 -"
73 -
74 -ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
75 - NVPTX PowerPC Sparc SystemZ X86 XCore )
76 -ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
77 -LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
78 -
79 -LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
80 -
81 -IUSE="clippy debug doc libressl rls rustfmt thumbv7neon wasm ${ALL_LLVM_TARGETS[*]}"
82 -
83 -RDEPEND=">=app-eselect/eselect-rust-20190311
84 - sys-libs/zlib
85 - !libressl? ( dev-libs/openssl:0= )
86 - libressl? ( dev-libs/libressl:0= )
87 - net-libs/libssh2
88 - net-libs/http-parser
89 - net-misc/curl[ssl]
90 - "
91 -DEPEND="${RDEPEND}
92 - ${PYTHON_DEPS}
93 - || (
94 - >=sys-devel/gcc-4.7
95 - >=sys-devel/clang-3.5
96 - )
97 - !dev-util/cargo
98 - rustfmt? ( !dev-util/rustfmt )
99 - dev-util/cmake
100 -"
101 -PDEPEND=""
102 -
103 -REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
104 -
105 -S="${WORKDIR}/${MY_P}-src"
106 -
107 -toml_usex() {
108 - usex "$1" true false
109 -}
110 -
111 -src_prepare() {
112 - local rust_stage0_root="${WORKDIR}"/rust-stage0
113 -
114 - local rust_stage0_name="RUST_STAGE0_${ARCH}"
115 - local rust_stage0="${!rust_stage0_name}"
116 -
117 - "${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig --destdir="${rust_stage0_root}" --prefix=/ || die
118 -
119 - default
120 -}
121 -
122 -src_configure() {
123 - local rust_target="" rust_targets="" rust_target_name arch_cflags
124 -
125 - # Collect rust target names to compile standard libs for all ABIs.
126 - for v in $(multilib_get_enabled_abi_pairs); do
127 - rust_target_name="CHOST_${v##*.}"
128 - rust_targets="${rust_targets},\"${!rust_target_name}\""
129 - done
130 - if use wasm; then
131 - rust_targets="${rust_targets},\"wasm32-unknown-unknown\""
132 - fi
133 - if use arm && use thumbv7neon; then
134 - rust_targets="${rust_targets},\"thumbv7neon-unknown-linux-gnueabihf\""
135 - fi
136 -
137 - rust_targets="${rust_targets#,}"
138 -
139 - local extended="true" tools="\"cargo\","
140 - if use clippy; then
141 - tools="\"clippy\",$tools"
142 - fi
143 - if use rls; then
144 - tools="\"rls\",\"analysis\",\"src\",$tools"
145 - fi
146 - if use rustfmt; then
147 - tools="\"rustfmt\",$tools"
148 - fi
149 -
150 - local rust_stage0_root="${WORKDIR}"/rust-stage0
151 -
152 - rust_target_name="CHOST_${ARCH}"
153 - rust_target="${!rust_target_name}"
154 -
155 - cat <<- EOF > "${S}"/config.toml
156 - [llvm]
157 - optimize = $(toml_usex !debug)
158 - release-debuginfo = $(toml_usex debug)
159 - assertions = $(toml_usex debug)
160 - targets = "${LLVM_TARGETS// /;}"
161 - experimental-targets = ""
162 - [build]
163 - build = "${rust_target}"
164 - host = ["${rust_target}"]
165 - target = [${rust_targets}]
166 - cargo = "${rust_stage0_root}/bin/cargo"
167 - rustc = "${rust_stage0_root}/bin/rustc"
168 - docs = $(toml_usex doc)
169 - submodules = false
170 - python = "${EPYTHON}"
171 - locked-deps = true
172 - vendor = true
173 - extended = ${extended}
174 - tools = [${tools}]
175 - verbose = 2
176 - [install]
177 - prefix = "${EPREFIX}/usr"
178 - libdir = "$(get_libdir)"
179 - docdir = "share/doc/${P}"
180 - mandir = "share/${P}/man"
181 - [rust]
182 - optimize = $(toml_usex !debug)
183 - debug = $(toml_usex debug)
184 - debug-assertions = $(toml_usex debug)
185 - default-linker = "$(tc-getCC)"
186 - rpath = false
187 - lld = $(toml_usex wasm)
188 - EOF
189 -
190 - for v in $(multilib_get_enabled_abi_pairs); do
191 - rust_target=$(get_abi_CHOST ${v##*.})
192 - arch_cflags="$(get_abi_CFLAGS ${v##*.})"
193 -
194 - cat <<- EOF >> "${S}"/config.env
195 - CFLAGS_${rust_target}=${arch_cflags}
196 - EOF
197 -
198 - cat <<- EOF >> "${S}"/config.toml
199 - [target.${rust_target}]
200 - cc = "$(tc-getBUILD_CC)"
201 - cxx = "$(tc-getBUILD_CXX)"
202 - linker = "$(tc-getCC)"
203 - ar = "$(tc-getAR)"
204 - EOF
205 - done
206 -
207 - if use wasm; then
208 - cat <<- EOF >> "${S}"/config.toml
209 - [target.wasm32-unknown-unknown]
210 - linker = "lld"
211 - EOF
212 - fi
213 -
214 - if use arm && use thumbv7neon; then
215 - cat <<- EOF >> "${S}"/config.toml
216 - [target.thumbv7neon-unknown-linux-gnueabihf]
217 - cc = "$(tc-getBUILD_CC)"
218 - cxx = "$(tc-getBUILD_CXX)"
219 - linker = "$(tc-getCC)"
220 - ar = "$(tc-getAR)"
221 - EOF
222 - fi
223 -}
224 -
225 -src_compile() {
226 - env $(cat "${S}"/config.env)\
227 - ./x.py build --config="${S}"/config.toml -j$(makeopts_jobs) \
228 - --exclude src/tools/miri || die # https://github.com/rust-lang/rust/issues/52305
229 -}
230 -
231 -src_install() {
232 - local rust_target abi_libdir
233 -
234 - env DESTDIR="${D}" ./x.py install || die
235 -
236 - mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
237 - mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
238 - mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die
239 - mv "${D}/usr/bin/rust-lldb" "${D}/usr/bin/rust-lldb-${PV}" || die
240 - mv "${D}/usr/bin/cargo" "${D}/usr/bin/cargo-${PV}" || die
241 - if use clippy; then
242 - mv "${D}/usr/bin/clippy-driver" "${D}/usr/bin/clippy-driver-${PV}" || die
243 - mv "${D}/usr/bin/cargo-clippy" "${D}/usr/bin/cargo-clippy-${PV}" || die
244 - fi
245 - if use rls; then
246 - mv "${D}/usr/bin/rls" "${D}/usr/bin/rls-${PV}" || die
247 - fi
248 - if use rustfmt; then
249 - mv "${D}/usr/bin/rustfmt" "${D}/usr/bin/rustfmt-${PV}" || die
250 - mv "${D}/usr/bin/cargo-fmt" "${D}/usr/bin/cargo-fmt-${PV}" || die
251 - fi
252 -
253 - # Copy shared library versions of standard libraries for all targets
254 - # into the system's abi-dependent lib directories because the rust
255 - # installer only does so for the native ABI.
256 - for v in $(multilib_get_enabled_abi_pairs); do
257 - if [ ${v##*.} = ${DEFAULT_ABI} ]; then
258 - continue
259 - fi
260 - abi_libdir=$(get_abi_LIBDIR ${v##*.})
261 - rust_target=$(get_abi_CHOST ${v##*.})
262 - mkdir -p "${D}/usr/${abi_libdir}"
263 - cp "${D}/usr/$(get_libdir)/rustlib/${rust_target}/lib"/*.so \
264 - "${D}/usr/${abi_libdir}" || die
265 - done
266 -
267 - dodoc COPYRIGHT
268 -
269 - # FIXME:
270 - # Really not sure if that env is needed, specailly LDPATH
271 - cat <<-EOF > "${T}"/50${P}
272 - LDPATH="/usr/$(get_libdir)/${P}"
273 - MANPATH="/usr/share/${P}/man"
274 - EOF
275 - doenvd "${T}"/50${P}
276 -
277 - cat <<-EOF > "${T}/provider-${P}"
278 - /usr/bin/rustdoc
279 - /usr/bin/rust-gdb
280 - /usr/bin/rust-lldb
281 - EOF
282 - echo /usr/bin/cargo >> "${T}/provider-${P}"
283 - if use clippy; then
284 - echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
285 - echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
286 - fi
287 - if use rls; then
288 - echo /usr/bin/rls >> "${T}/provider-${P}"
289 - fi
290 - if use rustfmt; then
291 - echo /usr/bin/rustfmt >> "${T}/provider-${P}"
292 - echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
293 - fi
294 - dodir /etc/env.d/rust
295 - insinto /etc/env.d/rust
296 - doins "${T}/provider-${P}"
297 -}
298 -
299 -pkg_postinst() {
300 - eselect rust update --if-unset
301 -
302 - elog "Rust installs a helper script for calling GDB and LLDB,"
303 - elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
304 -
305 - ewarn "cargo is now installed from dev-lang/rust{,-bin} instead of dev-util/cargo."
306 - ewarn "This might have resulted in a dangling symlink for /usr/bin/cargo on some"
307 - ewarn "systems. This can be resolved by calling 'sudo eselect rust set ${P}'."
308 -
309 - if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
310 - elog "install app-emacs/rust-mode to get emacs support for rust."
311 - fi
312 -
313 - if has_version app-editors/gvim || has_version app-editors/vim; then
314 - elog "install app-vim/rust-vim to get vim support for rust."
315 - fi
316 -
317 - if has_version 'app-shells/zsh'; then
318 - elog "install app-shells/rust-zshcomp to get zsh completion for rust."
319 - fi
320 -}
321 -
322 -pkg_postrm() {
323 - eselect rust unset --if-invalid
324 -}
325
326 diff --git a/virtual/rust/metadata.xml b/virtual/rust/metadata.xml
327 deleted file mode 100644
328 index 85cf4eb..0000000
329 --- a/virtual/rust/metadata.xml
330 +++ /dev/null
331 @@ -1,8 +0,0 @@
332 -<?xml version="1.0" encoding="UTF-8"?>
333 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
334 -<pkgmetadata>
335 - <maintainer type="project">
336 - <email>rust@g.o</email>
337 - <name>Rust Project</name>
338 - </maintainer>
339 -</pkgmetadata>
340
341 diff --git a/virtual/rust/rust-1.46.0-r666.ebuild b/virtual/rust/rust-1.46.0-r666.ebuild
342 deleted file mode 100644
343 index 63b7dbb..0000000
344 --- a/virtual/rust/rust-1.46.0-r666.ebuild
345 +++ /dev/null
346 @@ -1,17 +0,0 @@
347 -# Copyright 1999-2020 Gentoo Authors
348 -# Distributed under the terms of the GNU General Public License v2
349 -
350 -EAPI=7
351 -
352 -inherit multilib-build
353 -
354 -DESCRIPTION="Virtual for Rust language compiler"
355 -HOMEPAGE=""
356 -SRC_URI=""
357 -
358 -LICENSE=""
359 -SLOT="0"
360 -KEYWORDS="~amd64 ~arm64 ~x86"
361 -
362 -BDEPEND=""
363 -RDEPEND="|| ( =dev-lang/rust-${PVR}*[${MULTILIB_USEDEP}] =dev-lang/rust-bin-${PV}*[${MULTILIB_USEDEP}] )"