7 files changed, 398 insertions, 0 deletions
diff --git a/dev-util/chirurgien/Manifest b/dev-util/chirurgien/Manifest
new file mode 100644
index 000000000000..58456738785c
--- /dev/null
+++ b/dev-util/chirurgien/Manifest
@@ -0,0 +1 @@
+DIST chirurgien-2.1.tar.gz 1618936 BLAKE2B f1d57ae5daab9c196ab87632f7894dab1cbca231de2794501a33157cf0b9175e2be172c903a093cc08b0a8948ba7e847d2cb259b9857a0c1598fb15c9caff3d7 SHA512 2a80ffa3a892a3c1664da6677940a91973d71492b06caf9a067ac372ece49efdb8444eb1473b7bcd89d083469edc7befab61eacf77dc45c6a38f5bad6067917e
diff --git a/dev-util/chirurgien/chirurgien-2.1.ebuild b/dev-util/chirurgien/chirurgien-2.1.ebuild
new file mode 100644
index 000000000000..1333c2444c40
--- /dev/null
+++ b/dev-util/chirurgien/chirurgien-2.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2-utils meson xdg
+
+DESCRIPTION="Chirurgien helps to understand and manipulate file formats"
+HOMEPAGE="https://github.com/leonardschardijn/Chirurgien/"
+SRC_URI="https://github.com/leonardschardijn/${PN^}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}"/${P^}
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	gui-libs/gtk:4
+	dev-libs/glib:2
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+"
+
+src_install() {
+	meson_src_install
+
+	mv "${ED}"/usr/share/appdata "${ED}"/usr/share/metainfo || die
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_pkg_postrm
+}
diff --git a/dev-util/chirurgien/metadata.xml b/dev-util/chirurgien/metadata.xml
new file mode 100644
index 000000000000..a21399460f2c
--- /dev/null
+++ b/dev-util/chirurgien/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>xgqt@gentoo.org</email>
+  <name>Maciej Barć</name>
+ </maintainer>
+ <longdescription>
+    Chirurgien helps understand and manipulate file formats. Features: file
+    format highlighting, file description panel, field edition, extraction,
+    deletion and insertion.
+  </longdescription>
+ <upstream>
+  <bugs-to>https://github.com/leonardschardijn/Chirurgien/</bugs-to>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-util/git-delta/Manifest b/dev-util/git-delta/Manifest
index 15d5070bdcce..47c049785011 100644
--- a/dev-util/git-delta/Manifest
+++ b/dev-util/git-delta/Manifest
@@ -63,6 +63,7 @@ DIST futures-util-0.3.21.crate 153768 BLAKE2B b3bc5632bbc7616d33f74361d68f83e0cb
 DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
 DIST getrandom-0.2.3.crate 26261 BLAKE2B 3e52a87b9355f850e07e5080c20e1ab3acfa927bae28c63bb8bfd6a773ad77be96d3ba770c344631cc0f2d9a95aac920790173168b102e25f50480ee96663569 SHA512 e6da64ed529cb0fc000b613f75187ed6b20f716e721d8a02ac2ae39c507fb9f6189ebb66b522d28584eff1e7e9efc274cad6bfe43f464f58053701e1d51c603d
 DIST git-delta-0.14.0.tar.gz 496467 BLAKE2B bb0fa08aa0e05474242518872f1db3f8ebc569dd7cdc399dc1d7eb1837b721e0944df814b8fa4e4669ab24fd9512f82ad50d9faa3ae1129bfff92474b8a811b2 SHA512 5eba901e3b5d06543d30dad49e92ad8ca9ad02d9757d7cfb4edf8ce460c2549bca07dd073dd44443a3befebe32d7d854b19e72dabf4efdced2eac109eedc614e
+DIST git-delta-0.15.1.tar.gz 499576 BLAKE2B b29972e8fb1e640ced5f8148610a17177e08cda2988189bd3cad585937c85b8b749cf3e3fd4648599462b4272d4f3b99448cead13a688289732106e744a294d5 SHA512 646244299ec79d59ff91fd0b2d9600795a6c0e4f3f6efa6629217a6847d6b736ceed45bd52435aeb25cd80ffa9630bf9cebce35312fead3de2bb5b0d04e790c4
 DIST git-version-0.3.5.crate 3203 BLAKE2B f73d2f076c79c10c7395e584d811b6fffc7f348954c2c142099c48ba4440d257eb1be59ff26c3a61f37a6bc119afd82105a1697c37f8d7b973f3a43108f099f6 SHA512 7017d59ec7eef1d69c333ce8bcdee355dced8e912c4b5eabcb2abb93f6075ef3d1fd9486661d472c29787b75d7866fc49835d1faf5d06e42837c95c856398629
 DIST git-version-macro-0.3.5.crate 4302 BLAKE2B 39173a36199b34cec11a1924faed795334586b21e3042bb91f3d38cee2d8b97ffb5bb4dd45a3c192d8c1b8d2b2a5bf4e0d3b23927b6f4212cfeb7cb9dbb16d4e SHA512 319729646469ab6508e16e6f3b88f588580fe7089479f70522edd6ac7eadb3c4576f0a57863bd3927d1ada693c3fe3706dc6a75e6cd75723db7f23199dc69ae0
 DIST git2-0.14.2.crate 196856 BLAKE2B 09ed89e5eaf632b1bd9c33ff7afff78808599823804668cb6f85925a8d61359300b460db8b34e6562b8289b79b53094df4c184e013a8d4d4b58c510447fd0ec8 SHA512 7e4c0660fb7f48fda3ed73bcd577e2a40eb44005bd1130f9fbc0c515bfd155ec75a2efabdde99661a7c4590e52a749be4342397b79a47bbfe8f4fb8fe160dd22
diff --git a/dev-util/git-delta/git-delta-0.15.1.ebuild b/dev-util/git-delta/git-delta-0.15.1.ebuild
new file mode 100644
index 000000000000..4cd6a988d833
--- /dev/null
+++ b/dev-util/git-delta/git-delta-0.15.1.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	adler-0.2.3
+	aho-corasick-0.7.18
+	ansi_colours-1.1.1
+	ansi_term-0.12.1
+	approx-0.5.0
+	arrayvec-0.5.2
+	atty-0.2.14
+	autocfg-1.0.1
+	base64-0.13.0
+	bat-0.21.0
+	bincode-1.3.1
+	bitflags-1.3.2
+	box_drawing-0.1.2
+	bstr-0.2.15
+	bytelines-2.4.0
+	bytemuck-1.7.3
+	byteorder-1.3.4
+	bytes-1.1.0
+	bytesize-1.1.0
+	cc-1.0.66
+	cfg-if-0.1.10
+	cfg-if-1.0.0
+	chrono-0.4.19
+	chrono-humanize-0.2.1
+	clap-3.2.8
+	clap_derive-3.2.7
+	clap_lex-0.2.4
+	clircle-0.3.0
+	console-0.15.0
+	content_inspector-0.2.4
+	core-foundation-sys-0.8.3
+	crc32fast-1.2.1
+	ctrlc-3.2.2
+	dirs-4.0.0
+	dirs-next-2.0.0
+	dirs-sys-0.3.6
+	dirs-sys-next-0.1.1
+	either-1.6.1
+	encode_unicode-0.3.6
+	encoding-0.2.33
+	encoding-index-japanese-1.20141219.5
+	encoding-index-korean-1.20141219.5
+	encoding-index-simpchinese-1.20141219.5
+	encoding-index-singlebyte-1.20141219.5
+	encoding-index-tradchinese-1.20141219.5
+	encoding_index_tests-0.1.4
+	error-chain-0.12.4
+	find-crate-0.6.3
+	flate2-1.0.19
+	fnv-1.0.7
+	form_urlencoded-1.0.0
+	futures-0.3.21
+	futures-channel-0.3.21
+	futures-core-0.3.21
+	futures-executor-0.3.21
+	futures-io-0.3.21
+	futures-macro-0.3.21
+	futures-sink-0.3.21
+	futures-task-0.3.21
+	futures-util-0.3.21
+	getrandom-0.1.16
+	getrandom-0.2.3
+	git2-0.14.2
+	globset-0.4.8
+	grep-cli-0.1.6
+	hashbrown-0.8.2
+	heck-0.4.0
+	hermit-abi-0.1.17
+	idna-0.2.0
+	indexmap-1.5.2
+	itertools-0.10.3
+	itoa-1.0.1
+	jobserver-0.1.21
+	lazy_static-1.4.0
+	libc-0.2.126
+	libgit2-sys-0.13.2+1.4.2
+	libz-sys-1.1.2
+	line-wrap-0.1.1
+	linked-hash-map-0.5.3
+	log-0.4.11
+	matches-0.1.8
+	memchr-2.4.1
+	miniz_oxide-0.4.3
+	nix-0.24.1
+	ntapi-0.3.6
+	num-integer-0.1.44
+	num-traits-0.2.14
+	num_threads-0.1.6
+	once_cell-1.12.1
+	onig-6.1.1
+	onig_sys-69.6.0
+	os_str_bytes-6.0.0
+	palette-0.6.0
+	palette_derive-0.6.0
+	path_abs-0.5.1
+	pathdiff-0.2.1
+	percent-encoding-2.1.0
+	phf-0.9.0
+	phf_generator-0.9.1
+	phf_macros-0.9.0
+	phf_shared-0.9.0
+	pin-project-lite-0.2.8
+	pin-utils-0.1.0
+	pkg-config-0.3.19
+	plist-1.3.1
+	ppv-lite86-0.2.15
+	proc-macro-error-1.0.4
+	proc-macro-error-attr-1.0.4
+	proc-macro-hack-0.5.19
+	proc-macro2-1.0.36
+	quote-1.0.14
+	rand-0.8.4
+	rand_chacha-0.3.1
+	rand_core-0.6.3
+	rand_hc-0.3.1
+	redox_syscall-0.1.57
+	redox_syscall-0.2.10
+	redox_users-0.3.5
+	redox_users-0.4.0
+	regex-1.5.5
+	regex-automata-0.1.10
+	regex-syntax-0.6.25
+	rgb-0.8.31
+	ryu-1.0.5
+	safemem-0.3.3
+	same-file-1.0.6
+	semver-1.0.6
+	serde-1.0.138
+	serde_derive-1.0.138
+	serde_json-1.0.82
+	serde_yaml-0.8.23
+	shell-words-1.1.0
+	siphasher-0.3.7
+	slab-0.4.6
+	smol_str-0.1.23
+	std_prelude-0.2.12
+	strsim-0.10.0
+	syn-1.0.94
+	syntect-5.0.0
+	sysinfo-0.24.5
+	termcolor-1.1.2
+	terminal_size-0.1.15
+	textwrap-0.15.0
+	thiserror-1.0.30
+	thiserror-impl-1.0.30
+	time-0.1.44
+	time-0.3.9
+	tinyvec-1.1.0
+	tinyvec_macros-0.1.0
+	tokio-1.17.0
+	toml-0.5.8
+	unicode-bidi-0.3.4
+	unicode-normalization-0.1.16
+	unicode-segmentation-1.9.0
+	unicode-width-0.1.9
+	unicode-xid-0.2.1
+	url-2.2.0
+	utf8parse-0.2.0
+	vcpkg-0.2.11
+	version_check-0.9.2
+	vte-0.10.1
+	vte_generate_state_changes-0.1.1
+	walkdir-2.3.1
+	wasi-0.10.0+wasi-snapshot-preview1
+	wasi-0.9.0+wasi-snapshot-preview1
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-util-0.1.5
+	winapi-x86_64-pc-windows-gnu-0.4.0
+	xdg-2.4.1
+	xml-rs-0.8.3
+	yaml-rust-0.4.5
+"
+
+inherit bash-completion-r1 cargo
+
+DESCRIPTION="A syntax-highlighting pager for git"
+HOMEPAGE="https://github.com/dandavison/delta"
+SRC_URI="https://github.com/dandavison/delta/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" $(cargo_crate_uris ${CRATES})"
+S="${WORKDIR}/${P/git-/}"
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+=" Apache-2.0 CC0-1.0 LGPL-3+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	dev-libs/libgit2:=
+	dev-libs/oniguruma:=
+"
+RDEPEND="
+	${DEPEND}
+	!app-text/delta
+"
+
+QA_FLAGS_IGNORED="usr/bin/delta"
+
+src_configure() {
+	# Some crates will auto-build and statically link C libraries(!)
+	# Tracker bug #709568
+	export RUSTONIG_SYSTEM_LIBONIG=1
+	export LIBGIT2_SYS_USE_PKG_CONFIG=1
+	export PKG_CONFIG_ALLOW_CROSS=1
+}
+
+src_install() {
+	cargo_src_install
+
+	# No man page (yet?)
+
+	# Completions
+	newbashcomp "${S}"/etc/completion/completion.bash delta
+
+	insinto /usr/share/zsh/site-functions
+	newins "${S}"/etc/completion/completion.zsh _delta
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins "${S}"/etc/completion/completion.fish
+}
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 537aae63a6e1..354ed8147e66 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -2,3 +2,4 @@ DIST strace-5.17.tar.xz 2281220 BLAKE2B 27e7dc19302c58144b0a7d8de41f717760b8e3cd
 DIST strace-5.18.tar.xz 2307412 BLAKE2B 658d17d2137344550ea3c2ece54708387c3b78020dbade45a7ef04905dc9d4703fa8d44802cca5a9448d096a7210d0178d8d78caab7e504fa998d1f9a0b59c65 SHA512 99418b84a5e2049cb6fe32eed19ddcb61bbefb25220550c67d92cd7bc3d44ae5d87ac228b3e1c207166b9bfdae55c624a0f4e603004599fb7ea3143bbccc749e
 DIST strace-5.19.tar.xz 2353276 BLAKE2B 44b9a87f36e66481d8ac2107efbc389fa64c47b2ae7b1cc728241baa1c7d2d5d4d9410622763eb1247b415cad9afdd9f61552d2545388cadf5a33b568ed09af2 SHA512 1ea1c6e12d05bf145bc3c74f8d06b08dfc3eae3a5a21bfe8ab080053dc4c2da8a95be5956652ea62bb083462015a55f9bc1d1023919dcf2929a05211b7dde963
 DIST strace-6.0.tar.xz 2367144 BLAKE2B ab9cb1f81b01068de5af5125ec2901b57a2f2b24fc01f4f68a284d74eb9fc0f4d583510a353554327845e7c157ea71ca4042ce3c27b3d2b0469d65a13aabfab1 SHA512 2f5aa18949b9f64769eee4e7720e41bf4a61e3b552acad693ff7baed2e662407a7b5e8bfba94ac49bb71639d21cd54084de902fb4337904f48480b25b8e72b54
+DIST strace-6.1.tar.xz 2351272 BLAKE2B f11bdddcc23d9bbe7196a102165ac40d3f39e0dec8b9c727e226d99ae0b6f22865bd0582d4e9c15fdce87dd405e0e9c68b60041bd2b90bc8480557f82ca6dcb8 SHA512 3f0678d74c5c3e6b30c4dc4ed7ee4cb0829d3b7142dc014fcd887db3a68133bf7fedc623bae381dfe4305bd6cd15d4ca6776c6491009c2a053bb8c6ca1ae8e12
diff --git a/dev-util/strace/strace-6.1.ebuild b/dev-util/strace/strace-6.1.ebuild
new file mode 100644
index 000000000000..49ada010927a
--- /dev/null
+++ b/dev-util/strace/strace-6.1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools edo flag-o-matic toolchain-funcs
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/strace/strace.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
+HOMEPAGE="https://strace.io/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="aio perl selinux static unwind elfutils"
+REQUIRED_USE="?? ( unwind elfutils )"
+
+BDEPEND="virtual/pkgconfig"
+LIB_DEPEND="
+	unwind? ( sys-libs/libunwind[static-libs(+)] )
+	elfutils? ( dev-libs/elfutils[static-libs(+)] )
+	selinux? ( sys-libs/libselinux[static-libs(+)] )
+"
+# strace only uses the header from libaio to decode structs
+DEPEND="
+	static? ( ${LIB_DEPEND} )
+	aio? ( >=dev-libs/libaio-0.3.106 )
+	sys-kernel/linux-headers
+"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	perl? ( dev-lang/perl )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.11-static.patch"
+)
+
+src_prepare() {
+	default
+
+	if [[ ! -e configure ]] ; then
+		# git generation
+		sed /autoreconf/d -i bootstrap || die
+		edo ./bootstrap
+		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
+	fi
+
+	eautoreconf
+
+	# Stub out the -k test since it's known to be flaky. bug #545812
+	sed -i '1iexit 77' tests*/strace-k.test || die
+}
+
+src_configure() {
+	# Set up the default build settings, and then use the names strace expects.
+	tc-export_build_env BUILD_{CC,CPP}
+	local v bv
+	for v in CC CPP {C,CPP,LD}FLAGS ; do
+		bv="BUILD_${v}"
+		export "${v}_FOR_BUILD=${!bv}"
+	done
+
+	filter-lfs-flags # configure handles this sanely
+
+	export ac_cv_header_libaio_h=$(usex aio)
+	use elibc_musl && export ac_cv_header_stdc=no
+
+	local myeconfargs=(
+		--disable-gcc-Werror
+
+		# Don't require mpers support on non-multilib systems. #649560
+		--enable-mpers=check
+
+		$(use_enable static)
+		$(use_with unwind libunwind)
+		$(use_with elfutils libdw)
+		$(use_with selinux libselinux)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	if has usersandbox ${FEATURES} ; then
+		# bug #643044
+		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..."
+		return 0
+	fi
+
+	default
+}
+
+src_install() {
+	default
+
+	if use perl ; then
+		exeinto /usr/bin
+		doexe src/strace-graph
+	fi
+
+	dodoc CREDITS
+}