commit: 74d1ad6e9f76470bede3e8540f720b16f4ca8e08 Author: Leonardo Hernández Hernández <leohdz172 <AT> outlook <DOT> com> AuthorDate: Thu Sep 22 04:44:12 2022 +0000 Commit: Leonardo Hernandez <leohdz172 <AT> outlook <DOT> com> CommitDate: Thu Sep 22 05:40:13 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=74d1ad6e
app-shells/zoxide: fix pre-stripped files + fix LICENSE Closes: https://bugs.gentoo.org/856529 Signed-off-by: Leonardo Hernández Hernández <leohdz172 <AT> outlook.com> .../{zoxide-0.8.2-r1.ebuild => zoxide-0.8.2-r2.ebuild} | 12 +++++++++++- .../zoxide/{zoxide-0.8.3.ebuild => zoxide-0.8.3-r1.ebuild} | 13 ++++++++++--- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/app-shells/zoxide/zoxide-0.8.2-r1.ebuild b/app-shells/zoxide/zoxide-0.8.2-r2.ebuild similarity index 93% rename from app-shells/zoxide/zoxide-0.8.2-r1.ebuild rename to app-shells/zoxide/zoxide-0.8.2-r2.ebuild index 80e44741f..838b405ca 100644 --- a/app-shells/zoxide/zoxide-0.8.2-r1.ebuild +++ b/app-shells/zoxide/zoxide-0.8.2-r2.ebuild @@ -157,12 +157,22 @@ SRC_URI=" $(cargo_crate_uris) " -LICENSE="MIT" +LICENSE="BSD CC0-1.0 MIT + || ( Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT ) + || ( Apache-2.0 BSD-2 MIT ) + || ( Apache-2.0 MIT ) + || ( MIT Unlicense ) +" SLOT="0" KEYWORDS="~amd64" QA_FLAGS_IGNORED="usr/bin/zoxide" +src_prepare() { + sed -i 's:strip = true:strip = false:g' Cargo.toml || die + default +} + src_install() { cargo_src_install diff --git a/app-shells/zoxide/zoxide-0.8.3.ebuild b/app-shells/zoxide/zoxide-0.8.3-r1.ebuild similarity index 91% rename from app-shells/zoxide/zoxide-0.8.3.ebuild rename to app-shells/zoxide/zoxide-0.8.3-r1.ebuild index 4c29612bc..67bf478a4 100644 --- a/app-shells/zoxide/zoxide-0.8.3.ebuild +++ b/app-shells/zoxide/zoxide-0.8.3-r1.ebuild @@ -109,14 +109,21 @@ SRC_URI=" $(cargo_crate_uris) " -# License set may be more restrictive as OR is not respected -# use cargo-license for a more accurate license picture -LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD CC0-1.0 MIT Unicode-DFS-2016 Unlicense" +LICENSE="BSD CC0-1.0 MIT Unicode-DFS-2016 + || ( Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT ) + || ( Apache-2.0 MIT ) + || ( MIT Unlicense ) +" SLOT="0" KEYWORDS="~amd64" QA_FLAGS_IGNORED="usr/bin/zoxide" +src_prepare() { + sed -i 's:strip = true:strip = false:g' Cargo.toml || die + default +} + src_install() { cargo_src_install
