7 files changed, 76 insertions, 77 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index d9d60a34cc65..e98aa5d33fd9 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 89279d68f7cb..a0aaa429fba2 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,6 +1,4 @@
-DIST catalyst-3.0.18.tar.bz2 621208 BLAKE2B 63f76634b96006ef4a751b0ce166ab36dcba3016234251b2e44e89b43b0c6909e57914007d6287e54584094ff7f064c0251a79f095c87e4c7957925e9d4605cd SHA512 94a30304b242b4e63cc14f34916acd68c03700876ba1cc2f516880f4e8365258de8b62db85cddc9492229414484ba6908edc91991b70b13da0578792b8b96aa3
 DIST catalyst-3.0.21.tar.bz2 620472 BLAKE2B 6ecf59edde24cbec6d072a31680b75e2e7f142e267b43783473dc607b189d5091b6ca2b7bd02e88a6528a7bccea8441fce21c74aed6623ec14d701557fb4d267 SHA512 e2c58a562508e25465186a5d9771040ddb9f00104943a6434489e5ef01da220ac0330339f741d023717c8d1df6ec2bf765654fabe4097d93d3086ef9005a294c
-EBUILD catalyst-3.0.18.ebuild 1921 BLAKE2B e6816716661490d98271f79ae6f78a48394df34f6ba1e3a0ee504d0fbd218861b135ca7b82136c2ebe4ce5b29efc9c0a2527fc5d362342ffc49159588fa65084 SHA512 05ed3e0a88ac4f70a71efa372b9ffb28b4b6fe51299aecbcabb386176ecccfbdc35de12341bc4f93a08e3768d04315824460c4e776a6b1e4e717876c68b62ffe
 EBUILD catalyst-3.0.21.ebuild 1918 BLAKE2B d69cb68a5f829f3253d4eae7318b77ee783bd462e7c14e6f81c50e251e1e5bfea923d21876f8e847fe4084876899cc6601c10e63c7c99337965663134eeedeab SHA512 2ad74bc3c23c6e2ca72a437eede495b81b5bd13e9b65fff1bef709f6ade94479631674b60baa5a8b767d7385741e4355a44cb444f98457d3708a236d17750533
 EBUILD catalyst-9999.ebuild 2276 BLAKE2B c9c69540cb30c045e86318b58b94cc103cca96b5decb7a9bfce1a375d30d92a15cfb3b6292aa38f23de7031dbd3f9202261080ed522a214044821c1e438e802f SHA512 8c065eb89b69bbf42a8a716ca8062d4b5968a29dad635ba01b2403bc92cc77c383726e9993dcf58bcdd0efb2ac7ada5c7a6e7f0c13e292f42263a605763cb35b
 MISC metadata.xml 513 BLAKE2B 22190e4d7fa9f6ff81681614aad1ae622462418be7fbdb6ecb11bf14f884b6520592a8125a5896ff27de788824a98a0005853ad54ed8fcb39daddec570924551 SHA512 a47a00346b514a42add12c5d0d83d712e1cd28e1737ba4c3a1ebc710ad4a0cab365c969e2da5e78f675a5a5ecdeef8925fae53a80ca8d22df6cf74d89efdf1c4
diff --git a/dev-util/catalyst/catalyst-3.0.18.ebuild b/dev-util/catalyst/catalyst-3.0.18.ebuild
deleted file mode 100644
index 3a8a525c1ceb..000000000000
--- a/dev-util/catalyst/catalyst-3.0.18.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == *9999* ]]; then
-	SRC_ECLASS="git-r3"
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-fi
-
-PYTHON_COMPAT=( python3_{8,9} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1 ${SRC_ECLASS}
-
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="ccache doc +iso system-bootloader"
-
-DEPEND="
-	app-text/asciidoc
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-	<dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-	<dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
-	app-arch/lbzip2
-	app-crypt/shash
-	sys-fs/dosfstools
-	|| (
-		app-arch/tar[xattr]
-		app-arch/libarchive[xattr]
-	)
-	amd64? ( >=sys-boot/syslinux-3.72 )
-	x86? ( >=sys-boot/syslinux-3.72 )
-	ccache? ( dev-util/ccache )
-	iso? ( app-cdr/cdrtools )
-	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
-"
-PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
-				sys-boot/grub:2
-				amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
-				x86? ( sys-boot/grub[grub_platforms_efi-32] )
-				sys-boot/syslinux
-				sys-boot/shim )"
-
-python_prepare_all() {
-	python_setup
-	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
-	VERSION="${PV}" "${PYTHON}" setup.py set_version || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# build the man pages and docs
-	emake
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use doc; then
-		dodoc files/HOWTO.html files/docbook-xsl.css
-	fi
-}
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index e764f0e03445..587593023f47 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -19,7 +19,7 @@ DIST cmake-3.24.1-docs.tar.xz 491808 BLAKE2B 5bafdcb5b705581fbb63e9733d37ca10b8f
 DIST cmake-3.24.1.tar.gz 10392868 BLAKE2B 628e2610c01af8e03eb7a201ae56a6e909c63314a993d2066f363d6181cfd2d0a0e5c09e9f74ad5ae3d226e15c2b04be250dc9bf1a273158fa3073bcc05c3a8e SHA512 67bfafcf9ceba617d7ebbb0ac88b689a2d90ab51fea4a83bd073ee082fb55de8962ce7fb283f3db5f455d286f2199843ffa595a1de207d4fa3e4472d951eb289
 EBUILD cmake-3.22.4.ebuild 6819 BLAKE2B 80a67b691859734df593dc01add20acedfc991b0beba716690258fde46d9d3477a578bbe18eaae87744024093f1e9dc214cbc032e1a5c29ee980517ba668e00e SHA512 0b92fe74c7b0f62db3b107c9a1e5ae750e1f9fa013ae34e874564470a01148df750da7bcff0bfb465c094d547e926cb3bc27633837e23de24a07fba2a3bbb409
 EBUILD cmake-3.22.6.ebuild 6827 BLAKE2B c219b7191f3562325b33d75c3958cdf291ada8a892212e6b132ecd43fb77437465462dd4a6adc3958faff0b01a5ead7c0edf6011a0f232cc37d69045d8b6f60a SHA512 d3e5f98312456305149800f784362c37f69b1d50ff09088b474edd450046def404d6fedc02220674caf78bfc118fc5c710c9e85a98d5e13ef81801183fccba8d
-EBUILD cmake-3.23.3.ebuild 7788 BLAKE2B 5c252f4420a97300b2a595b66b0ac1f0c134deddb8b4a2b3a3f352f2b9588c9d73a0991e897bdc70bdee03068c34df1de99ead331863d367cd636376b8aab22c SHA512 6b101cbd5ee190e5760dd4cc31163a8b76576be54cb3c913ebebcc5c18ddd0648a71a6d469f4394d4478a5ff90664ea3630a795f4831eb0c95e90dac59980019
+EBUILD cmake-3.23.3.ebuild 7786 BLAKE2B 5157538dc24bf0f62f89c532d5cefa4725687e875780d10da41ac4c0f7c52e5f9008b8428c40da4a01ca1babc61a6fdde8656572dba67acff515e1477a789c7b SHA512 bad1b24104f29b4997800b775989a82bd5d4d7e3f26382a595f16021b98cd096ac345b4cbe5d67b7a243157d3c1dd0301594673192e06ce02579abd16827a3a2
 EBUILD cmake-3.24.1.ebuild 8817 BLAKE2B 06ac24772d2c04132c85a6b6823771eaf1c1b44d6bc77ac891a0b29725d57576e4c23ca54ee7ae54ff6cf20f403909b6f890fe469fca6d5a8a2e350524f8dec6 SHA512 c945fa714a256b0a3e6d8ea713b55ea0f914f37d6776428bb89fd30c0341711130c5bf795f8c8ec3e6c4c9c103be8e93737b86e6528b6d1efe301cb600d40a84
 EBUILD cmake-9999.ebuild 8817 BLAKE2B 06ac24772d2c04132c85a6b6823771eaf1c1b44d6bc77ac891a0b29725d57576e4c23ca54ee7ae54ff6cf20f403909b6f890fe469fca6d5a8a2e350524f8dec6 SHA512 c945fa714a256b0a3e6d8ea713b55ea0f914f37d6776428bb89fd30c0341711130c5bf795f8c8ec3e6c4c9c103be8e93737b86e6528b6d1efe301cb600d40a84
 MISC metadata.xml 456 BLAKE2B 2dc475cae4d2f65744e25381b1e4fe8b6399225380d0f9fa81870813221d180b1c4b538c3f9249f80e921a1db8afab7071db206898fdec294372811dc456d1f5 SHA512 347c1e13f459dfb9bec9d52ce556526eb74e6c432ff28aed28f05dc17bba17934fff1ce2fc27765b390bb55aaa7b02d0800939eb4382eba6c4b85a62ec136f5a
diff --git a/dev-util/cmake/cmake-3.23.3.ebuild b/dev-util/cmake/cmake-3.23.3.ebuild
index e1e0b121cd33..01a0ab88915d 100644
--- a/dev-util/cmake/cmake-3.23.3.ebuild
+++ b/dev-util/cmake/cmake-3.23.3.ebuild
@@ -29,7 +29,7 @@ else
 			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc
 		)"
 
-		KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 		BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )"
 	fi
diff --git a/dev-util/cvise/Manifest b/dev-util/cvise/Manifest
index ced00302a9c4..7ac33d0c92ff 100644
--- a/dev-util/cvise/Manifest
+++ b/dev-util/cvise/Manifest
@@ -1,3 +1,5 @@
 DIST cvise-2.4.0.tar.gz 252810 BLAKE2B a95d1645192886d8871dcdf7f9cdfa5a2ac615a3bbc24782c0966d1872fe5f3ade7ddb82afabecfcdebfdac257e2e13e6cb99ab7320baee1a4b43ab360e6a0b2 SHA512 073e53039d2b077fed43b948e0c01dc662ef4f75b92d7f49d1786a35c36412fed02e1931c6a39ce902452056fe5c7d70daa35a9cae18b44009778837261cae19
+DIST cvise-2.5.0.tar.gz 255587 BLAKE2B ec33bcb0ac45bf89a66bd30b22386f5c0b994e774c1d30f7869e15bcd5bada2e511ad4028628af6c545a23fddde7bc43978fc63cc3b5168db8d038aec9310073 SHA512 8433d4daf0e0691b99ff78f4b5331da0d230d5872c214ffd4a7dee470d955c2a3d7541c19277555a6e97108f8cd3de589b3f724e2874c44e479e351777c671c4
 EBUILD cvise-2.4.0-r2.ebuild 1417 BLAKE2B d8293e4b88aaef43886b2993b32e52b4230fead987667414444e26b0aeeba4c93a96d58f7e621f6caa162fcfcb6c7378863eeee69a4b542a0bd8e564aca6914e SHA512 9de9c7cc8d48fef5f515c9a11166e86decd97654f80e41dec53a093203bfac61a042c06090919df7cd12d17b529e2756df91ea95cdd92351a0d99d9be24cc8f1
+EBUILD cvise-2.5.0.ebuild 1290 BLAKE2B d5500da330f746d81cc57bfb62f6e692c3f13be3e3f91f6bad2d6e6e30c4e8462543de6a76927653debb2b1b472e067c31a1c23b2a5f6728ce8c71f3e2413e94 SHA512 952f32de66eff39a5170952b2309c807c880df2e13f227c63748e32f953d19dc74819bf2063190183b234e44564544c87325675de4fdcf7e0c2bde2032876964
 MISC metadata.xml 325 BLAKE2B 52e58fd0c3babe2c595399ff2878b758960d089b0cefc0f8589365704f3628a93688d5b6ee06e88e54a4435ac0280d8cf542c37c079d149e44a2a64cd4db12c2 SHA512 9e509c76ab4cf07804997751996b5c73efc04839a1d6e2bd4b98c5ad2ffde0fb1008332f1b52bbf0985d65ceed73ccdf101c62a9b7d0bb1f5694083d1e33afb9
diff --git a/dev-util/cvise/cvise-2.5.0.ebuild b/dev-util/cvise/cvise-2.5.0.ebuild
new file mode 100644
index 000000000000..05efec46a120
--- /dev/null
+++ b/dev-util/cvise/cvise-2.5.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..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 ~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_test() {
+	cd "${BUILD_DIR}" || die
+	epytest
+}
+
+src_install() {
+	cmake_src_install
+
+	python_fix_shebang "${ED}"/usr/bin/cvise
+}