7 files changed, 161 insertions, 2 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 45ccb8b2c735..b2f0650f5fca 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cutter/Manifest b/dev-util/cutter/Manifest
index 89e0ebf7b7e6..786bb2dcc354 100644
--- a/dev-util/cutter/Manifest
+++ b/dev-util/cutter/Manifest
@@ -1,3 +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
 EBUILD cutter-2.2.1.ebuild 1345 BLAKE2B df0419a836ee7e1522e19f2677223cf5dcd1fcfed63dc17c1df566b8fb2021f0bf06b9c0896f8c177aa9a331fa73db7cbb4efb187caa135c886037d8e17df308 SHA512 956f479b54ffcdf053a1e223b73e15699e521a8a739bbe5e6d9f19a7c765bb092295da3ea3fcb85a4bd3d71d5a57aeabfde0dd015e53cf5e317e1149ae222022
+EBUILD cutter-2.3.1.ebuild 1347 BLAKE2B 54877e880445b4a2609f46112e413f68d01579f669be3cf3668f3778041ca8daecdfb0b43c76be4c7ad2be13e6a71e5a9aa095af541933bb4d4dbc4f786a6b16 SHA512 dba5a8013397d6baabfc4f2462b51d056806bec6bda2c2ea019206fbd21506a9b7c353720fa3e8e265f5e358d956809d89ea2a808c1ce7060274b77eccc5521e
 MISC metadata.xml 329 BLAKE2B ccc11908a8ba66fdc15f6fe8ea45e62e797050488dc82de159525338cb4ffc4d52609bd815dd0a2ad3ad23a915e5bf631dc3db640a0e7c314fb5fa66cfe5b2b7 SHA512 208b070fdb02df4825d364ee5d86c3be7658fb6c84420d53b5e4f72427de0a2b8c201e46a6bae9d923eb5e9b0f195fb639336452c89dd4affc5527908cd152fb
diff --git a/dev-util/cutter/cutter-2.3.1.ebuild b/dev-util/cutter/cutter-2.3.1.ebuild
new file mode 100644
index 000000000000..410b1cc43a64
--- /dev/null
+++ b/dev-util/cutter/cutter-2.3.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..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.6.1:=
+	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/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index 716a0ca253f6..c0ca542ef88c 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -1,6 +1,6 @@
 AUX geany-plugins-1.38-libgit2-1.4.patch 4854 BLAKE2B 5605f5776186adaadbc0f861a1de217587a0cadcbd5f0844a0071246e5622ac830f759de4b1c7a5a3540d809c40822b619d0985561cb0f05c557c6d4d06a4a37 SHA512 9b35a656171a6183bbc8764622903d2e7767fafb548c3f2d3cb4e072a01c0bdbbfbeee20b65d42dc36f30bbfde28c5c2899e14f5ccdde1c8e96c877670889977
 AUX geany-plugins-1.38-webkit2gtk-4.1.patch 811 BLAKE2B 1c682cd813350cc61d53fe72609aac7ef212bb4710f0925bc55f5da6f9241c3709d7183d25478024ac8883633ff3605b5b4e5e5c90005a09eb653c701059909a SHA512 4b02c9a13e57ded452d52ff10c0f81ddc56bc193e0301c0805ef154792125fe9f9b6a5c35e81d9535407a67b12a268f5e1eb122b24580c6cf5ad92b0de2b1479
 DIST geany-plugins-1.38.tar.gz 4783970 BLAKE2B 386a05d7136183799059ef6d73b28a0d67d738939b0dc57649ac68f1049104568fe7c8453ebf2144277f60ee0834564b19bf4e756168864f1551962ba2411c14 SHA512 82d04331e23c5d81765b11e081a960a7a17172184cabe94efd2ddb37ac94668349b036e6083f77c867ac650fa7b251ba3970ae26b562b4568d6e313652763339
-EBUILD geany-plugins-1.38-r410.ebuild 3213 BLAKE2B b3732acca0cd047f095dec52a28b571b74633cc469a5112f80a4ddaf49f7bd32d3b55c69efbfd8c46632cbda1c765de65c70e42568b92d00ed5559dcc19c3385 SHA512 467d9167d5419e96898854db84efacd36ce3a71595f81dc1d417f8d707851617c65fcb47fb12b714eddc8ec61e01deff835f826b0edce01c24b4b96027a3b6e9
+EBUILD geany-plugins-1.38-r410.ebuild 3209 BLAKE2B 47595dd2be114869c1d13d3799f056420bda985a64e2988b9f51689bf2dfc162737e0e5a7927e89cf98937975064253d5ff06fd864a072bf57ac9b70dfe2384e SHA512 a22d047712cb7dc68b1049b43556fd61692c58d2d8e0f379cd68fcc086bb23a626a0c64eb2ed36835e94d4784a387d39fe7f5b4eb2a2259f6b88b03adfd89fd4
 EBUILD geany-plugins-1.38-r5.ebuild 3175 BLAKE2B fe5ff1db7c4186578dc23a45153df0baa490f6448727ebd11fc841ccdea3009253a698997332633bf739cd7289fa1bef00c190d842b752336a655eab986cb7c5 SHA512 c0e1e867c78d8be62ab26fb9d6287f8d393ce98b01038f7212c8c468e98cb4524b607bf2c386cbc6a285af7d8309362029dcddb61bf88c4d667ef550e46a5abd
 MISC metadata.xml 1201 BLAKE2B 4ee72164edb11f331607e02bc93f143214ca497d7ef461e6bb621d1dae99d128bc2243ec712707d63a935969bdacc6309ce4edb5d4f30eda08b2827c8674aa79 SHA512 5180861ae35b043f48125ac03dc6f28864f83186c84b6a3b0111da3b264537553ddb296e960dd2bbb8b7626b8bb842e4ff76931837210d39ab885213608ef51a
diff --git a/dev-util/geany-plugins/geany-plugins-1.38-r410.ebuild b/dev-util/geany-plugins/geany-plugins-1.38-r410.ebuild
index 42b73c6e698e..6eab8cb15ea3 100644
--- a/dev-util/geany-plugins/geany-plugins-1.38-r410.ebuild
+++ b/dev-util/geany-plugins/geany-plugins-1.38-r410.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm ~ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope workbench"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
diff --git a/dev-util/rizin/Manifest b/dev-util/rizin/Manifest
index 41d40f8c3243..34444e2a22c2 100644
--- a/dev-util/rizin/Manifest
+++ b/dev-util/rizin/Manifest
@@ -2,8 +2,11 @@ AUX rizin-0.4.0-never-rebuild-parser.patch 1568 BLAKE2B c77276adb8349188ebc937d8
 AUX rizin-0.5.2-find-tree-sitter-parser.patch 1128 BLAKE2B c3a72fda5005d50f47b2a1c5350b017f8e6fd4d4d232c8502adcceef6542d509c70f68ef396ffff159c4f37a8575931e4a440c689c403a653ac9145489fa4405 SHA512 2977c1004b76740a2e35156a2f92e415530a401eeaddbf59f4efc8ee36bc0fdec7f0402b4aa1732fc0827a4a5c505cc2851db65fb7a25d254ddb631c6c8542c9
 DIST rizin-src-v0.5.1.tar.xz 11770688 BLAKE2B 31369497d5aa425aa6030ce404baa5d4a10ef2453a93f9b2c9f7d47135b5ffbc61618ef7e743acef3939bca2838a94637b7a1794ff44998608aee3f988301483 SHA512 c856112651bec91bb6e9f5580f60e3168f02a9f194bf567186a66398c162f59953ca8c3bf43441315356ca6ef077b7c56e4150e2dd8a79d4d08c5f789c549596
 DIST rizin-src-v0.5.2.tar.xz 11779644 BLAKE2B d74c02c1f58d099a0047a7a528b7e182980901bc1bf2722aef259e03ddf9af908c3ebcde4f1268fcbd07125a21f064259601a54c6b8413e19f6b85c95113cf3d SHA512 2fbd3873c7725d4fa1dee53d685c4a5d372013f300cd19dd92752b82987f049a4eba77b4d4ae33b576678714752147355ac486951949a35275cc3fdc5447a351
+DIST rizin-src-v0.6.1.tar.xz 15397540 BLAKE2B d641279505be2f58b1874d431922066e09affef20e18025c0d3781dbe1fad8f12db53335464ad645344daa25a0ed61fa842fa96bcca6c4832b359b424b5f09a3 SHA512 56ed3c9f7e4e689dfc27461b5a2de9cc6d14fec2e4cc17af6a011975fbecd4f2ec44e8dd26f0ce8f99a448b75514f6083177acfd073182bbdf921bc264fa9561
 DIST rizin-testbins-0264ae4ee5bd606ec6c6a539255eeb57ce2c82c2.tar.gz 179281553 BLAKE2B b86278589da2f8e5859b0f4b16e2667a6e7477c9a889158da5a2c1a1b6e29af4798d56a22dd4c3e23aec1908e7b444ca999502e73f8d8ccf4e0bf2a969380564 SHA512 ae11b6da5cb995f8f1cc996a7b772234b3e7e7c2b0695d0b223657ba839c82dbbcb390600aeb0d16c7c61a5037ba9d0739df79efd730c1b96392cfc1e6f6613d
 DIST rizin-testbins-d66f95359fe830514267f446975374752201c3f1.tar.gz 179428523 BLAKE2B 9d18c2f49460e26809bc526eab9d7bfed15d3fb3f94b22d327f9981547130f82107259f2942e098834cd8ad755e8eadb4b8459a10070105ec116b16fbac19fe3 SHA512 cdeefc6e4103e99c4581a45475c2326505f8003c80a158a78be32b27dfa65fe42a80bbf25ffc47c1f8abdd50faba0fb073a7236395ab67eafb0202695877c4ba
+DIST rizin-testbins-e959eb18182724809b78ad94cb7a9cdfbc5e3a6f.tar.gz 181638434 BLAKE2B 87c853d5e8b892cc5487bc4b2b7a09bd68292d0dc15eeb94f00aa12c3cdea2b4f3e147e62fc2de1beeeaec941b85981843310bd981f8679993db9473e638db31 SHA512 55bd5c2e91856e16318c3e342302f1e6dc9bb8059dbd5aee6f1643f08fe710e32ab91f084fdfce1746a9fbc1dcdfb55b01135b4de74bca6c5b99c7a06bf46ae6
 EBUILD rizin-0.5.1.ebuild 2256 BLAKE2B 4a21a2ce71e77de80320b9175306d23e432223626f8ac8a47aa059fa64bbe59b430a2bb7d9c3c706e018f141080cf4d98feeb36f64b20259bf04005f7ec49f62 SHA512 e3d9e81d3154f13d5c5b605d874d36f55190b694f77d546179672a24ff1bd83f7d89ce92c0cc196f4ca54912ff2e5853697fe1e1a30aa217637b37930c430b3f
 EBUILD rizin-0.5.2.ebuild 2474 BLAKE2B c832721ecd6497f471657bbf8b181de1d651ef7c0ae491ac02de0c74460b9f6eba374f990825bce92008f4e23aa76b4224933c8a59daefd8b2845ec4c96025a9 SHA512 28acf70e6d56f5dd5e52d492789371d57daee3ac79d0eef5cb045f8ac3634c61bbae22a801ff8f83f514c2881d2405887815fde35a08e5f4447dc3742f4ba7ed
+EBUILD rizin-0.6.1.ebuild 2531 BLAKE2B 774e4eb141cd7731ae05be2be2487d68ab030d027dcfc07f9dec596ec0d576b098b46d9a766186e6cb49e8eaf9ad81eec429f87a9de1c670c77529a6ccae9c4b SHA512 36d0f2eeda5ffcfb2b9bd1dea40a03839b1151a3813ac73306bf68f11c2a61edf85023cd5a52b9cb265fc3165669db8b4bb96e59505c97fe5c29593846d331a9
 MISC metadata.xml 427 BLAKE2B 2937970e78526f69e371b4451a3406b1fdc35a01707d366e8b54e23f9d13e8a713254902825ae111817ee00ea3aaf3bc968db8b6d944b15f869e2b89ba8e16b8 SHA512 65cc9c4cd5f2f64cd02e89b0f7f4972fefec51cb175650625da263b729022587c9487e9ab9faed8517200ed622a8ca5ec35b2b6f4c67966d78344c043197c981
diff --git a/dev-util/rizin/rizin-0.6.1.ebuild b/dev-util/rizin/rizin-0.6.1.ebuild
new file mode 100644
index 000000000000..c487f6213887
--- /dev/null
+++ b/dev-util/rizin/rizin-0.6.1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+# This is the commit that the CI for the release commit used
+BINS_COMMIT="e959eb18182724809b78ad94cb7a9cdfbc5e3a6f"
+
+inherit meson python-any-r1
+
+DESCRIPTION="reverse engineering framework for binary analysis"
+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"
+
+LICENSE="Apache-2.0 BSD LGPL-3 MIT"
+SLOT="0/${PV}"
+IUSE="test"
+
+# Need to audit licenses of the binaries used for testing
+RESTRICT="test? ( fetch ) !test? ( test )"
+
+# TODO: unbundle dev-libs/blake3
+RDEPEND="
+	app-arch/lz4:0=
+	app-arch/xz-utils
+	>=dev-libs/capstone-5:0=
+	dev-libs/libmspack
+	dev-libs/libzip:0=
+	dev-libs/openssl:0=
+	>=dev-libs/tree-sitter-0.19.0
+	dev-libs/xxhash
+	sys-apps/file
+	sys-libs/zlib:0=
+"
+DEPEND="${RDEPEND}"
+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}"
+
+src_prepare() {
+	default
+
+	local py_to_mangle=(
+		librz/core/cmd_descs/cmd_descs_generate.py
+		sys/clang-format.py
+		test/fuzz/scripts/fuzz_rz_asm.py
+		test/scripts/gdbserver.py
+	)
+
+	python_fix_shebang "${py_to_mangle[@]}"
+
+	# https://github.com/rizinorg/rizin/issues/3459
+	sed -ie '/dyld_chained_ptr_arm64e_auth/d' test/unit/test_bin_mach0.c || die
+
+	if use test; then
+		cp -r "${WORKDIR}/rizin-testbins-${BINS_COMMIT}" "${S}/test/bins" || die
+		cp -r "${WORKDIR}/rizin-testbins-${BINS_COMMIT}" "${S}" || die
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dcli=enabled
+		-Duse_sys_capstone=enabled
+		-Duse_sys_libmspack=enabled
+		-Duse_sys_libzip=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_tree_sitter=enabled
+		-Duse_sys_xxhash=enabled
+		-Duse_sys_zlib=enabled
+
+		$(meson_use test enable_tests)
+		$(meson_use test enable_rz_test)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	# We can select running either unit or integration tests, or all of
+	# them by not passing --suite. According to upstream, integration
+	# tests are more fragile and unit tests are sufficient for testing
+	# packaging, so only run those.
+	meson_src_test --suite unit
+}