From 74d1ad6e9f76470bede3e8540f720b16f4ca8e08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?= Date: Wed, 21 Sep 2022 23:44:12 -0500 Subject: [PATCH] app-shells/zoxide: fix pre-stripped files + fix LICENSE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes: https://bugs.gentoo.org/856529 Signed-off-by: Leonardo Hernández Hernández --- ...oxide-0.8.2-r1.ebuild => zoxide-0.8.2-r2.ebuild} | 12 +++++++++++- .../{zoxide-0.8.3.ebuild => zoxide-0.8.3-r1.ebuild} | 13 ++++++++++--- 2 files changed, 21 insertions(+), 4 deletions(-) rename app-shells/zoxide/{zoxide-0.8.2-r1.ebuild => zoxide-0.8.2-r2.ebuild} (93%) rename app-shells/zoxide/{zoxide-0.8.3.ebuild => zoxide-0.8.3-r1.ebuild} (91%) 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 80e44741f6..838b405caa 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 4c29612bca..67bf478a47 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