gentoo resync : 22.12.2021

3 files changed, 2 insertions, 69 deletions

diff --git a/dev-util/cvise/Manifest b/dev-util/cvise/Manifest
index fd44775e7dd8..2dd99f5c19c3 100644
--- a/dev-util/cvise/Manifest
+++ b/dev-util/cvise/Manifest
@@ -1,5 +1,3 @@
-DIST cvise-2.3.0.tar.gz 250283 BLAKE2B 361bcafd2ec9caf42c77abd2a5bbd145cd350d9693178a59720a2a2d1d726e85860d92725a00ce3dae7041e8b47b584bf4c3a5e8b5c0c0a8283a15f8117125f3 SHA512 6c65b1462b20974d76e54b76e15e592a76445da2b8627a29a98ae295417239171267ed163d04a11eeaae25d068b44548cdad0b642e7024c49a5a15f3c0894b1b
 DIST cvise-2.4.0.tar.gz 252810 BLAKE2B a95d1645192886d8871dcdf7f9cdfa5a2ac615a3bbc24782c0966d1872fe5f3ade7ddb82afabecfcdebfdac257e2e13e6cb99ab7320baee1a4b43ab360e6a0b2 SHA512 073e53039d2b077fed43b948e0c01dc662ef4f75b92d7f49d1786a35c36412fed02e1931c6a39ce902452056fe5c7d70daa35a9cae18b44009778837261cae19
-EBUILD cvise-2.3.0.ebuild 1288 BLAKE2B 17fc3205790db4333a22b06c0532d11ccf7d4a3a107c88f3fb79b3e1dbcbd7aafe8d12a1708f28988db53b8e5ee96ff47819ea648f701b2122d053b31101c19a SHA512 7f5f23be91dff53487a03d2ff4b347e8aef8be6ea3b3f7228e9b18fcb42b311b1b4b1a47f57dcf7b54cd20e50c5fc6f4a38658866758f623e9adc64cfc9eb931
-EBUILD cvise-2.4.0.ebuild 1350 BLAKE2B 644a82226e75728668684ef877b4428c70c122aeb6c52cb2b0b5dd6936b635e7a20455a4c72b7af90687f94db7efa73631d99c69bc328f903f2047f354e8d1eb SHA512 425c8c70351c011961573df2ec8b38929b4946e1ec2861f6c2ce25ee3bda7a59583d8e110c606446b78e722200ea718df4e858b16dfd1c29efa52393db8e7116
+EBUILD cvise-2.4.0.ebuild 1348 BLAKE2B a2b08c7f6867cb010783c7e5087896fad259606970d489cfb5d49295666f2f1fba17834a278ad498eff144e66ac6bdc47ca78a8cd0583c40989a43252e55fe18 SHA512 8fd46d768585bb1449b37e29dac1caf71eae7bef519c1945c4d04a0b96456f18a026beaad72d48974f99df7fadb0dca5aa7fd17442fae5f4274843ff9d5d7e71
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/dev-util/cvise/cvise-2.3.0.ebuild b/dev-util/cvise/cvise-2.3.0.ebuild
deleted file mode 100644
index a77a3e2ca815..000000000000
--- a/dev-util/cvise/cvise-2.3.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-: ${CMAKE_MAKEFILE_GENERATOR=ninja}
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake llvm python-single-r1
-
-DESCRIPTION="Super-parallel Python port of the C-Reduce"
-HOMEPAGE="https://github.com/marxin/cvise/"
-SRC_URI="
-	https://github.com/marxin/cvise/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-LLVM_MAX_SLOT=12
-DEPEND="
-	|| (
-		sys-devel/clang:12
-		sys-devel/clang:11
-		sys-devel/clang:10
-	)
-	<=sys-devel/clang-$(( LLVM_MAX_SLOT + 1 )):="
-RDEPEND="${DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pebble[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	')
-	dev-util/unifdef
-	sys-devel/flex"
-BDEPEND="
-	${PYTHON_DEPS}
-	sys-devel/flex
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/pebble[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-		')
-	)"
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	llvm_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e 's:-n auto::' -e 's:--flake8::' setup.cfg || die
-	cmake_src_prepare
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	epytest
-}
diff --git a/dev-util/cvise/cvise-2.4.0.ebuild b/dev-util/cvise/cvise-2.4.0.ebuild
index 1b9a8e8963b6..f1901e09417d 100644
--- a/dev-util/cvise/cvise-2.4.0.ebuild
+++ b/dev-util/cvise/cvise-2.4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}