summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util/cvise')
-rw-r--r--dev-util/cvise/Manifest3
-rw-r--r--dev-util/cvise/cvise-1.1.0.ebuild48
-rw-r--r--dev-util/cvise/cvise-2.10.0.ebuild (renamed from dev-util/cvise/cvise-1.6.0.ebuild)59
-rw-r--r--dev-util/cvise/metadata.xml11
4 files changed, 43 insertions, 78 deletions
diff --git a/dev-util/cvise/Manifest b/dev-util/cvise/Manifest
index 7f952238977a..62e4d47b4a8f 100644
--- a/dev-util/cvise/Manifest
+++ b/dev-util/cvise/Manifest
@@ -1,2 +1 @@
-DIST cvise-1.1.0.tar.gz 228867 BLAKE2B 08becb5ad00ef08a1f511c0bdb0cb649af1406dd035fe61f737ec6dfb5151215ae363272fc3676ce76e17234a88866ee1dd0664d82326f3ddb2ced2f1982aacf SHA512 66c09cb7e088fc36b0c36928e2eda19e7bef4fad4573fcedc06f2070136e74d7878f8056f406c2ade22fc465a75bf13dca9f4a1a319cd183187a2d66a441e661
-DIST cvise-1.6.0.tar.gz 243050 BLAKE2B 64c305426dbeaf2e3f3a92a902209b35fcc76b5f5a6d2e48fcc8e24d1325badc0839e70afa1381c6d1412c22a7e9dd41ca03d6ca714fa5082958378cc8863000 SHA512 9d4ee043c34748b600b49ac4f00463b853faff2809f8b581e9b07433a8f3bef4436d0e5d5a9dbff1b2d7c3a8ab1d6d4823e78787eb3e911a683808703b2e24b6
+DIST cvise-2.10.0.tar.gz 270839 BLAKE2B 36f54cbfe8eab0c2d64a4d2d482f558cb9e32ccce0b0c03923f62b682e33941ab37a57a1c51a4173a22e2ad9e59fec3256469e1b19baaea0446caa56877ea056 SHA512 31950f8731f7a8d6b9568be621b14d1f976a71ed0a6caef0cdcc0d31c99eca86c03913e2949f1f4e21a66fbe1618341f5daaff01da51b426b4ce0e6518479281
diff --git a/dev-util/cvise/cvise-1.1.0.ebuild b/dev-util/cvise/cvise-1.1.0.ebuild
deleted file mode 100644
index dd6cb68eb87c..000000000000
--- a/dev-util/cvise/cvise-1.1.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-: ${CMAKE_MAKEFILE_GENERATOR=ninja}
-PYTHON_COMPAT=( python3_{6,7,8} )
-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=10
-DEPEND="sys-devel/clang:${LLVM_MAX_SLOT}"
-RDEPEND="${DEPEND}
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/pebble[${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}"
-}
-
-src_test() {
- cd "${BUILD_DIR}" || die
- pytest -vv || die
-}
diff --git a/dev-util/cvise/cvise-1.6.0.ebuild b/dev-util/cvise/cvise-2.10.0.ebuild
index 819ee2f921ed..affafc8cd703 100644
--- a/dev-util/cvise/cvise-1.6.0.ebuild
+++ b/dev-util/cvise/cvise-2.10.0.ebuild
@@ -1,59 +1,70 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-: ${CMAKE_MAKEFILE_GENERATOR=ninja}
-PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake llvm python-single-r1
+PYTHON_COMPAT=( python3_{10..12} )
+LLVM_COMPAT=( {16..18} )
+inherit cmake llvm-r1 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"
+ https://github.com/marxin/cvise/archive/v${PV}.tar.gz -> ${P}.tar.gz
+"
LICENSE="UoI-NCSA"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc 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}
+ $(llvm_gen_dep '
+ sys-devel/clang:${LLVM_SLOT}
+ sys-devel/llvm:${LLVM_SLOT}
+ ')
+"
+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"
+ app-alternatives/lex
+"
BDEPEND="
${PYTHON_DEPS}
- sys-devel/flex
+ app-alternatives/lex
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
+ llvm-r1_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
- pytest -vv || die
+ epytest
+}
+
+src_install() {
+ cmake_src_install
+
+ python_fix_shebang "${ED}"/usr/bin/cvise
}
diff --git a/dev-util/cvise/metadata.xml b/dev-util/cvise/metadata.xml
index 0319eec4c8be..34abec55e165 100644
--- a/dev-util/cvise/metadata.xml
+++ b/dev-util/cvise/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>mgorny@gentoo.org</email>
- <name>Michał Górny</name>
+ <maintainer type="project">
+ <email>toolchain@gentoo.org</email>
+ <name>Gentoo Toolchain Project</name>
</maintainer>
+ <upstream>
+ <remote-id type="github">marxin/cvise</remote-id>
+ </upstream>
</pkgmetadata>