gentoo auto-resync : 02:06:2023 - 09:28:30

6 files changed, 1 insertions, 270 deletions

diff --git a/dev-util/cvise/Manifest b/dev-util/cvise/Manifest
index f815ce984711..d2f2c57d2c15 100644
--- a/dev-util/cvise/Manifest
+++ b/dev-util/cvise/Manifest
@@ -1,9 +1,3 @@
-AUX cvise-2.5.0-no-werror-cflags.patch 1830 BLAKE2B 864cde94daabb54e691e59a3634e7cc7ff72dea86a41f757f6d3d764629a803de92950e6abc32f33738c361e5e6bdacffb09c214039c2ee0475fbf1c41366cd6 SHA512 e68e51ecda7005b6542589f3ce958ad5ffef17c72e19a38f9d2be2d1443dc77adb11d4984dfc690cc25cbcb3e1da1c2fc848b9d8869178a7d4eca479ea2d7007
-AUX cvise-2.7.0-llvm16.patch 2034 BLAKE2B 15752340e432219849b69bb5172b0534c88526ec30f0a534dfc33126d27ee80dc3d4ec0586d159442b894492117edfd21341c2a86263de825d7b37345aee8b8b SHA512 02e233993615535a23dc3ce230c69ec9033e51ab70fd4a1a3c1ba7a711d3bc7ddbb5410926e26598d57db223826b0a0fabba41ea3afb353b8be78b9c9b82b567
-DIST cvise-2.6.0.tar.gz 264295 BLAKE2B fcdd27905598c8db6f088c4bdadde966bcd0836560ede642269fa6dc32d1907d32081e56e7a33487bffca64ea53a49b05b05620debc5af352371203e37241b70 SHA512 1707cc46c342197c6b0e11b26a453548fd7bc7bc25baf20215230a7a4743053700189f96c1e0ba4ad6c9de4dd38920700a957ca333b0f123949b7a5a00854291
-DIST cvise-2.7.0.tar.gz 269155 BLAKE2B c0fe9bcf8207acc53f71c5d7cd9c0cb41ba3f771a276e86401c1de4789b9ebad2d91b2881a05e0263827d0ae70805ba4f9b05fdae64f27d83e16d08f89f518e0 SHA512 4da775e177c135d5282f8e3d9a33ae040f403eabcca8baf9f4f78adc05e3069626340005f9f41ab2f530c9269f4c5829bdd35b55433e2d539d42de002e42aa5e
 DIST cvise-2.8.0.tar.gz 269582 BLAKE2B fe0f0d4e63ec7c69b209b8be1f3fd160a2573b9bfc555a3bb5caec5c818c8251569103e71509d194e0effc86c09420cf523393686dd412660acde1e85ebffb67 SHA512 7e2dee2001aacb96cf5ffdb62047d229e23273fd26f34648e23ab4374bf6cae149f13db529494ce8d2d16555a0d2143487923c57f4b303b0ab1f678ffcff6f6e
-EBUILD cvise-2.6.0.ebuild 1356 BLAKE2B 4d5df4ee3efb1f7a65e3ed11e67b1a9b2dd8d1016247a2d27c7d0c25ee601da9d32f2f4cc22c5520978b8be22570ce4788c994b227b63972f415f2e4508c5dfc SHA512 ebb9f94de3cadfd3fe8c186f2c671a8913d055d1d2f9e0ecb391ae236dd480d6d15bce72c838d4bb270bdd63edb6d6d291d1f707050a10c9bc936f5cf8958b41
-EBUILD cvise-2.7.0-r1.ebuild 1473 BLAKE2B 7843443e9b55c1047cdc959aaacb9eb36df8b3d3d74215e2d61eb42e7d26c606a54156d03afdf09cbc626476f2be6b2cc0736b6d55af450067470b43a3bebb0d SHA512 b90569f1a74eb8d840781b2a376b7216c9b5a50c1c1a32ac9f5ebc9b138da35353a435618babdb5769e577532267239a8c974826e00c325918a1ceffe1a64043
-EBUILD cvise-2.8.0.ebuild 1582 BLAKE2B d6a32923cc8c929cf042df2acfd97d18ae4dfea4d1a18265dbccd67d1612fa32a057b47f1cc121d472cad4a00cb3860d96fa0e32110ddfc7c07550266ffc541a SHA512 2ffdb5a7a91cd9970f6c64fc9601c84642147aa413c549a0bc3b7b6e30db4cd745427f9e008ab19c81c6ed0af062640c02ce9c2a70e9cc51f83e36fe8be7cb96
+EBUILD cvise-2.8.0.ebuild 1432 BLAKE2B 10c07a4fe5b0223ee38d0492dd9b6af22eca1c84b3ec51813a747b9fc2bd8eec3d8b26f4591da182775d09d12ba320ba52da77fa8b670788117b7a88004fe602 SHA512 0a46cd875a688311b63f8fbffb2cb49a70448862fc67179864448129164c2cda1feae2c159b78521feecbc2ecd19c73984febf776bc4ebe62419f8090c089687
 MISC metadata.xml 325 BLAKE2B 52e58fd0c3babe2c595399ff2878b758960d089b0cefc0f8589365704f3628a93688d5b6ee06e88e54a4435ac0280d8cf542c37c079d149e44a2a64cd4db12c2 SHA512 9e509c76ab4cf07804997751996b5c73efc04839a1d6e2bd4b98c5ad2ffde0fb1008332f1b52bbf0985d65ceed73ccdf101c62a9b7d0bb1f5694083d1e33afb9
diff --git a/dev-util/cvise/cvise-2.6.0.ebuild b/dev-util/cvise/cvise-2.6.0.ebuild
deleted file mode 100644
index 927c3dd47f18..000000000000
--- a/dev-util/cvise/cvise-2.6.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-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 ~arm64 ~ppc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-LLVM_MAX_SLOT=15
-DEPEND="
-	|| (
-		sys-devel/clang:15
-		sys-devel/clang:14
-		sys-devel/clang:13
-	)
-	<sys-devel/clang-$(( LLVM_MAX_SLOT + 1 )):=
-"
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_USEDEP}]
-		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}]
-		')
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.0-no-werror-cflags.patch
-)
-
-llvm_check_deps() {
-	has_version "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	llvm_pkg_setup
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	epytest
-}
-
-src_install() {
-	cmake_src_install
-
-	python_fix_shebang "${ED}"/usr/bin/cvise
-}
diff --git a/dev-util/cvise/cvise-2.7.0-r1.ebuild b/dev-util/cvise/cvise-2.7.0-r1.ebuild
deleted file mode 100644
index 0c599e87daf6..000000000000
--- a/dev-util/cvise/cvise-2.7.0-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-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 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-LLVM_MAX_SLOT=16
-DEPEND="
-	|| (
-		sys-devel/clang:16
-		sys-devel/clang:15
-		sys-devel/clang:14
-	)
-	<sys-devel/clang-$(( LLVM_MAX_SLOT + 1 )):=
-"
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_USEDEP}]
-		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}]
-		')
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-llvm16.patch
-)
-
-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:-Werror::' -e '/CMAKE_CXX_FLAGS_REL/d' CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_test() {
-	cd "${BUILD_DIR}" || die
-	epytest
-}
-
-src_install() {
-	cmake_src_install
-
-	python_fix_shebang "${ED}"/usr/bin/cvise
-}
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}
diff --git a/dev-util/cvise/files/cvise-2.5.0-no-werror-cflags.patch b/dev-util/cvise/files/cvise-2.5.0-no-werror-cflags.patch
deleted file mode 100644
index b00b524cb2a4..000000000000
--- a/dev-util/cvise/files/cvise-2.5.0-no-werror-cflags.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://bugs.gentoo.org/867424
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -146,13 +146,13 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
-     OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-   # XXX figure out how to get "-std=c++14 -fno-rtti" from LLVM.  That's how we
-   # get those options in the Automake path...
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror -Wno-error=maybe-uninitialized")
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -fno-rtti -fno-strict-aliasing -Wall -Wextra -Wno-unused-parameter -Werror -Wno-error=maybe-uninitialized")
-+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-error=maybe-uninitialized")
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -fno-rtti -fno-strict-aliasing -Wall -Wextra -Wno-unused-parameter -Wno-error=maybe-uninitialized")
-   if(SUPPORTS_FVISIBILITY_INLINES_HIDDEN_FLAG)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden")
-   endif()
--  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")
--  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} -O3")
-+  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
-+  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE}")
- endif()
- 
- ###############################################################################
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 261a0fb..cbaebc3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -151,8 +151,6 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
-   if(SUPPORTS_FVISIBILITY_INLINES_HIDDEN_FLAG)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden")
-   endif()
--  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
--  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE}")
- endif()
- 
- ###############################################################################
diff --git a/dev-util/cvise/files/cvise-2.7.0-llvm16.patch b/dev-util/cvise/files/cvise-2.7.0-llvm16.patch
deleted file mode 100644
index 11f0100b6d28..000000000000
--- a/dev-util/cvise/files/cvise-2.7.0-llvm16.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-https://github.com/marxin/cvise/commit/2f4e1755aa32b131b49606cd55b5bfcc7714a8a8
-
-From 2f4e1755aa32b131b49606cd55b5bfcc7714a8a8 Mon Sep 17 00:00:00 2001
-From: Martin Liska <mliska@suse.cz>
-Date: Thu, 26 Jan 2023 09:17:16 +0100
-Subject: [PATCH] bump CMake minimal version
-
-Fixes building with the latest LLVM 16 due to use of IN_LIST operator:
-
-Policy CMP0057 is not set: Support new IN_LIST if() operator.  Run "cmake
---help-policy CMP0057" for policy details.  Use the cmake_policy command to
-set the policy and suppress this warning.
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -8,7 +8,7 @@
- 
- ###############################################################################
- 
--cmake_minimum_required(VERSION 2.8.12)
-+cmake_minimum_required(VERSION 3.3)
- 
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
- 
---- a/clang_delta/CMakeLists.txt
-+++ b/clang_delta/CMakeLists.txt
-@@ -8,7 +8,7 @@
- 
- ###############################################################################
- 
--cmake_minimum_required(VERSION 2.8.12)
-+cmake_minimum_required(VERSION 3.3)
- project(clang_delta)
- 
- ###############################################################################
---- a/clex/CMakeLists.txt
-+++ b/clex/CMakeLists.txt
-@@ -8,7 +8,7 @@
- 
- ###############################################################################
- 
--cmake_minimum_required(VERSION 2.8.12)
-+cmake_minimum_required(VERSION 3.3)
- 
- # find_package(FLEX) is done by the topmost "CMakeLists.txt" file.
- 
---- a/cvise/CMakeLists.txt
-+++ b/cvise/CMakeLists.txt
-@@ -8,7 +8,7 @@
- 
- ###############################################################################
- 
--cmake_minimum_required(VERSION 2.8.12)
-+cmake_minimum_required(VERSION 3.3)
- 
- project(cvise_python)
- 
---- a/delta/CMakeLists.txt
-+++ b/delta/CMakeLists.txt
-@@ -8,7 +8,7 @@
- 
- ###############################################################################
- 
--cmake_minimum_required(VERSION 2.8.12)
-+cmake_minimum_required(VERSION 3.3)
- 
- # find_package(FLEX) is done by the topmost "CMakeLists.txt" file.
- 
-