1 |
commit: 74d1ad6e9f76470bede3e8540f720b16f4ca8e08 |
2 |
Author: Leonardo Hernández Hernández <leohdz172 <AT> outlook <DOT> com> |
3 |
AuthorDate: Thu Sep 22 04:44:12 2022 +0000 |
4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 22 05:40:13 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=74d1ad6e |
7 |
|
8 |
app-shells/zoxide: fix pre-stripped files + fix LICENSE |
9 |
|
10 |
Closes: https://bugs.gentoo.org/856529 |
11 |
Signed-off-by: Leonardo Hernández Hernández <leohdz172 <AT> outlook.com> |
12 |
|
13 |
.../{zoxide-0.8.2-r1.ebuild => zoxide-0.8.2-r2.ebuild} | 12 +++++++++++- |
14 |
.../zoxide/{zoxide-0.8.3.ebuild => zoxide-0.8.3-r1.ebuild} | 13 ++++++++++--- |
15 |
2 files changed, 21 insertions(+), 4 deletions(-) |
16 |
|
17 |
diff --git a/app-shells/zoxide/zoxide-0.8.2-r1.ebuild b/app-shells/zoxide/zoxide-0.8.2-r2.ebuild |
18 |
similarity index 93% |
19 |
rename from app-shells/zoxide/zoxide-0.8.2-r1.ebuild |
20 |
rename to app-shells/zoxide/zoxide-0.8.2-r2.ebuild |
21 |
index 80e44741f..838b405ca 100644 |
22 |
--- a/app-shells/zoxide/zoxide-0.8.2-r1.ebuild |
23 |
+++ b/app-shells/zoxide/zoxide-0.8.2-r2.ebuild |
24 |
@@ -157,12 +157,22 @@ SRC_URI=" |
25 |
$(cargo_crate_uris) |
26 |
" |
27 |
|
28 |
-LICENSE="MIT" |
29 |
+LICENSE="BSD CC0-1.0 MIT |
30 |
+ || ( Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT ) |
31 |
+ || ( Apache-2.0 BSD-2 MIT ) |
32 |
+ || ( Apache-2.0 MIT ) |
33 |
+ || ( MIT Unlicense ) |
34 |
+" |
35 |
SLOT="0" |
36 |
KEYWORDS="~amd64" |
37 |
|
38 |
QA_FLAGS_IGNORED="usr/bin/zoxide" |
39 |
|
40 |
+src_prepare() { |
41 |
+ sed -i 's:strip = true:strip = false:g' Cargo.toml || die |
42 |
+ default |
43 |
+} |
44 |
+ |
45 |
src_install() { |
46 |
cargo_src_install |
47 |
|
48 |
|
49 |
diff --git a/app-shells/zoxide/zoxide-0.8.3.ebuild b/app-shells/zoxide/zoxide-0.8.3-r1.ebuild |
50 |
similarity index 91% |
51 |
rename from app-shells/zoxide/zoxide-0.8.3.ebuild |
52 |
rename to app-shells/zoxide/zoxide-0.8.3-r1.ebuild |
53 |
index 4c29612bc..67bf478a4 100644 |
54 |
--- a/app-shells/zoxide/zoxide-0.8.3.ebuild |
55 |
+++ b/app-shells/zoxide/zoxide-0.8.3-r1.ebuild |
56 |
@@ -109,14 +109,21 @@ SRC_URI=" |
57 |
$(cargo_crate_uris) |
58 |
" |
59 |
|
60 |
-# License set may be more restrictive as OR is not respected |
61 |
-# use cargo-license for a more accurate license picture |
62 |
-LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD CC0-1.0 MIT Unicode-DFS-2016 Unlicense" |
63 |
+LICENSE="BSD CC0-1.0 MIT Unicode-DFS-2016 |
64 |
+ || ( Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT ) |
65 |
+ || ( Apache-2.0 MIT ) |
66 |
+ || ( MIT Unlicense ) |
67 |
+" |
68 |
SLOT="0" |
69 |
KEYWORDS="~amd64" |
70 |
|
71 |
QA_FLAGS_IGNORED="usr/bin/zoxide" |
72 |
|
73 |
+src_prepare() { |
74 |
+ sed -i 's:strip = true:strip = false:g' Cargo.toml || die |
75 |
+ default |
76 |
+} |
77 |
+ |
78 |
src_install() { |
79 |
cargo_src_install |