gentoo resync : 12.03.2021

5 files changed, 7 insertions, 111 deletions

diff --git a/dev-util/cvise/Manifest b/dev-util/cvise/Manifest
index c8ef3719bb84..49d156683e14 100644
--- a/dev-util/cvise/Manifest
+++ b/dev-util/cvise/Manifest
@@ -1,10 +1,7 @@
-AUX cvise-2.0.0-shebang.patch 1130 BLAKE2B 50f54e410f978a485aaa08cc7d9b8311211ec5b42fb372656821beba7bacd8aa7506b6e10732a0c426ce48a94440daa64bf931b23734d43b57e4a0d3d08a7281 SHA512 2c8fdc838ec802d7a1afb209dbe3e765780dd599f21cbdb7d9316e076ec06d0f0c1e78a00ea6a66fb614c8d0f7b44ca88ad624236223b47d87dddeab427621d3
-DIST cvise-1.9.0.tar.gz 249042 BLAKE2B 357d429afc43691e616dba31621d1de89fb1f85fcbc177847b3367aac993ccd2c3bec20226e910a319d5d6194b32d0be9704e4fa7b8fce49f23788d10a378012 SHA512 518c48b7b9d9af9b856bfc46d4fb8064bca3730735bdabf2b3aa981a3f743fa6988594b7cbe39da71ac01fbadb4a45e5212d7c79b510fa36d86055978829495b
-DIST cvise-2.0.0.tar.gz 249307 BLAKE2B ba1a70da71706969a35b1223ad0c0fa1a1d4caf7f70eef184adc4dbc69586be6a33bdf11d7c1b606ea4b20d4cd2bf68170aabc1764364c235fe5f67182419080 SHA512 e49ca9919ced9db67b16af4b8a7cd3c18c7d96dea5724c9ee6d60736c8f34074d68ade151be702794c93b24943d167278e1c1a6e6f67a9a1422f695f3a177e46
 DIST cvise-2.1.0.tar.gz 249215 BLAKE2B e36def48de68dfb91990fd1daced56ae5fc9a32070bae3a696e7c21980757e30ccc8ef2d4940c391a72417296968f0dad680ffe6ca3c88104f09839d86174e27 SHA512 bc239ddb207bc6bb70d1a131df7ca0c13c4a3921382613aebb319f1cb1d5f19be273e82945e4f1c9479eaeac07bbb8a9c4c7f515e0474fe6bede84afd20b560c
 DIST cvise-2.2.0.tar.gz 250169 BLAKE2B ed994a288de750b8eee603cf38641614206c0c322152f061b33600c250f24156bbcb2c660c4ae92ff46f3ad2620ba6557213475b8eab0476baa289b7270e6678 SHA512 c54908784d15cb38fe58b731f65ed719a8c073a208d48d7a756acbbaa3804f052963e0ef0f74b811ba77bd3d5e900b622491c7c62c48eb2d7aef708edbec3eb2
-EBUILD cvise-1.9.0.ebuild 1259 BLAKE2B 69650845458637a93323e97d56608486ab99b8de2e3e19f0e548769e45491be7212598ed9ba6c7d1f7f0de6f0707282387402cdad1c65ec839afc8febd9f33e4 SHA512 e7a62fc68b3e22e38b781dcf9876d74bebfbe0413168e2cb055d02c18d73a3cba92780d343123fea81c86b2783941c1c08751759ac24adc5cecf62b3d21f231d
-EBUILD cvise-2.0.0.ebuild 1326 BLAKE2B 9f2bd2eebdd840bb86da20742a5f92a5a12a5742fd1a1103cf04363ff7c6485227b0113be50cb806448e0ef35de120fd1ae550c1e5b2ba11af6561da154a6628 SHA512 dc23bb9e59a8aace4c9700d79375a2f2599fe4c48e79565857104b7bdf4e3f2242d6919dd54a437ef56bec88e1bf72255a5953a6080745dd8c7b4bc4047a6eae
-EBUILD cvise-2.1.0.ebuild 1279 BLAKE2B 55fd7d131fc002e46c0679abdfaec3d1a708717066b2547f964c915e24e7c08a0b17bb17afc71cd03caa1607ed3b5ca0b1ee18cd70eace3102f7f446db78fe04 SHA512 d34736f6eefccf39d540ce973ae2012e119a097b4a2d8c30f61051b60c0fbbce32f1d033e387c0661e6834ba3fa471d00d67eae2c669f11c080e862a7320dfe6
+DIST cvise-2.3.0.tar.gz 250283 BLAKE2B 361bcafd2ec9caf42c77abd2a5bbd145cd350d9693178a59720a2a2d1d726e85860d92725a00ce3dae7041e8b47b584bf4c3a5e8b5c0c0a8283a15f8117125f3 SHA512 6c65b1462b20974d76e54b76e15e592a76445da2b8627a29a98ae295417239171267ed163d04a11eeaae25d068b44548cdad0b642e7024c49a5a15f3c0894b1b
+EBUILD cvise-2.1.0.ebuild 1277 BLAKE2B e0968bcd0b3db5b8d00d97af4a0d6446a4d6aa39364c994c8bf69e78ff676c5c78a202d2c15776d5a26d7420d1e075694f1b652e130234ad3a4e41cd601a5fbb SHA512 054759718e920c69c1aefbd45a6168ed195d2a640f71bc5b8b02e57aabc7a94c055ff22647eed8c45e08fc1f64abeb2f71be5969301effb9d645585b4151597e
 EBUILD cvise-2.2.0.ebuild 1279 BLAKE2B 55fd7d131fc002e46c0679abdfaec3d1a708717066b2547f964c915e24e7c08a0b17bb17afc71cd03caa1607ed3b5ca0b1ee18cd70eace3102f7f446db78fe04 SHA512 d34736f6eefccf39d540ce973ae2012e119a097b4a2d8c30f61051b60c0fbbce32f1d033e387c0661e6834ba3fa471d00d67eae2c669f11c080e862a7320dfe6
+EBUILD cvise-2.3.0.ebuild 1290 BLAKE2B 986ce69cea09cee6a6abd2ab43456f0aa2d0c79265ff6a87e51090442c958a5fc680995f79f2e20493a30d161cf083dc89802da168da7f4357345ba5137fef0a SHA512 8efa2eab8a35951bdd336074df4ef671fe7526bd934e18e236ca85f161f5ca84f4e2df518485eba763228d0c1560aadfdcb9887385aba4532f8425e6599fdc36
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/cvise/cvise-1.9.0.ebuild b/dev-util/cvise/cvise-1.9.0.ebuild
deleted file mode 100644
index ebbb86b2ec9b..000000000000
--- a/dev-util/cvise/cvise-1.9.0.ebuild
+++ /dev/null
@@ -1,64 +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=11
-DEPEND="
-	|| (
-		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::' setup.cfg || die
-	cmake_src_prepare
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	pytest -vv || die
-}
diff --git a/dev-util/cvise/cvise-2.1.0.ebuild b/dev-util/cvise/cvise-2.1.0.ebuild
index bca1400c8e66..ee0ad8abf53c 100644
--- a/dev-util/cvise/cvise-2.1.0.ebuild
+++ b/dev-util/cvise/cvise-2.1.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}
diff --git a/dev-util/cvise/cvise-2.0.0.ebuild b/dev-util/cvise/cvise-2.3.0.ebuild
index 3d8be41374a4..ec2cf4f9c5e5 100644
--- a/dev-util/cvise/cvise-2.0.0.ebuild
+++ b/dev-util/cvise/cvise-2.3.0.ebuild
@@ -19,9 +19,10 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
-LLVM_MAX_SLOT=11
+LLVM_MAX_SLOT=12
 DEPEND="
 	|| (
+		sys-devel/clang:12
 		sys-devel/clang:11
 		sys-devel/clang:10
 	)
@@ -44,10 +45,6 @@ BDEPEND="
 		')
 	)"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-shebang.patch
-)
-
 llvm_check_deps() {
 	has_version "sys-devel/clang:${LLVM_SLOT}"
 }
@@ -64,5 +61,5 @@ src_prepare() {
 
 src_test() {
 	cd "${BUILD_DIR}" || die
-	pytest -vv || die
+	epytest
 }
diff --git a/dev-util/cvise/files/cvise-2.0.0-shebang.patch b/dev-util/cvise/files/cvise-2.0.0-shebang.patch
deleted file mode 100644
index 26bfe9678ebb..000000000000
--- a/dev-util/cvise/files/cvise-2.0.0-shebang.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 492d2d759d35bec39aca137906046b76151b56d1 Mon Sep 17 00:00:00 2001
-From: Martin Liska <mliska@suse.cz>
-Date: Sun, 15 Nov 2020 12:12:04 +0100
-Subject: [PATCH] Add Leap 15 and fix shebang.
-
----
- build_and_test.sh                    |  2 +-
- cvise.py                             |  2 +-
- 4 files changed, 22 insertions(+), 2 deletions(-)
- create mode 100644 Docker/Dockerfile-opensuselp15-llvm9
-
-diff --git a/build_and_test.sh b/build_and_test.sh
-index 95c1539..b726dd4 100755
---- a/build_and_test.sh
-+++ b/build_and_test.sh
-@@ -1,4 +1,4 @@
--#!/usr/bin/bash
-+#!/bin/bash
- 
- BUILD_TYPE=$1
- 
-diff --git a/cvise.py b/cvise.py
-index 15efaf6..7f318f2 100755
---- a/cvise.py
-+++ b/cvise.py
-@@ -260,7 +260,7 @@ def get_available_pass_groups():
-     script = None
-     if args.commands:
-         with tempfile.NamedTemporaryFile(mode='w', delete=False, suffix='.sh') as script:
--            script.write('#!/usr/bin/bash\n\n')
-+            script.write('#!/bin/bash\n\n')
-             script.write(args.commands + '\n')
-         os.chmod(script.name, 0o744)
-         logging.info('Using temporary interestingness test: %s' % script.name)