1 |
commit: 4a5c6828cffc8b2e140410439b9045b5a60a5e71 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Aug 23 10:15:24 2022 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 23 10:15:24 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a5c6828 |
7 |
|
8 |
dev-lang/julia-bin: fix VariableScope (EROOT) |
9 |
|
10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
11 |
|
12 |
dev-lang/julia-bin/julia-bin-1.6.5.ebuild | 9 ++++----- |
13 |
dev-lang/julia-bin/julia-bin-1.7.1.ebuild | 9 ++++----- |
14 |
dev-lang/julia-bin/julia-bin-1.7.3.ebuild | 9 ++++----- |
15 |
dev-lang/julia-bin/julia-bin-9999.ebuild | 7 +++---- |
16 |
4 files changed, 15 insertions(+), 19 deletions(-) |
17 |
|
18 |
diff --git a/dev-lang/julia-bin/julia-bin-1.6.5.ebuild b/dev-lang/julia-bin/julia-bin-1.6.5.ebuild |
19 |
index 0901e3d69124..693dc424a913 100644 |
20 |
--- a/dev-lang/julia-bin/julia-bin-1.6.5.ebuild |
21 |
+++ b/dev-lang/julia-bin/julia-bin-1.6.5.ebuild |
22 |
@@ -2,6 +2,7 @@ |
23 |
# Distributed under the terms of the GNU General Public License v2 |
24 |
|
25 |
EAPI=7 |
26 |
+ |
27 |
MY_PN=${PN/-bin/} |
28 |
MY_P=${MY_PN}-${PV/_/-} |
29 |
MY_PV=$(ver_cut 1-2) |
30 |
@@ -17,21 +18,19 @@ SRC_URI=" |
31 |
) |
32 |
arm64? ( ${BASE_SRC_URI}/linux/aarch64/${MY_PV}/${MY_P}-linux-aarch64.tar.gz ) |
33 |
" |
34 |
+S="${WORKDIR}/${MY_P}" |
35 |
|
36 |
LICENSE="MIT" |
37 |
SLOT="${MY_PV}" |
38 |
KEYWORDS="-* ~amd64 ~x86" |
39 |
+RESTRICT="strip" |
40 |
|
41 |
RDEPEND="app-arch/p7zip" |
42 |
DEPEND="${RDEPEND}" |
43 |
|
44 |
-RESTRICT="strip" |
45 |
- |
46 |
QA_PREBUILT="*" |
47 |
QA_SONAME="*" |
48 |
|
49 |
-S="${WORKDIR}/${MY_P}" |
50 |
- |
51 |
src_install() { |
52 |
insinto "/usr/$(get_libdir)/${MY_P}/" |
53 |
doins -r ./etc |
54 |
@@ -45,6 +44,6 @@ src_install() { |
55 |
|
56 |
local revord=$(( 9999 - $(ver_cut 1) * 100 - $(ver_cut 2) )) # 1.6 -> 106 |
57 |
newenvd - 99${MY_PN}${revord} <<-EOF |
58 |
- PATH="${EROOT}/usr/$(get_libdir)/${MY_P}/bin" |
59 |
+ PATH="${EPREFIX}/usr/$(get_libdir)/${MY_P}/bin" |
60 |
EOF |
61 |
} |
62 |
|
63 |
diff --git a/dev-lang/julia-bin/julia-bin-1.7.1.ebuild b/dev-lang/julia-bin/julia-bin-1.7.1.ebuild |
64 |
index e729beeff5e5..a5facfea6337 100644 |
65 |
--- a/dev-lang/julia-bin/julia-bin-1.7.1.ebuild |
66 |
+++ b/dev-lang/julia-bin/julia-bin-1.7.1.ebuild |
67 |
@@ -2,6 +2,7 @@ |
68 |
# Distributed under the terms of the GNU General Public License v2 |
69 |
|
70 |
EAPI=7 |
71 |
+ |
72 |
MY_PN=${PN/-bin/} |
73 |
MY_P=${MY_PN}-${PV/_/-} |
74 |
MY_PV=$(ver_cut 1-2) |
75 |
@@ -17,21 +18,19 @@ SRC_URI=" |
76 |
) |
77 |
arm64? ( ${BASE_SRC_URI}/linux/aarch64/${MY_PV}/${MY_P}-linux-aarch64.tar.gz ) |
78 |
" |
79 |
+S="${WORKDIR}/${MY_P}" |
80 |
|
81 |
LICENSE="MIT" |
82 |
SLOT="${MY_PV}" |
83 |
KEYWORDS="-* ~amd64 ~arm64 ~x86" |
84 |
+RESTRICT="strip" |
85 |
|
86 |
RDEPEND="app-arch/p7zip" |
87 |
DEPEND="${RDEPEND}" |
88 |
|
89 |
-RESTRICT="strip" |
90 |
- |
91 |
QA_PREBUILT="*" |
92 |
QA_SONAME="*" |
93 |
|
94 |
-S="${WORKDIR}/${MY_P}" |
95 |
- |
96 |
src_install() { |
97 |
insinto "/usr/$(get_libdir)/${MY_P}/" |
98 |
doins -r ./etc |
99 |
@@ -45,6 +44,6 @@ src_install() { |
100 |
|
101 |
local revord=$(( 9999 - $(ver_cut 1) * 100 - $(ver_cut 2) )) # 1.6 -> 106 |
102 |
newenvd - 99${MY_PN}${revord} <<-EOF |
103 |
- PATH="${EROOT}/usr/$(get_libdir)/${MY_P}/bin" |
104 |
+ PATH="${EPREFIX}/usr/$(get_libdir)/${MY_P}/bin" |
105 |
EOF |
106 |
} |
107 |
|
108 |
diff --git a/dev-lang/julia-bin/julia-bin-1.7.3.ebuild b/dev-lang/julia-bin/julia-bin-1.7.3.ebuild |
109 |
index e729beeff5e5..a5facfea6337 100644 |
110 |
--- a/dev-lang/julia-bin/julia-bin-1.7.3.ebuild |
111 |
+++ b/dev-lang/julia-bin/julia-bin-1.7.3.ebuild |
112 |
@@ -2,6 +2,7 @@ |
113 |
# Distributed under the terms of the GNU General Public License v2 |
114 |
|
115 |
EAPI=7 |
116 |
+ |
117 |
MY_PN=${PN/-bin/} |
118 |
MY_P=${MY_PN}-${PV/_/-} |
119 |
MY_PV=$(ver_cut 1-2) |
120 |
@@ -17,21 +18,19 @@ SRC_URI=" |
121 |
) |
122 |
arm64? ( ${BASE_SRC_URI}/linux/aarch64/${MY_PV}/${MY_P}-linux-aarch64.tar.gz ) |
123 |
" |
124 |
+S="${WORKDIR}/${MY_P}" |
125 |
|
126 |
LICENSE="MIT" |
127 |
SLOT="${MY_PV}" |
128 |
KEYWORDS="-* ~amd64 ~arm64 ~x86" |
129 |
+RESTRICT="strip" |
130 |
|
131 |
RDEPEND="app-arch/p7zip" |
132 |
DEPEND="${RDEPEND}" |
133 |
|
134 |
-RESTRICT="strip" |
135 |
- |
136 |
QA_PREBUILT="*" |
137 |
QA_SONAME="*" |
138 |
|
139 |
-S="${WORKDIR}/${MY_P}" |
140 |
- |
141 |
src_install() { |
142 |
insinto "/usr/$(get_libdir)/${MY_P}/" |
143 |
doins -r ./etc |
144 |
@@ -45,6 +44,6 @@ src_install() { |
145 |
|
146 |
local revord=$(( 9999 - $(ver_cut 1) * 100 - $(ver_cut 2) )) # 1.6 -> 106 |
147 |
newenvd - 99${MY_PN}${revord} <<-EOF |
148 |
- PATH="${EROOT}/usr/$(get_libdir)/${MY_P}/bin" |
149 |
+ PATH="${EPREFIX}/usr/$(get_libdir)/${MY_P}/bin" |
150 |
EOF |
151 |
} |
152 |
|
153 |
diff --git a/dev-lang/julia-bin/julia-bin-9999.ebuild b/dev-lang/julia-bin/julia-bin-9999.ebuild |
154 |
index 6bbced1a966e..def85bee0129 100644 |
155 |
--- a/dev-lang/julia-bin/julia-bin-9999.ebuild |
156 |
+++ b/dev-lang/julia-bin/julia-bin-9999.ebuild |
157 |
@@ -2,10 +2,12 @@ |
158 |
# Distributed under the terms of the GNU General Public License v2 |
159 |
|
160 |
EAPI=7 |
161 |
+ |
162 |
MY_PN=${PN/-bin/} |
163 |
|
164 |
DESCRIPTION="High-performance programming language for technical computing" |
165 |
HOMEPAGE="https://julialang.org/" |
166 |
+S="${WORKDIR}/" |
167 |
|
168 |
PROPERTIES="live" |
169 |
MY_P=${MY_PN}-latest |
170 |
@@ -13,16 +15,13 @@ SRC_URI="" |
171 |
|
172 |
LICENSE="MIT" |
173 |
SLOT="9999" |
174 |
+RESTRICT="strip" |
175 |
|
176 |
RDEPEND="app-arch/p7zip" |
177 |
DEPEND="${RDEPEND}" |
178 |
|
179 |
-RESTRICT="strip" |
180 |
- |
181 |
QA_PREBUILT="*" |
182 |
|
183 |
-S="${WORKDIR}/" |
184 |
- |
185 |
src_unpack() { |
186 |
NIGHTLIES_S3="https://julialangnightlies-s3.julialang.org/bin" |
187 |
if use x86; then |