Gentoo Archives: gentoo-commits

From: Dirkjan Ochtman <djc@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/rust-bin/
Date: Fri, 05 Oct 2018 13:11:23
Message-Id: 1538745059.d3aba8ca44bf9f3cdb6f44202206ed9fac08d6b9.djc@gentoo
1 commit: d3aba8ca44bf9f3cdb6f44202206ed9fac08d6b9
2 Author: Dirkjan Ochtman <djc <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 5 13:09:59 2018 +0000
4 Commit: Dirkjan Ochtman <djc <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 5 13:10:59 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3aba8ca
7
8 dev-lang/rust-bin: remove old, vulnerable versions of rust
9
10 Bug: https://bugs.gentoo.org/666976
11 Bug: https://bugs.gentoo.org/show_bug.cgi?id=662904
12 Signed-off-by: Dirkjan Ochtman <djc <AT> gentoo.org>
13 Package-Manager: Portage-2.3.49, Repoman-2.3.10
14
15 dev-lang/rust-bin/Manifest | 11 --
16 dev-lang/rust-bin/rust-bin-1.25.0.ebuild | 122 ---------------------
17 dev-lang/rust-bin/rust-bin-1.28.0-r1.ebuild | 163 ----------------------------
18 3 files changed, 296 deletions(-)
19
20 diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
21 index 206dde34d3c..de84500680e 100644
22 --- a/dev-lang/rust-bin/Manifest
23 +++ b/dev-lang/rust-bin/Manifest
24 @@ -1,14 +1,3 @@
25 -DIST rust-1.25.0-arm-unknown-linux-gnueabi.tar.gz 152771389 BLAKE2B b163a41846233f08ba34ba325058843141b285758eede668e84d32751ace27d4b36fc5e8f963e1d13da1b46ae7cb48944987acc7ff36ced300bee154c7b22e68 SHA512 33a7bb3ed7a0b5b85e5dc0438ff620b67bc7bfe4d5e35bdcc9207a5dddf017a588a7de4877c4f1784f22f1d6e503ddd24d57f3d3af94d4bf00c781d4c378bb5f
26 -DIST rust-1.25.0-arm-unknown-linux-gnueabihf.tar.gz 152774994 BLAKE2B 438fc55edcf80f1f292765c7d062c7c2e282c7798d0ca7312557262a7474f60341aae1c9a3f5bfe349576f7204fe1fa044dded933157b128e6c6015e23c89388 SHA512 688e8e0d2e5661f132033afe8020a93828a45d00a874155a1a7887c69590061a413db95f0443d43234fb65b5510dfd7bdb092c0cc7b3fde6abd5f386786d95ad
27 -DIST rust-1.25.0-armv7-unknown-linux-gnueabihf.tar.gz 150376603 BLAKE2B 44aadf00b74d3d35039486289b319db5b1820dfb3b0fdbc03714ae2a8df78e09ee09fa41d9d8ec1377b91fb4a8f67cd7f4cdc99ceb39da4b48ba464ee1b73600 SHA512 a45312bec4c06b04d3c148d87a64aa55e14cc160eaaa6b712ce738590063137c8f9dd1030656071c1ac9a22cb852f34efdb98c435527c7371da381b802fb9104
28 -DIST rust-1.25.0-i686-unknown-linux-gnu.tar.gz 169267482 BLAKE2B 8fb18c95adf7edd74cd305683ab2ee33d59cce1a0f515e9ba63dfd105ffaf9150444e281502747856fa5164f24707b4bbbe110a2b1b7a1cf65c96b883a6f2ede SHA512 76bcd978b9b23b0fc6315f91bed153e59616aa62f520aae8e8d3587b5f5fae74fef15f8b0a749b02a69be56fad4df9a413019438135481917bca1fb1a7704de7
29 -DIST rust-1.25.0-x86_64-unknown-linux-gnu.tar.gz 178696930 BLAKE2B 0f82e837494d394c86462583f3d65f1ad839a97eda00fbc00476d06255831088cb7e554cc14edbf9dd23fbebf75078dc78204bdbec4795781f7fae0cbb6de63d SHA512 544e85bb69359d8ff6059d0f470b5995822f73e6d361be43f69f87d394b7252a11686f835336930bc257ba4347c0498abf5b1fbd751180d96bd9ca872b76d65c
30 -DIST rust-1.28.0-aarch64-unknown-linux-gnu.tar.xz 98937652 BLAKE2B 836d3dd4e583fa50dd317c3bea56257e6ea19defdb38c16be6debb2854e147c8a92c4832263e4ac314136022a176526fe7d3774a3c5a84cd8d364cd2a1532860 SHA512 8d9acbc90ddaa1e0de0234a21798b19b5365ea371a12f9a143c6ebacbb48f57344da6e827e867513be502bce2801de27a0dbbacdf8618c653aeb58026b6c469c
31 -DIST rust-1.28.0-arm-unknown-linux-gnueabi.tar.xz 104676648 BLAKE2B b26b23c3605e6584c51e0e914dbb3be60996e079e52ff2d4850ed43c1f1f7cd5ac575b40dbe852f927d36654f5ab7e384548f3a92b3466bfbb1cda7f9f069bcb SHA512 a1eaf1d7826ebfe222d233cabd8b88073ca2c8dd42a0b870e324dfc63e7290308418222c56802bc421c9bda119dc7c5f3e225ff33cacad5776b79cbcc1a877b2
32 -DIST rust-1.28.0-arm-unknown-linux-gnueabihf.tar.xz 104992084 BLAKE2B df97766d7abf73f668a2936834bc0f35739289eeeb5395276a2fdfd5b6c0baee3ba1eee1099f19d4f4f1cbd1a33cf62ad888dd3d1856b613ac853c6a17650741 SHA512 3b58b83f38bf8d8e841ae6614d72bb6e6faf75fb7c19abc5451548b0e6de0ef3b64dfbc70481a1e40f74074bfad701aa7a58296b4a0d07957a418bd3cd769917
33 -DIST rust-1.28.0-armv7-unknown-linux-gnueabihf.tar.xz 105144132 BLAKE2B d9e0791c7dc77ade26d383a5c57117a2b7b50c6a523b31fbf604c0b779c966c5055554f85c718353f2e581bfe8a228369671a8b731f808bc0133ad3fad61f853 SHA512 9142110e0c24657aca41468648d9364c2e6fce60b08ca7113c944a53701fc5a309481a8fdd5845b229bcc750ccad63af561d452c3a3a0727ab1ca7a461b06d3d
34 -DIST rust-1.28.0-i686-unknown-linux-gnu.tar.xz 136925948 BLAKE2B 85d9239533920c3f16d7c61bada0caeabceceade29032b70bb4562bfd04fa0158cdd85b8a0a1119506416fa5916ade8a0466bf6c10da457299a6319aa25f9dd6 SHA512 ffdfab46db14f07354b553e02fdb9dc6602c2c52b78d8f17c499f4ddb1e257aa53479df836eb3f06a2548d34296b0277cdb6b4c6f3cec57265823df22752c135
35 -DIST rust-1.28.0-x86_64-unknown-linux-gnu.tar.xz 134120432 BLAKE2B 56fb79a98659d9c8e56b8eef87dea3302ee5901bc4507d1c204628370b20cf34b2875c9586faa0acc2bc2b1a5beedeb9b5ba199cfb85d52f268f084a02f04f27 SHA512 4f427c11a9cd22aedd01bd7ed5bee2ba5e00a27db25af4f596cf8627d88eff8e72625eb83729d2e6c6780aaffd44c0e7065a1c8fa22f4899349b72c726cf6a5f
36 DIST rust-1.29.1-aarch64-unknown-linux-gnu.tar.xz 100127240 BLAKE2B 32bebfcb3fe9c12bc0404d1a7980d09a3e96117d93eccc3f76601a4a06ff5ab9d4627bc50ce00b6c69723379a2ebf3e3f25b9724b1bd2dc00c001b28fd70b916 SHA512 fae658f99069b599e3ec17e5a6b80f3c726937dd4751e375a003583ac6feeeb5f68bdd9e55c8ab84a0974607a45e08eaaad9e373f5a9b4bc172d2c986664d671
37 DIST rust-1.29.1-arm-unknown-linux-gnueabi.tar.xz 105764732 BLAKE2B 552c0df65a1ca1ff094d25ddbdaf6e50b4faa1123677b796eb6a5aec2f8cba7f9ede9611aa2e7ffd7c4e39d578f166e73e4c9916a8db7a7652b006364ea78601 SHA512 cd5ea55b3c4f67deeb9a2688fea6800ebac1bbabfa5ce8d37f6ca0c1628cde9770831a0ec894309ca86dfed9faa3949c479e5b546abfaebcc6431f7709f487b2
38 DIST rust-1.29.1-arm-unknown-linux-gnueabihf.tar.xz 106051860 BLAKE2B 65d9a5f75540cdfedf89ebbe30f04fce964a3e1d27479a8393924c5b6a1cd77883c7d54b9e1634378febe6a2ec3ec04f6ba403e15afc43e6cc5b32902932ba57 SHA512 aea98cbe613abf8fbba45806356a26776bc369c4100658fc613bf730d7f7ed6aeb413cbfefa5eb77da80008dce95264b8bcbe420804b32ad577c5821203fe151
39
40 diff --git a/dev-lang/rust-bin/rust-bin-1.25.0.ebuild b/dev-lang/rust-bin/rust-bin-1.25.0.ebuild
41 deleted file mode 100644
42 index 0d270141b6d..00000000000
43 --- a/dev-lang/rust-bin/rust-bin-1.25.0.ebuild
44 +++ /dev/null
45 @@ -1,122 +0,0 @@
46 -# Copyright 1999-2018 Gentoo Foundation
47 -# Distributed under the terms of the GNU General Public License v2
48 -
49 -EAPI=5
50 -
51 -inherit eutils bash-completion-r1 toolchain-funcs
52 -
53 -MY_P="rust-${PV}"
54 -
55 -DESCRIPTION="Systems programming language from Mozilla"
56 -HOMEPAGE="https://www.rust-lang.org/"
57 -SRC_URI="amd64? ( https://static.rust-lang.org/dist/${MY_P}-x86_64-unknown-linux-gnu.tar.gz )
58 - arm? (
59 - https://static.rust-lang.org/dist/${MY_P}-arm-unknown-linux-gnueabi.tar.gz
60 - https://static.rust-lang.org/dist/${MY_P}-arm-unknown-linux-gnueabihf.tar.gz
61 - https://static.rust-lang.org/dist/${MY_P}-armv7-unknown-linux-gnueabihf.tar.gz
62 - )
63 - x86? ( https://static.rust-lang.org/dist/${MY_P}-i686-unknown-linux-gnu.tar.gz )"
64 -
65 -LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
66 -SLOT="stable"
67 -KEYWORDS="amd64 x86"
68 -IUSE="doc"
69 -
70 -DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
71 - !dev-lang/rust:0
72 -"
73 -RDEPEND="${DEPEND}"
74 -
75 -QA_PREBUILT="
76 - opt/${P}/bin/rustc-bin-${PV}
77 - opt/${P}/bin/rustdoc-bin-${PV}
78 - opt/${P}/lib/*.so
79 - opt/${P}/lib/rustlib/*/lib/*.so
80 - opt/${P}/lib/rustlib/*/lib/*.rlib*
81 -"
82 -
83 -pkg_pretend () {
84 - if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
85 - die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
86 - fi
87 -}
88 -
89 -src_unpack() {
90 - default
91 -
92 - local postfix
93 - use amd64 && postfix=x86_64-unknown-linux-gnu
94 -
95 - if use arm && [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv6* ]]; then
96 - postfix=arm-unknown-linux-gnueabi
97 - elif use arm && [[ ${CHOST} == armv6*h* ]]; then
98 - postfix=arm-unknown-linux-gnueabihf
99 - elif use arm && [[ ${CHOST} == armv7*h* ]]; then
100 - postfix=armv7-unknown-linux-gnueabihf
101 - fi
102 -
103 - use x86 && postfix=i686-unknown-linux-gnu
104 - mv "${WORKDIR}/${MY_P}-${postfix}" "${S}" || die
105 -}
106 -
107 -src_install() {
108 - local std=$(grep 'std' ./components)
109 - local components="rustc,${std}"
110 - use doc && components="${components},rust-docs"
111 - ./install.sh \
112 - --components="${components}" \
113 - --disable-verify \
114 - --prefix="${D}/opt/${P}" \
115 - --mandir="${D}/usr/share/${P}/man" \
116 - --disable-ldconfig \
117 - || die
118 -
119 - local rustc=rustc-bin-${PV}
120 - local rustdoc=rustdoc-bin-${PV}
121 - local rustgdb=rust-gdb-bin-${PV}
122 -
123 - mv "${D}/opt/${P}/bin/rustc" "${D}/opt/${P}/bin/${rustc}" || die
124 - mv "${D}/opt/${P}/bin/rustdoc" "${D}/opt/${P}/bin/${rustdoc}" || die
125 - mv "${D}/opt/${P}/bin/rust-gdb" "${D}/opt/${P}/bin/${rustgdb}" || die
126 -
127 - dosym "../../opt/${P}/bin/${rustc}" "/usr/bin/${rustc}"
128 - dosym "../../opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}"
129 - dosym "../../opt/${P}/bin/${rustgdb}" "/usr/bin/${rustgdb}"
130 -
131 - cat <<-EOF > "${T}"/50${P}
132 - LDPATH="/opt/${P}/lib"
133 - MANPATH="/usr/share/${P}/man"
134 - EOF
135 - doenvd "${T}"/50${P}
136 -
137 - cat <<-EOF > "${T}/provider-${P}"
138 - /usr/bin/rustdoc
139 - /usr/bin/rust-gdb
140 - EOF
141 - dodir /etc/env.d/rust
142 - insinto /etc/env.d/rust
143 - doins "${T}/provider-${P}"
144 -}
145 -
146 -pkg_postinst() {
147 - eselect rust update --if-unset
148 -
149 - elog "Rust installs a helper script for calling GDB now,"
150 - elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV},"
151 -
152 - if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
153 - elog "install app-emacs/rust-mode to get emacs support for rust."
154 - fi
155 -
156 - if has_version app-editors/gvim || has_version app-editors/vim; then
157 - elog "install app-vim/rust-vim to get vim support for rust."
158 - fi
159 -
160 - if has_version 'app-shells/zsh'; then
161 - elog "install app-shells/rust-zshcomp to get zsh completion for rust."
162 - fi
163 -}
164 -
165 -pkg_postrm() {
166 - eselect rust unset --if-invalid
167 -}
168
169 diff --git a/dev-lang/rust-bin/rust-bin-1.28.0-r1.ebuild b/dev-lang/rust-bin/rust-bin-1.28.0-r1.ebuild
170 deleted file mode 100644
171 index 0cc40a09a3f..00000000000
172 --- a/dev-lang/rust-bin/rust-bin-1.28.0-r1.ebuild
173 +++ /dev/null
174 @@ -1,163 +0,0 @@
175 -# Copyright 1999-2018 Gentoo Foundation
176 -# Distributed under the terms of the GNU General Public License v2
177 -
178 -EAPI=6
179 -
180 -inherit eutils bash-completion-r1 versionator toolchain-funcs
181 -
182 -MY_P="rust-${PV}"
183 -
184 -DESCRIPTION="Systems programming language from Mozilla"
185 -HOMEPAGE="https://www.rust-lang.org/"
186 -SRC_URI="amd64? ( https://static.rust-lang.org/dist/${MY_P}-x86_64-unknown-linux-gnu.tar.xz )
187 - arm? (
188 - https://static.rust-lang.org/dist/${MY_P}-arm-unknown-linux-gnueabi.tar.xz
189 - https://static.rust-lang.org/dist/${MY_P}-arm-unknown-linux-gnueabihf.tar.xz
190 - https://static.rust-lang.org/dist/${MY_P}-armv7-unknown-linux-gnueabihf.tar.xz
191 - )
192 - arm64? ( https://static.rust-lang.org/dist/${MY_P}-aarch64-unknown-linux-gnu.tar.xz )
193 - x86? ( https://static.rust-lang.org/dist/${MY_P}-i686-unknown-linux-gnu.tar.xz )"
194 -
195 -LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
196 -SLOT="stable"
197 -KEYWORDS="amd64 ~arm64 ~x86"
198 -IUSE="cargo doc libressl rustfmt"
199 -
200 -CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
201 -
202 -DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
203 - !dev-lang/rust:0
204 - cargo? ( !dev-util/cargo )
205 - rustfmt? ( !dev-util/rustfmt )
206 -"
207 -RDEPEND="${DEPEND}
208 - cargo? (
209 - sys-libs/zlib
210 - !libressl? ( dev-libs/openssl:0= )
211 - libressl? ( dev-libs/libressl:0= )
212 - net-libs/libssh2
213 - net-libs/http-parser
214 - net-misc/curl[ssl]
215 - )"
216 -PDEPEND="!cargo? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
217 -
218 -QA_PREBUILT="
219 - opt/${P}/bin/*-${PV}
220 - opt/${P}/lib/*.so
221 - opt/${P}/lib/rustlib/*/lib/*.so
222 - opt/${P}/lib/rustlib/*/lib/*.rlib*
223 -"
224 -
225 -pkg_pretend () {
226 - if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
227 - die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
228 - fi
229 -}
230 -
231 -src_unpack() {
232 - default
233 -
234 - local postfix
235 - use amd64 && postfix=x86_64-unknown-linux-gnu
236 -
237 - if use arm && [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv6* ]]; then
238 - postfix=arm-unknown-linux-gnueabi
239 - elif use arm && [[ ${CHOST} == armv6*h* ]]; then
240 - postfix=arm-unknown-linux-gnueabihf
241 - elif use arm && [[ ${CHOST} == armv7*h* ]]; then
242 - postfix=armv7-unknown-linux-gnueabihf
243 - fi
244 -
245 - use arm64 && postfix=aarch64-unknown-linux-gnu
246 - use x86 && postfix=i686-unknown-linux-gnu
247 - mv "${WORKDIR}/${MY_P}-${postfix}" "${S}" || die
248 -}
249 -
250 -src_install() {
251 - local std=$(grep 'std' ./components)
252 - local components="rustc,${std}"
253 - use doc && components="${components},rust-docs"
254 - use cargo && components="${components},cargo"
255 - use rustfmt && components="${components},rustfmt-preview"
256 - ./install.sh \
257 - --components="${components}" \
258 - --disable-verify \
259 - --prefix="${D}/opt/${P}" \
260 - --mandir="${D}/usr/share/${P}/man" \
261 - --disable-ldconfig \
262 - || die
263 -
264 - local rustc=rustc-bin-${PV}
265 - local rustdoc=rustdoc-bin-${PV}
266 - local rustgdb=rust-gdb-bin-${PV}
267 - local rustlldb=rust-lldb-bin-${PV}
268 -
269 - mv "${D}/opt/${P}/bin/rustc" "${D}/opt/${P}/bin/${rustc}" || die
270 - mv "${D}/opt/${P}/bin/rustdoc" "${D}/opt/${P}/bin/${rustdoc}" || die
271 - mv "${D}/opt/${P}/bin/rust-gdb" "${D}/opt/${P}/bin/${rustgdb}" || die
272 - mv "${D}/opt/${P}/bin/rust-lldb" "${D}/opt/${P}/bin/${rustlldb}" || die
273 -
274 - dosym "../../opt/${P}/bin/${rustc}" "/usr/bin/${rustc}"
275 - dosym "../../opt/${P}/bin/${rustdoc}" "/usr/bin/${rustdoc}"
276 - dosym "../../opt/${P}/bin/${rustgdb}" "/usr/bin/${rustgdb}"
277 - dosym "../../opt/${P}/bin/${rustlldb}" "/usr/bin/${rustlldb}"
278 -
279 - if use cargo; then
280 - local cargo=cargo-bin-${PV}
281 - mv "${D}/opt/${P}/bin/cargo" "${D}/opt/${P}/bin/${cargo}" || die
282 - dosym "../../opt/${P}/bin/${cargo}" "/usr/bin/${cargo}"
283 - fi
284 - if use rustfmt; then
285 - local rustfmt=rustfmt-bin-${PV}
286 - local cargo_fmt=cargo-fmt-bin-${PV}
287 - mv "${D}/opt/${P}/bin/rustfmt" "${D}/opt/${P}/bin/${rustfmt}" || die
288 - mv "${D}/opt/${P}/bin/cargo-fmt" "${D}/opt/${P}/bin/${cargo_fmt}" || die
289 - dosym "../../opt/${P}/bin/${rustfmt}" "/usr/bin/${rustfmt}"
290 - dosym "../../opt/${P}/bin/${cargo_fmt}" "/usr/bin/${cargo_fmt}"
291 - fi
292 -
293 - cat <<-EOF > "${T}"/50${P}
294 - LDPATH="/opt/${P}/lib"
295 - MANPATH="/usr/share/${P}/man"
296 - EOF
297 - doenvd "${T}"/50${P}
298 -
299 - cat <<-EOF > "${T}/provider-${P}"
300 - /usr/bin/rustdoc
301 - /usr/bin/rust-gdb
302 - /usr/bin/rust-lldb
303 - EOF
304 - if use cargo; then
305 - echo /usr/bin/cargo >> "${T}/provider-${P}"
306 - fi
307 - if use rustfmt; then
308 - echo /usr/bin/rustfmt >> "${T}/provider-${P}"
309 - echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
310 - fi
311 - dodir /etc/env.d/rust
312 - insinto /etc/env.d/rust
313 - doins "${T}/provider-${P}"
314 -}
315 -
316 -pkg_postinst() {
317 - eselect rust update --if-unset
318 -
319 - elog "Rust installs a helper script for calling GDB now,"
320 - elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV},"
321 -
322 - if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
323 - elog "install app-emacs/rust-mode to get emacs support for rust."
324 - fi
325 -
326 - if has_version app-editors/gvim || has_version app-editors/vim; then
327 - elog "install app-vim/rust-vim to get vim support for rust."
328 - fi
329 -
330 - if has_version 'app-shells/zsh'; then
331 - elog "install app-shells/rust-zshcomp to get zsh completion for rust."
332 - fi
333 -}
334 -
335 -pkg_postrm() {
336 - eselect rust unset --if-invalid
337 -}