1 |
commit: 6456b69dbade96dc014e4eb4d7000e8012e75e6f |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 9 18:59:47 2020 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 9 22:13:07 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6456b69d |
7 |
|
8 |
dev-util/rustup: revbump, remove libressl, update helper script |
9 |
|
10 |
Closes: https://bugs.gentoo.org/741450 |
11 |
Package-Manager: Portage-3.0.6, Repoman-3.0.1 |
12 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
13 |
|
14 |
dev-util/rustup/files/symlink_rustup.sh | 26 ++++++++++++++-------- |
15 |
...ustup-1.22.1.ebuild => rustup-1.22.1-r1.ebuild} | 10 ++++----- |
16 |
2 files changed, 22 insertions(+), 14 deletions(-) |
17 |
|
18 |
diff --git a/dev-util/rustup/files/symlink_rustup.sh b/dev-util/rustup/files/symlink_rustup.sh |
19 |
index 529a71a1322..87365028843 100644 |
20 |
--- a/dev-util/rustup/files/symlink_rustup.sh |
21 |
+++ b/dev-util/rustup/files/symlink_rustup.sh |
22 |
@@ -1,9 +1,9 @@ |
23 |
-#!/bin/bash |
24 |
+#!@GENTOO_PORTAGE_EPREFIX@/bin/bash |
25 |
|
26 |
set -euo pipefail |
27 |
IFS=$'\n\t' |
28 |
|
29 |
-SYMLINK_RUSTUP_VERSION="0.0.1" |
30 |
+SYMLINK_RUSTUP_VERSION="0.0.2" |
31 |
|
32 |
: "${CARGO_HOME:=${HOME}/.cargo}" |
33 |
: "${RUSTUP_HOME:=${HOME}/.rustup}" |
34 |
@@ -37,6 +37,7 @@ help() { |
35 |
echo " ${CARGO_HOME}" |
36 |
echo |
37 |
echo "Options:" |
38 |
+ echo " -a, --apply Apply changes (required)" |
39 |
echo " -C, --nocolor Disable colored output" |
40 |
echo " -d, --debug Debug mode (sets -x shell option)" |
41 |
echo " -V, --version Print version number" |
42 |
@@ -52,7 +53,7 @@ symlink_rustup() { |
43 |
rust{c,doc,fmt,-gdb,-lldb,up} |
44 |
) |
45 |
|
46 |
- binpath="${EPREFIX:-}/usr/bin/rustup-init" |
47 |
+ binpath="@GENTOO_PORTAGE_EPREFIX@/usr/bin/rustup-init" |
48 |
gentoo_rust="$(eselect --brief rust show 2>/dev/null)" |
49 |
|
50 |
mkdir -p "${CARGO_HOME}/bin" || die |
51 |
@@ -62,15 +63,15 @@ symlink_rustup() { |
52 |
if [[ -e "${symlink_path}" ]]; then |
53 |
die "${symlink_path} ${__err_exists}" |
54 |
else |
55 |
- ln -sv "${binpath}" "${symlink_path}" || die |
56 |
+ ln -s ${QUIET--v} "${binpath}" "${symlink_path}" || die |
57 |
fi |
58 |
done |
59 |
|
60 |
good "Setting gentoo ${gentoo_rust// /} as default toolchain" |
61 |
- "${CARGO_HOME}/bin/rustup" -v toolchain link gentoo "${EPREFIX:-}/usr" || die |
62 |
- "${CARGO_HOME}/bin/rustup" -v default gentoo || die |
63 |
- "${CARGO_HOME}/bin/rustup" -V || die |
64 |
- "${CARGO_HOME}/bin/rustup" show || die |
65 |
+ [[ ${QUIET+set} != set ]] && "${CARGO_HOME}/bin/rustup" -V |
66 |
+ "${CARGO_HOME}/bin/rustup" ${QUIET--v} toolchain link gentoo "/usr" |
67 |
+ "${CARGO_HOME}/bin/rustup" ${QUIET--v} default gentoo |
68 |
+ [[ ${QUIET+set} != set ]] && "${CARGO_HOME}/bin/rustup" show |
69 |
|
70 |
good "Prepend ${CARGO_HOME}/bin to your PATH to use rustup" |
71 |
good "rustup selfupdate is disabled, it will be updated by portage" |
72 |
@@ -82,6 +83,9 @@ main(){ |
73 |
me="$(basename "${BASH_SOURCE[${#BASH_SOURCE[@]} - 1]}")" |
74 |
while [[ ${#} -gt 0 ]]; do |
75 |
case ${1} in |
76 |
+ -a|--apply) |
77 |
+ APPLY=true |
78 |
+ ;; |
79 |
-h|--help) |
80 |
help |
81 |
exit 0 |
82 |
@@ -106,7 +110,11 @@ main(){ |
83 |
esac |
84 |
shift |
85 |
done |
86 |
- symlink_rustup |
87 |
+ if [[ ${APPLY:-false} == true ]]; then |
88 |
+ symlink_rustup |
89 |
+ else |
90 |
+ help |
91 |
+ fi |
92 |
} # main() |
93 |
|
94 |
|
95 |
|
96 |
diff --git a/dev-util/rustup/rustup-1.22.1.ebuild b/dev-util/rustup/rustup-1.22.1-r1.ebuild |
97 |
similarity index 96% |
98 |
rename from dev-util/rustup/rustup-1.22.1.ebuild |
99 |
rename to dev-util/rustup/rustup-1.22.1-r1.ebuild |
100 |
index 6b91f916003..fa40b7f0082 100644 |
101 |
--- a/dev-util/rustup/rustup-1.22.1.ebuild |
102 |
+++ b/dev-util/rustup/rustup-1.22.1-r1.ebuild |
103 |
@@ -239,7 +239,7 @@ zeroize-1.1.0 |
104 |
zeroize_derive-1.0.0 |
105 |
" |
106 |
|
107 |
-inherit bash-completion-r1 cargo |
108 |
+inherit bash-completion-r1 cargo prefix |
109 |
|
110 |
HOME_CRATE_COMMIT="a243ee2fbee6022c57d56f5aa79aefe194eabe53" |
111 |
|
112 |
@@ -252,13 +252,13 @@ SRC_URI="https://github.com/rust-lang/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz |
113 |
LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 CC0-1.0 MIT Unlicense ZLIB" |
114 |
SLOT="0" |
115 |
KEYWORDS="~amd64 ~ppc64" |
116 |
-IUSE="libressl" |
117 |
+IUSE="" |
118 |
|
119 |
+# requires old libressl-2.5, so openssl only for now. |
120 |
DEPEND=" |
121 |
app-arch/xz-utils |
122 |
net-misc/curl:=[http2,ssl] |
123 |
- !libressl? ( dev-libs/openssl:0= ) |
124 |
- libressl? ( dev-libs/libressl:0= ) |
125 |
+ dev-libs/openssl:0= |
126 |
" |
127 |
RDEPEND="${DEPEND}" |
128 |
BDEPEND="virtual/rust" |
129 |
@@ -283,7 +283,7 @@ src_install() { |
130 |
cargo_src_install --features no-self-update |
131 |
einstalldocs |
132 |
exeinto /usr/share/rustup |
133 |
- newexe "${FILESDIR}/symlink_rustup.sh" symlink_rustup |
134 |
+ newexe "$(prefixify_ro "${FILESDIR}"/symlink_rustup.sh)" symlink_rustup |
135 |
|
136 |
ln -s "${ED}/usr/bin/rustup-init" rustup || die |
137 |
./rustup completions bash rustup > "${T}/rustup" || die |