[gentoo-commits] repo/gentoo:master commit in: dev-util/cvise/

[Yixun Lan]

commit:     5849d652941d202823b36b7e246d890f25af3c25
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  2 00:22:31 2023 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Fri Jun  2 01:13:26 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5849d652

dev-util/cvise: Keyword 2.8.0 riscv, #907672

Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 dev-util/cvise/cvise-2.8.0.ebuild | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dev-util/cvise/cvise-2.8.0.ebuild 
b/dev-util/cvise/cvise-2.8.0.ebuild
index 4cf31b14483b..cb702c48606d 100644
--- a/dev-util/cvise/cvise-2.8.0.ebuild
+++ b/dev-util/cvise/cvise-2.8.0.ebuild
@@ -15,7 +15,11 @@ SRC_URI="
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+<<<<<<< HEAD
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
+=======
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+>>>>>>> 2a0536d75d4e (dev-util/cvise: Keyword 2.8.0 riscv, #907672)
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}