commit: 98bb3f243054e945984fe0f405faa3c0a1d3c879 Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Wed Jul 23 13:41:06 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Jul 23 14:01:05 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98bb3f24
dev-util/cvise: bump to llvm-r2 llvm-r2 handles cmake find_package better as otherwise the build system would pick up llvm-21 for me. Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Part-of: https://github.com/gentoo/gentoo/pull/43122 Closes: https://github.com/gentoo/gentoo/pull/43122 Signed-off-by: Sam James <sam <AT> gentoo.org> .../{cvise-9999.ebuild => cvise-2.11.0-r2.ebuild} | 33 +++++++++------------- dev-util/cvise/cvise-9999.ebuild | 4 +-- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/dev-util/cvise/cvise-9999.ebuild b/dev-util/cvise/cvise-2.11.0-r2.ebuild similarity index 65% copy from dev-util/cvise/cvise-9999.ebuild copy to dev-util/cvise/cvise-2.11.0-r2.ebuild index edcf1523769d..deb6cd6f8eea 100644 --- a/dev-util/cvise/cvise-9999.ebuild +++ b/dev-util/cvise/cvise-2.11.0-r2.ebuild @@ -3,29 +3,22 @@ EAPI=8 -PYTHON_COMPAT=( python3_{11..14} ) -LLVM_COMPAT=( {16..21} ) -inherit cmake llvm-r1 python-single-r1 +PYTHON_COMPAT=( python3_{11..13} ) +LLVM_COMPAT=( {16..20} ) +inherit cmake llvm-r2 python-single-r1 DESCRIPTION="Super-parallel Python port of the C-Reduce" -HOMEPAGE="https://github.com/marxin/cvise"; - -if [[ ${PV} == 9999 ]] ; then - EGIT_REPO_URI="https://github.com/marxin/cvise"; - inherit git-r3 -else - SRC_URI=" - https://github.com/marxin/cvise/archive/v${PV}.tar.gz -> ${P}.tar.gz - " - - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi +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 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="test" RESTRICT="!test? ( test )" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" +REQUIRED_USE=${PYTHON_REQUIRED_USE} DEPEND=" $(llvm_gen_dep ' @@ -38,10 +31,8 @@ RDEPEND=" ${PYTHON_DEPS} $(python_gen_cond_dep ' dev-python/chardet[${PYTHON_USEDEP}] - dev-python/jsonschema[${PYTHON_USEDEP}] dev-python/pebble[${PYTHON_USEDEP}] dev-python/psutil[${PYTHON_USEDEP}] - dev-python/zstandard[${PYTHON_USEDEP}] ') dev-util/unifdef app-alternatives/lex @@ -57,9 +48,13 @@ BDEPEND=" ) " +PATCHES=( + "${FILESDIR}"/${P}-llvm20.patch +) + pkg_setup() { python-single-r1_pkg_setup - llvm-r1_pkg_setup + llvm-r2_pkg_setup } src_prepare() { diff --git a/dev-util/cvise/cvise-9999.ebuild b/dev-util/cvise/cvise-9999.ebuild index edcf1523769d..d03f6bb33dc4 100644 --- a/dev-util/cvise/cvise-9999.ebuild +++ b/dev-util/cvise/cvise-9999.ebuild @@ -5,7 +5,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{11..14} ) LLVM_COMPAT=( {16..21} ) -inherit cmake llvm-r1 python-single-r1 +inherit cmake llvm-r2 python-single-r1 DESCRIPTION="Super-parallel Python port of the C-Reduce" HOMEPAGE="https://github.com/marxin/cvise"; @@ -59,7 +59,7 @@ BDEPEND=" pkg_setup() { python-single-r1_pkg_setup - llvm-r1_pkg_setup + llvm-r2_pkg_setup } src_prepare() {
