From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8BC51158094 for ; Thu, 22 Sep 2022 05:40:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BBB8FE0AE4; Thu, 22 Sep 2022 05:40:46 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6FFB5E0AE4 for ; Thu, 22 Sep 2022 05:40:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 606573410A1 for ; Thu, 22 Sep 2022 05:40:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B43185E2 for ; Thu, 22 Sep 2022 05:40:43 +0000 (UTC) From: "Leonardo Hernandez" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Leonardo Hernandez" Message-ID: <1663825213.74d1ad6e9f76470bede3e8540f720b16f4ca8e08.leohdz172@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-shells/zoxide/ X-VCS-Repository: repo/proj/guru X-VCS-Files: app-shells/zoxide/zoxide-0.8.2-r1.ebuild app-shells/zoxide/zoxide-0.8.2-r2.ebuild app-shells/zoxide/zoxide-0.8.3-r1.ebuild app-shells/zoxide/zoxide-0.8.3.ebuild X-VCS-Directories: app-shells/zoxide/ X-VCS-Committer: leohdz172 X-VCS-Committer-Name: Leonardo Hernandez X-VCS-Revision: 74d1ad6e9f76470bede3e8540f720b16f4ca8e08 X-VCS-Branch: dev Date: Thu, 22 Sep 2022 05:40:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6bd7f854-e675-4cb9-8b15-2a5a0bc1552d X-Archives-Hash: f0037b4823cf3e360b6cf4d87d657846 commit: 74d1ad6e9f76470bede3e8540f720b16f4ca8e08 Author: Leonardo Hernández Hernández outlook com> AuthorDate: Thu Sep 22 04:44:12 2022 +0000 Commit: Leonardo Hernandez outlook 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 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