From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1524565-garchives=archives.gentoo.org@lists.gentoo.org>
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 87A4F15806E
for <garchives@archives.gentoo.org>; Fri, 2 Jun 2023 01:38:43 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id A61ECE0871;
Fri, 2 Jun 2023 01:38:42 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 8CA17E0871
for <gentoo-commits@lists.gentoo.org>; Fri, 2 Jun 2023 01:38:42 +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 B34FB340D2E
for <gentoo-commits@lists.gentoo.org>; Fri, 2 Jun 2023 01:38:41 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 19B2F990
for <gentoo-commits@lists.gentoo.org>; Fri, 2 Jun 2023 01:38:40 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1685669907.3ba9230c6d42b8ac0eb0c73fa03870b54de0d2b7.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/cvise/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-util/cvise/cvise-2.8.0.ebuild
X-VCS-Directories: dev-util/cvise/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 3ba9230c6d42b8ac0eb0c73fa03870b54de0d2b7
X-VCS-Branch: master
Date: Fri, 2 Jun 2023 01:38:40 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: dfe3af2a-cf52-4c86-a006-2f756c50cb99
X-Archives-Hash: ac21e22ab0b84c3f16057e5e6bf28b81
commit: 3ba9230c6d42b8ac0eb0c73fa03870b54de0d2b7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 2 01:38:09 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 2 01:38:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ba9230c
dev-util/cvise: fix merge conflict markers in KEYWORDS
Thanks to username234 for reporting.
Fixes: 5849d652941d202823b36b7e246d890f25af3c25
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/cvise/cvise-2.8.0.ebuild | 4 ----
1 file changed, 4 deletions(-)
diff --git a/dev-util/cvise/cvise-2.8.0.ebuild b/dev-util/cvise/cvise-2.8.0.ebuild
index cb702c48606d..417428e5e07d 100644
--- a/dev-util/cvise/cvise-2.8.0.ebuild
+++ b/dev-util/cvise/cvise-2.8.0.ebuild
@@ -15,11 +15,7 @@ SRC_URI="
LICENSE="UoI-NCSA"
SLOT="0"
-<<<<<<< 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}