8 files changed, 19 insertions, 74 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 8648215dd309..0b16eb8eabf8 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cargo-c/Manifest b/dev-util/cargo-c/Manifest
index 9e34c49496a9..36b7f9a6b2c0 100644
--- a/dev-util/cargo-c/Manifest
+++ b/dev-util/cargo-c/Manifest
@@ -445,5 +445,5 @@ DIST zerocopy-0.7.32.crate 151096 BLAKE2B 12c7c329ec0e0865467af08306ff4b55ce1e39
 DIST zerocopy-derive-0.7.32.crate 37623 BLAKE2B 8b583d39d7bf9c3dbbba578120751c664f87363c5ba3fc45f6506a4059b9e599c43d9fc7bd498a257ff7c9d872af77d39bebdb0e65fb8009eaa2ae9903dece46 SHA512 3ce8528871fd18d6abe92b98503927451d25791c9c4af0ba39a3b6ba2006030bdc137084d080e9b1ac8b5ddf5f2121e0a3ef34bb2033a040f2c72c8149a9fc0d
 DIST zeroize-1.7.0.crate 19039 BLAKE2B 2f94a5025f409bd2b96a456d2f78a34c6b05b5554abe7ef3fad2a55a8fcff8a6a1b971be660aa4c2954ab7d6e89bebc431036e349edef74711292f9f64b1dbae SHA512 9d31e3e76e8c861309a3579c21f6da5fd6b056c7d7a350427445a1a832e8827204804783f7f9b808acaa2148efef883d9078bf84943b1db55526bba5bf5a2756
 EBUILD cargo-c-0.9.14.ebuild 4241 BLAKE2B 4126b7c247a50d835bbb4c585f49e6e3c100a2432616a943ccd67bb0c470162d6952783030f03a913876d6b006ae200e7dba943919187e95bb9cee307e483a12 SHA512 4ba94426dd5d056b56ba8ca03f394d8cf23be57237abef0657492e8b64a84843f96a36e8d06ee21e37a430ecda070598efb10d82a736cc13dc14c116ca1c5d6b
-EBUILD cargo-c-0.9.30.ebuild 7637 BLAKE2B c9e7d8bd2aab3907cb7fbfca6e801cef0ad00935eea4b2223a57a57076289615c6fc68039b1bdcf598ec19a2643b6708976a0a4eec42e4b0b76786af19d4dd09 SHA512 12b3283c05c33b70a19ea85c6d8a778893ac1fabe91debb1668ecad9b310c3e74d602fc88e72203a9a452bf3f9c15473e06114e99989d0a794d486abb72e52a7
+EBUILD cargo-c-0.9.30.ebuild 7622 BLAKE2B 7cec090e44fc5265096825eea44325debab0ccc651bb2b26373195dd5d969d80a57901fb1fe0a98de9d3cdb22a134009cb88c9612321f02f995de25cc20eed65 SHA512 0313c62edf88a3db06bf07aff08118139ce70ee9877e4c0711f683e191fa69fa92ce616430d239d1199bbdf34df0841764b4315e9a04b72457f9d7d6295d096d
 MISC metadata.xml 327 BLAKE2B 97957aa62ba7d72a68bcfd2c6a0ac966754c60fb63471ce6a0edd1319b06fa657b4b7c0ee88c8dbeadd1027802dd99c0005dd94def7f176d7f23fd8311cf3b10 SHA512 f981293e73aee49926e17d43b7f6737a5cc9fb968c23a5a4572f482e0cbb3e9587fce557bd272848ddb71f4ed7a769d6aa32b06e03bb2b82c79e04bd21106e7a
diff --git a/dev-util/cargo-c/cargo-c-0.9.30.ebuild b/dev-util/cargo-c/cargo-c-0.9.30.ebuild
index e3a68b2fb262..efd999171092 100644
--- a/dev-util/cargo-c/cargo-c-0.9.30.ebuild
+++ b/dev-util/cargo-c/cargo-c-0.9.30.ebuild
@@ -352,7 +352,7 @@ LICENSE="MIT"
 # Dependent crate licenses
 LICENSE+=" Apache-2.0 BSD ISC MIT MPL-2.0 MPL-2.0 Unicode-DFS-2016"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 RDEPEND="dev-libs/libgit2:=
 	dev-libs/openssl:=
@@ -376,6 +376,6 @@ src_configure() {
 	# Some crates will auto-build and statically link C libraries(!)
 	# Tracker bug #709568
 	export LIBSSH2_SYS_USE_PKG_CONFIG=1
-	export LIBGIT2_SYS_USE_PKG_CONFIG=1
+	export LIBGIT2_NO_VENDOR=1
 	export PKG_CONFIG_ALLOW_CROSS=1
 }
diff --git a/dev-util/cutter/Manifest b/dev-util/cutter/Manifest
index 11fdfd66cd7c..a435418c8936 100644
--- a/dev-util/cutter/Manifest
+++ b/dev-util/cutter/Manifest
@@ -1,7 +1,5 @@
-DIST cutter-2.2.1.tar.gz 11028914 BLAKE2B 4afb93940a3878b254d0c8cff37f63a40a2ba6d581d0ac086b0fe12fb914b161375c64aa18369892feae5da1726c047f96b2405d48f4cdba7532ef839c557ef6 SHA512 1036679049666971bc3dc8f54067d822bc6df798138790fdba2f70932f3034aceeceb10cb732c8257539b128a2d0b10f684d2d6db787402f70bfb1bf13dbbf39
-DIST cutter-2.3.1.tar.gz 11269422 BLAKE2B 7c0060551d9a40b9bef33e28db122f1d1aa5469750f5a02d436ac7c33e1849cb75b9080d21ff22b29868357395b224aa2267deed298c0913713f71429e9da23d SHA512 7166e9acf757b6cb11e3a16be5d5cc3783cdea906e642c40967e823bd0fe3cd877969b5123a555673e1ed23588c0037bb83b50be2beed6a436a90ab0eafa03a1
 DIST cutter-2.3.2.tar.gz 11280258 BLAKE2B 20dba40d96fed296b9af0b0e0b66dd46901bfc6621ba59cce1940ed2980acfc1e8b6447c20995bbeace71c7eeb1c9b180bf3b2076bbae9035706c6d4aff6dc5f SHA512 65ca98f6618b1e60efa25d33bb4f3ef6b36dfd8496cf1f40c6a6b9744df3c2f77673d1d3cc1142c1b3b064abd0698ca07a20c5e4009ba5f6b05fc7f7501a4435
-EBUILD cutter-2.2.1.ebuild 1345 BLAKE2B df0419a836ee7e1522e19f2677223cf5dcd1fcfed63dc17c1df566b8fb2021f0bf06b9c0896f8c177aa9a331fa73db7cbb4efb187caa135c886037d8e17df308 SHA512 956f479b54ffcdf053a1e223b73e15699e521a8a739bbe5e6d9f19a7c765bb092295da3ea3fcb85a4bd3d71d5a57aeabfde0dd015e53cf5e317e1149ae222022
-EBUILD cutter-2.3.1.ebuild 1347 BLAKE2B 54877e880445b4a2609f46112e413f68d01579f669be3cf3668f3778041ca8daecdfb0b43c76be4c7ad2be13e6a71e5a9aa095af541933bb4d4dbc4f786a6b16 SHA512 dba5a8013397d6baabfc4f2462b51d056806bec6bda2c2ea019206fbd21506a9b7c353720fa3e8e265f5e358d956809d89ea2a808c1ce7060274b77eccc5521e
+DIST cutter-2.3.3.tar.gz 11609727 BLAKE2B bea428892d242c8112d5004b9960d9f74b3aa48b5988436bba54983abf3d26f4bca89b4dc75061e857c2cc51f724ea392fc4f380f227c36f38618078ec0a5761 SHA512 7731b6a2efa03a745cd0760d905df474383dc77906d5aefada7bd94098d771b75ae030cb71ed33256cc2f3e23c1c4930d45355cf6371361cb9780b26996dd2cb
 EBUILD cutter-2.3.2.ebuild 1346 BLAKE2B 3898499fa79fb5180dab411bf0874f199da5c17a4aa03d129191ada0704635b97fc1536c6058989e66a518a3c10352b275a3b0c2e790bc2d0306f6057171524c SHA512 c3e15a1e29e756a05adc2aa94f39f7da61bec33e2f0a2f79969caa288d4e7f275c663f4f24696873312baf2096bba00ae9d6cc0377f7b499264bde33c3a02f22
+EBUILD cutter-2.3.3.ebuild 1347 BLAKE2B 38f40fe9722ada2396e73cee7e2687cfaf75eb4a01b8c9080510c1ba8b5acdb472b6ca661061eab8aea14551eeb31b311fe46a829c66649978f0ebad14f8a8c0 SHA512 97f6b41f11fd409bacf20de61fe104be9b458741881d1da83b6235f569e31137fe302268ebe46cd20c08851f518c82cf10ce84cff0893722798a461a2960778d
 MISC metadata.xml 329 BLAKE2B ccc11908a8ba66fdc15f6fe8ea45e62e797050488dc82de159525338cb4ffc4d52609bd815dd0a2ad3ad23a915e5bf631dc3db640a0e7c314fb5fa66cfe5b2b7 SHA512 208b070fdb02df4825d364ee5d86c3be7658fb6c84420d53b5e4f72427de0a2b8c201e46a6bae9d923eb5e9b0f195fb639336452c89dd4affc5527908cd152fb
diff --git a/dev-util/cutter/cutter-2.2.1.ebuild b/dev-util/cutter/cutter-2.2.1.ebuild
deleted file mode 100644
index 8937a0e9eceb..000000000000
--- a/dev-util/cutter/cutter-2.2.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..12} )
-
-inherit cmake toolchain-funcs xdg-utils python-single-r1
-
-MY_P="${PN^}-v${PV}"
-
-DESCRIPTION="A Qt and C++ GUI for rizin reverse engineering framework"
-HOMEPAGE="https://cutter.re https://github.com/rizinorg/cutter/"
-SRC_URI="https://github.com/rizinorg/${PN}/releases/download/v${PV}/${MY_P}-src.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="CC-BY-SA-3.0 GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="graphviz"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	>=dev-util/rizin-0.5.0:=
-	graphviz? ( media-gfx/graphviz )"
-RDEPEND="${DEPEND}
-	!net-analyzer/cutter" # https://bugs.gentoo.org/897738
-BDEPEND="dev-qt/linguist-tools:5"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER="$(tc-getCXX)"
-		-DCMAKE_C_COMPILER="$(tc-getCC)"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		-DCUTTER_ENABLE_GRAPHVIZ="$(usex graphviz)"
-		-DCUTTER_ENABLE_KSYNTAXHIGHLIGHTING=OFF
-		-DCUTTER_ENABLE_PYTHON=ON
-		-DCUTTER_USE_ADDITIONAL_RIZIN_PATHS=OFF
-		-DCUTTER_USE_BUNDLED_RIZIN=OFF
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/dev-util/cutter/cutter-2.3.1.ebuild b/dev-util/cutter/cutter-2.3.3.ebuild
index 410b1cc43a64..4f65e2f75406 100644
--- a/dev-util/cutter/cutter-2.3.1.ebuild
+++ b/dev-util/cutter/cutter-2.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,7 +26,7 @@ DEPEND="${PYTHON_DEPS}
 	dev-qt/qtnetwork:5
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
-	>=dev-util/rizin-0.6.1:=
+	>=dev-util/rizin-0.7.0:=
 	graphviz? ( media-gfx/graphviz )"
 RDEPEND="${DEPEND}
 	!net-analyzer/cutter" # https://bugs.gentoo.org/897738
diff --git a/dev-util/rizin/Manifest b/dev-util/rizin/Manifest
index ea1f8b0f49e8..08a567023f01 100644
--- a/dev-util/rizin/Manifest
+++ b/dev-util/rizin/Manifest
@@ -1,8 +1,9 @@
 AUX rizin-0.4.0-never-rebuild-parser.patch 1568 BLAKE2B c77276adb8349188ebc937d84b011650b978ba5bed6c0596258963d395014c5e0733e44930b4c2db6dd88941d99b2aa37acf461d035fc31dcd321571ef0d6392 SHA512 a46311772dc42b90b8e3e49ddb66f6d64873773e254ac943934de0129d5f4a77ccb759d20b519b58418d45c076f136d582f2e70056693c75b2f6aae19eb07551
 AUX rizin-0.5.2-find-tree-sitter-parser.patch 1128 BLAKE2B c3a72fda5005d50f47b2a1c5350b017f8e6fd4d4d232c8502adcceef6542d509c70f68ef396ffff159c4f37a8575931e4a440c689c403a653ac9145489fa4405 SHA512 2977c1004b76740a2e35156a2f92e415530a401eeaddbf59f4efc8ee36bc0fdec7f0402b4aa1732fc0827a4a5c505cc2851db65fb7a25d254ddb631c6c8542c9
-DIST rizin-src-v0.6.2.tar.xz 15409072 BLAKE2B 9e90b07b5a3a5196e68e7c283dcfa214449e9cf1099c90b80a4e3712997bd6f28d5682de01c6f2b6ccafa749e74a4a9a8f7e6e0a313e926779394322a52b14ff SHA512 2b75ebd1c94dd560bb48ffaf8cb56d765ceafd00a3a878f0ae8802a51f398202c501db4c2ec2caefa89a770d4e674743ff5b56fd21f06bf99d9bac4753580dce
 DIST rizin-src-v0.6.3.tar.xz 15411052 BLAKE2B 4ddde26dc2541917e1d16f38339bf1467b2148524a1365d739c417857ee856ecb7fbc9210a0f3b562a429c962e31f637bb88a0c0817f42a59868ed3093b0e902 SHA512 031ae1c5b43237d55b3e48d825d4bd9cda16a4a84a47464eb1745a02265a1412e2864345595c0dca7f8ea0cb348fe9760ea424556ff6b915ac8014a7f410b03c
+DIST rizin-src-v0.7.1.tar.xz 18941692 BLAKE2B d0384a272e5e8274c970dd9253d84204e8bc026de05ec63fe0252cb6fc9eaee9729bbf03ef3dba100c6e55c58e4a81f7755d7ecb15eebbbb041aa9bfb4c53d30 SHA512 e59b6fd748e551f10169da9a04f7c04ffb017182d3eb5856467df3b167c6d9b387d0faccdb0cd97ee7321ac71179eb7d9a28fa954f34dc028ea8e4259211eac7
+DIST rizin-testbins-1203a9a2f51e32337c8434d9f4f7c4543552e271.tar.gz 185572487 BLAKE2B b274a58bebe0123bd8ab7b18a4e88833e7de53133d8f640d00b9efa953cf8ef766582acd5a0f65750ebb273be70d5cc1daf9b700cd6b9bfd4d464cf59ab735ba SHA512 47e8993bea5d7805acb46c1c4e034524fe47d2b0b2471af00d3255f3e853430617658cd6b1f8a4706a748704a52646ec43495f0d4e80f16bce4aaf34e29539a4
 DIST rizin-testbins-903588ed69d7717069955322b31dad5e666b338a.tar.gz 181644100 BLAKE2B ea491bea61a6d17fa2727e1b08b810be2bb99d05cf2afa4e97dc440a69a4fd376a39c25c6e86e9e2d499732b55e7c75e5eef39adef84f571e48d147e410d04e5 SHA512 fffef043d76440976e02e2b890138f57df849f507c0a7a48bd97b421fc1683e73696c50b6daddf906a53685eccfd7346e25881d3d498417e4e55b97ef56b8317
-EBUILD rizin-0.6.2.ebuild 2530 BLAKE2B d3f8144eeeb635559259b84e8c9bcdf2a9a91ba96b66d54091f05099a8a5ef874ff03736c0641aa5f1ebf458c85fe21f0083d95ba9516026c4f96c03b6576f6f SHA512 adad0caaa499c2148da8caa59ba7c6a287437f884ea7681a1c29fc44f9046948036539b8e4fe1869387ad013d96923fdcf077217c23c8e201e9a049bb6ab70a4
 EBUILD rizin-0.6.3.ebuild 2530 BLAKE2B d3f8144eeeb635559259b84e8c9bcdf2a9a91ba96b66d54091f05099a8a5ef874ff03736c0641aa5f1ebf458c85fe21f0083d95ba9516026c4f96c03b6576f6f SHA512 adad0caaa499c2148da8caa59ba7c6a287437f884ea7681a1c29fc44f9046948036539b8e4fe1869387ad013d96923fdcf077217c23c8e201e9a049bb6ab70a4
+EBUILD rizin-0.7.1.ebuild 2515 BLAKE2B 540336b6045a2f0773a1817fdc670d98ebecd96c227dacdfef92a16f575eae6d24e2d19cb43b0e718e7f85404dc0d7485a9b4958636776ae31ef6ff8b964a62d SHA512 f97b156cbd9bc59a1a0c2f56caa6f096eb91f7c05e45dbe9e81349dabeae64323e04af859f0abccebcf21d43f2d3edf381bce15c1ce6eb0ad690d45b7707672d
 MISC metadata.xml 427 BLAKE2B 2937970e78526f69e371b4451a3406b1fdc35a01707d366e8b54e23f9d13e8a713254902825ae111817ee00ea3aaf3bc968db8b6d944b15f869e2b89ba8e16b8 SHA512 65cc9c4cd5f2f64cd02e89b0f7f4972fefec51cb175650625da263b729022587c9487e9ab9faed8517200ed622a8ca5ec35b2b6f4c67966d78344c043197c981
diff --git a/dev-util/rizin/rizin-0.6.2.ebuild b/dev-util/rizin/rizin-0.7.1.ebuild
index 80c181364210..0ec214767a5e 100644
--- a/dev-util/rizin/rizin-0.6.2.ebuild
+++ b/dev-util/rizin/rizin-0.7.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 # This is the commit that the CI for the release commit used
-BINS_COMMIT="903588ed69d7717069955322b31dad5e666b338a"
+BINS_COMMIT="1203a9a2f51e32337c8434d9f4f7c4543552e271"
 
 inherit meson python-any-r1
 
@@ -15,7 +15,7 @@ HOMEPAGE="https://rizin.re/"
 
 SRC_URI="mirror+https://github.com/rizinorg/rizin/releases/download/v${PV}/rizin-src-v${PV}.tar.xz
 	test? ( https://github.com/rizinorg/rizin-testbins/archive/${BINS_COMMIT}.tar.gz -> rizin-testbins-${BINS_COMMIT}.tar.gz )"
-KEYWORDS="amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 LICENSE="Apache-2.0 BSD LGPL-3 MIT"
 SLOT="0/${PV}"
@@ -28,10 +28,12 @@ RESTRICT="test? ( fetch ) !test? ( test )"
 RDEPEND="
 	app-arch/lz4:0=
 	app-arch/xz-utils
+	app-arch/zstd:=
 	>=dev-libs/capstone-5:0=
 	dev-libs/libmspack
 	dev-libs/libzip:0=
 	dev-libs/openssl:0=
+	dev-libs/libpcre2:0=
 	>=dev-libs/tree-sitter-0.19.0
 	dev-libs/xxhash
 	sys-apps/file
@@ -42,7 +44,6 @@ BDEPEND="${PYTHON_DEPS}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.4.0-never-rebuild-parser.patch"
-	"${FILESDIR}/${PN}-0.5.2-find-tree-sitter-parser.patch"
 )
 
 S="${WORKDIR}/${PN}-v${PV}"
@@ -74,11 +75,12 @@ src_configure() {
 		-Duse_sys_capstone=enabled
 		-Duse_sys_libmspack=enabled
 		-Duse_sys_libzip=enabled
+		-Duse_sys_libzstd=enabled
 		-Duse_sys_lz4=enabled
 		-Duse_sys_lzma=enabled
 		-Duse_sys_magic=enabled
-		# https://github.com/rizinorg/rizin/issues/3841
-		# -Duse_sys_openssl=enabled
+		-Duse_sys_openssl=enabled
+		-Duse_sys_pcre2=enabled
 		-Duse_sys_tree_sitter=enabled
 		-Duse_sys_xxhash=enabled
 		-Duse_sys_zlib=enabled