From 2cb073ec1e1577919b20fc5cec7c5b40078e5ae8 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Fri, 28 Apr 2023 00:24:28 +0100
Subject: dev-util/cvise: support LLVM 16

Signed-off-by: Sam James <sam@gentoo.org>
---
 dev-util/cvise/cvise-2.7.0-r1.ebuild          | 81 +++++++++++++++++++++++++++
 dev-util/cvise/cvise-2.7.0.ebuild             | 77 -------------------------
 dev-util/cvise/files/cvise-2.7.0-llvm16.patch | 68 ++++++++++++++++++++++
 3 files changed, 149 insertions(+), 77 deletions(-)
 create mode 100644 dev-util/cvise/cvise-2.7.0-r1.ebuild
 delete mode 100644 dev-util/cvise/cvise-2.7.0.ebuild
 create mode 100644 dev-util/cvise/files/cvise-2.7.0-llvm16.patch

(limited to 'dev-util/cvise')

diff --git a/dev-util/cvise/cvise-2.7.0-r1.ebuild b/dev-util/cvise/cvise-2.7.0-r1.ebuild
new file mode 100644
index 000000000000..0c599e87daf6
--- /dev/null
+++ b/dev-util/cvise/cvise-2.7.0-r1.ebuild
@@ -0,0 +1,81 @@
+# 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.7.0.ebuild b/dev-util/cvise/cvise-2.7.0.ebuild
deleted file mode 100644
index a432c67a8e92..000000000000
--- a/dev-util/cvise/cvise-2.7.0.ebuild
+++ /dev/null
@@ -1,77 +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=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}]
-		')
-	)
-"
-
-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/files/cvise-2.7.0-llvm16.patch b/dev-util/cvise/files/cvise-2.7.0-llvm16.patch
new file mode 100644
index 000000000000..11f0100b6d28
--- /dev/null
+++ b/dev-util/cvise/files/cvise-2.7.0-llvm16.patch
@@ -0,0 +1,68 @@
+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.
+ 
+
-- 
cgit v1.2.3-65-gdbad