9 files changed, 234 insertions, 6 deletions
diff --git a/dev-util/cutter/Manifest b/dev-util/cutter/Manifest
index 7be92b5a730e..1f69782409f6 100644
--- a/dev-util/cutter/Manifest
+++ b/dev-util/cutter/Manifest
@@ -1,2 +1,3 @@
 DIST cutter-2.3.2.tar.gz 11280258 BLAKE2B 20dba40d96fed296b9af0b0e0b66dd46901bfc6621ba59cce1940ed2980acfc1e8b6447c20995bbeace71c7eeb1c9b180bf3b2076bbae9035706c6d4aff6dc5f SHA512 65ca98f6618b1e60efa25d33bb4f3ef6b36dfd8496cf1f40c6a6b9744df3c2f77673d1d3cc1142c1b3b064abd0698ca07a20c5e4009ba5f6b05fc7f7501a4435
 DIST cutter-2.3.3.tar.gz 11609727 BLAKE2B bea428892d242c8112d5004b9960d9f74b3aa48b5988436bba54983abf3d26f4bca89b4dc75061e857c2cc51f724ea392fc4f380f227c36f38618078ec0a5761 SHA512 7731b6a2efa03a745cd0760d905df474383dc77906d5aefada7bd94098d771b75ae030cb71ed33256cc2f3e23c1c4930d45355cf6371361cb9780b26996dd2cb
+DIST cutter-2.3.4.tar.gz 11608176 BLAKE2B f83cd117bdd1a9ea985b52d4029bd3874f92b08709ac50dd1c6a526aadd022e05f9b75586cf826cc6b46c2004cb6b3185c5770b8622bc3c6a7140307a9c1a98a SHA512 c35a7091aaf2c99a4595b48029017353092b178ed6a57cbe2f0d9758f1330d2521e3fc339558ffc0dfa500ace0510daded8591f7a04b0efa0209ba4f8a5e7d33
diff --git a/dev-util/cutter/cutter-2.3.4.ebuild b/dev-util/cutter/cutter-2.3.4.ebuild
new file mode 100644
index 000000000000..7dba8c4f186a
--- /dev/null
+++ b/dev-util/cutter/cutter-2.3.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+inherit cmake flag-o-matic 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.7.1:=
+	graphviz? ( media-gfx/graphviz )"
+RDEPEND="${DEPEND}
+	!net-analyzer/cutter" # https://bugs.gentoo.org/897738
+BDEPEND="dev-qt/linguist-tools:5"
+
+src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/925901
+	# https://github.com/rizinorg/cutter/pull/3317
+	#
+	# Fixed in git dev. Remove as part of next version bump.
+	filter-lto
+
+	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/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index e09cbce6293b..ab4008243e2b 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -1,3 +1,4 @@
 DIST debootstrap-1.0.128+nmu2.tar.bz2 70406 BLAKE2B 7ba8f2cb63da3217594e9b058e1b0b4452823d9daeaaff0f91a298bd9d29ec16b332eda03259a12a9259dc759f63f1123654454341eb32f6fd882def0f3e4582 SHA512 a8baa7df3956d407c1b9344a0f0acb8162d951b55c3f402f7f04d8b652e00a366fd0e8be8fb4ecfd3997d6374c0271a329ccc631b32958a2296c73e389d622d3
+DIST debootstrap-1.0.134.tar.bz2 76120 BLAKE2B ce885d57a9c98864ea045dd3151553b57f6d9feadaba41df063f8f9056a7d1294ade2ac32374bc59cbfcae5993956bb68cb19759a109520419b8e1134563fddc SHA512 e7b9726632d3816975c8cbd0020882f69db6d2a84f6c2d086a4e002c58afa61f8b08a8a35b40dd6a284e2cdb584817292462e5dc354fb83d177d50a56aa8cda6
 DIST debootstrap_1.0.123.tar.gz 78175 BLAKE2B e507ee76817eef20cfea4e37eaf893f8e64acaa791806ebd55bec97b8e60eb3c59b68bfe5e6023dc6e73706bde2468db46b84f0176ec46d086c3ea9423a206c7 SHA512 3b23f61528d4993750ba22b8765c10cfb9695793177017d9e4faf546da076be6660c5d6e0d1bf30bafe14f6d70f886190d3ec42a0057b895f40e860475eea794
 DIST devices.tar.gz 47835 BLAKE2B 03bfe097fda12a7a0aa19d3308c0d44382ad945defea05a63b17a72e4051ef94f0e60e75bde35baeace81da59d9f04126f6e463163609475b9c0fdf518f533ef SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432
diff --git a/dev-util/debootstrap/debootstrap-1.0.134.ebuild b/dev-util/debootstrap/debootstrap-1.0.134.ebuild
new file mode 100644
index 000000000000..f3548f563311
--- /dev/null
+++ b/dev-util/debootstrap/debootstrap-1.0.134.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV="${PV/_p/+nmu}"
+
+DESCRIPTION="Debian/Ubuntu bootstrap scripts"
+HOMEPAGE="https://packages.qa.debian.org/d/debootstrap.html"
+SRC_URI="https://salsa.debian.org/installer-team/${PN}/-/archive/${MY_PV}/${PN}-${MY_PV}.tar.bz2
+	mirror://gentoo/devices.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-arch/dpkg
+	net-misc/wget
+	sys-devel/binutils
+"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_unpack() {
+	unpack "${PN}-${MY_PV}".tar.bz2
+	cp "${DISTDIR}"/devices.tar.gz "${S}" || die
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local DOCS=( TODO debian/changelog )
+	default
+	doman debootstrap.8
+}
+
+pkg_postinst() {
+	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
+		elog "To check Release files against a keyring (--keyring=K), please"
+		elog "install app-crypt/gnupg"
+	fi
+
+	if ! has_version app-crypt/debian-archive-keyring || ! has_version app-crypt/ubuntu-keyring; then
+		elog "To check Release files from Debian or Ubuntu, please install"
+		elog " app-crypt/debian-archive-keyring or"
+		elog " app-crypt/ubuntu-keyring as required"
+	fi
+}
diff --git a/dev-util/debootstrap/metadata.xml b/dev-util/debootstrap/metadata.xml
index 83d00b14c8d4..f90d21d10c38 100644
--- a/dev-util/debootstrap/metadata.xml
+++ b/dev-util/debootstrap/metadata.xml
@@ -1,6 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
+ <maintainer type="person">
+  <email>tamiko@gentoo.org</email>
+  <name>Matthias Maier</name>
+ </maintainer>
+ <longdescription lang="en">
+		Debootstrap is a tool which will install a Debian base system into
+		a subdirectory of another, already installed system. It doesn't
+		require an installation CD, just access to a Debian repository. It
+		can also be installed and run from another operating system, so,
+		for instance, you can use debootstrap to install Debian onto an
+		unused partition from a running Gentoo system. It can also be used
+		to create a rootfs for a machine of a different architecture, which
+		is known as "cross-debootstrapping".
+	</longdescription>
  
  <origin>gentoo-staging</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-util/rizin/Manifest b/dev-util/rizin/Manifest
index 2bfe3632e358..6e5aa0656eb4 100644
--- a/dev-util/rizin/Manifest
+++ b/dev-util/rizin/Manifest
@@ -1,4 +1,5 @@
 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-src-v0.7.3.tar.xz 18604220 BLAKE2B 9bbfbd8cf86839dcfdc30beb12d4472abf68e7d8c81561f6124b4d8ac781242bbbe8b62e06d2873928830d2524203c18ab1c17fa35855ac2d344af7649b64b3c SHA512 bad89888b2cb1ce1227ce629ff1209f18d1afb9da55685f0ea4ead7dd1b4dfbf8ed72c173048b2ee47362a10d5e20a6c34e09d0bbaa210f3873073c10ebc4dc1
 DIST rizin-testbins-1203a9a2f51e32337c8434d9f4f7c4543552e271.tar.gz 185572487 BLAKE2B b274a58bebe0123bd8ab7b18a4e88833e7de53133d8f640d00b9efa953cf8ef766582acd5a0f65750ebb273be70d5cc1daf9b700cd6b9bfd4d464cf59ab735ba SHA512 47e8993bea5d7805acb46c1c4e034524fe47d2b0b2471af00d3255f3e853430617658cd6b1f8a4706a748704a52646ec43495f0d4e80f16bce4aaf34e29539a4
 DIST rizin-testbins-903588ed69d7717069955322b31dad5e666b338a.tar.gz 181644100 BLAKE2B ea491bea61a6d17fa2727e1b08b810be2bb99d05cf2afa4e97dc440a69a4fd376a39c25c6e86e9e2d499732b55e7c75e5eef39adef84f571e48d147e410d04e5 SHA512 fffef043d76440976e02e2b890138f57df849f507c0a7a48bd97b421fc1683e73696c50b6daddf906a53685eccfd7346e25881d3d498417e4e55b97ef56b8317
diff --git a/dev-util/rizin/rizin-0.6.3-r1.ebuild b/dev-util/rizin/rizin-0.6.3-r1.ebuild
index f078d0e9cb5b..53e0ccd8441c 100644
--- a/dev-util/rizin/rizin-0.6.3-r1.ebuild
+++ b/dev-util/rizin/rizin-0.6.3-r1.ebuild
@@ -15,10 +15,11 @@ HOMEPAGE="https://rizin.re/"
 
 SRC_URI="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"
+S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="Apache-2.0 BSD LGPL-3 MIT"
 SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="test"
 
 # Need to audit licenses of the binaries used for testing
@@ -45,8 +46,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.5.2-find-tree-sitter-parser.patch"
 )
 
-S="${WORKDIR}/${PN}-v${PV}"
-
 src_prepare() {
 	default
 
diff --git a/dev-util/rizin/rizin-0.7.1-r1.ebuild b/dev-util/rizin/rizin-0.7.1-r1.ebuild
index 0bbe59b513d6..1e8f06536bb3 100644
--- a/dev-util/rizin/rizin-0.7.1-r1.ebuild
+++ b/dev-util/rizin/rizin-0.7.1-r1.ebuild
@@ -15,10 +15,11 @@ HOMEPAGE="https://rizin.re/"
 
 SRC_URI="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"
+S="${WORKDIR}/${PN}-v${PV}"
 
 LICENSE="Apache-2.0 BSD LGPL-3 MIT"
 SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test"
 
 # Need to audit licenses of the binaries used for testing
@@ -46,8 +47,6 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.4.0-never-rebuild-parser.patch"
 )
 
-S="${WORKDIR}/${PN}-v${PV}"
-
 src_prepare() {
 	default
 
diff --git a/dev-util/rizin/rizin-0.7.3.ebuild b/dev-util/rizin/rizin-0.7.3.ebuild
new file mode 100644
index 000000000000..39cac761da7b
--- /dev/null
+++ b/dev-util/rizin/rizin-0.7.3.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10,11,12} )
+
+# This is the commit that the CI for the release commit used
+BINS_COMMIT="1203a9a2f51e32337c8434d9f4f7c4543552e271"
+
+inherit meson python-any-r1
+
+DESCRIPTION="reverse engineering framework for binary analysis"
+HOMEPAGE="https://rizin.re/"
+
+SRC_URI="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 )"
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="Apache-2.0 BSD LGPL-3 MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~x86"
+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
+	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
+	sys-libs/zlib:0=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.4.0-never-rebuild-parser.patch"
+)
+
+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_libzstd=enabled
+		-Duse_sys_lz4=enabled
+		-Duse_sys_lzma=enabled
+		-Duse_sys_magic=enabled
+		-Duse_sys_openssl=enabled
+		-Duse_sys_pcre2=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
+}