10 files changed, 436 insertions, 6 deletions
diff --git a/dev-util/bpftrace/bpftrace-0.17.0-r1.ebuild b/dev-util/bpftrace/bpftrace-0.17.0-r2.ebuild
index f976f34e8416..f976f34e8416 100644
--- a/dev-util/bpftrace/bpftrace-0.17.0-r1.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.17.0-r2.ebuild
diff --git a/dev-util/bpftrace/files/bpftrace-0.17.0-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.17.0-install-libs.patch
index a884acc7ef28..7c14f8f9416e 100644
--- a/dev-util/bpftrace/files/bpftrace-0.17.0-install-libs.patch
+++ b/dev-util/bpftrace/files/bpftrace-0.17.0-install-libs.patch
@@ -213,10 +213,10 @@ index c776d204..41e84317 100644
  
  if(LIBPCAP_FOUND)
 diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt
-index d01d1ea3..7d96587f 100644
+index d01d1ea3..82bfeccc 100644
 --- a/src/arch/CMakeLists.txt
 +++ b/src/arch/CMakeLists.txt
-@@ -1,21 +1,21 @@
+@@ -1,21 +1,23 @@
  if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
 -    add_library(arch aarch64.cpp)
 +    add_library(bpftracearch aarch64.cpp)
@@ -246,6 +246,8 @@ index d01d1ea3..7d96587f 100644
  else()
    message(FATAL_ERROR "Unsupported architecture: ${CMAKE_SYSTEM_PROCESSOR}")
  endif()
++
++install(TARGETS bpftracearch LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 diff --git a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt
 index c390ea6a..37019bd9 100644
 --- a/src/ast/CMakeLists.txt
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index 990c3fb2e0e1..ff3041c86f7c 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -1,4 +1,4 @@
-DIST byacc-20221106.tgz 896951 BLAKE2B 36be6de11f06ed38068d35ac7ace6ca9585ac001d1ad2bc1aee3f9da47aa40a0a01820e3c0183dc9ce49d90d474608d19e45653b937d0dd960e9368b19813480 SHA512 866933b4eb2296565ce70b4ade565e4679f3b652715f0066072bbcc42b95389fa47a2f96cd03de577807dcc49bf453b1d4f7e22b96c80fef1aa66898d3de5d5c
-DIST byacc-20221106.tgz.asc 729 BLAKE2B 89142646f85d6ec86c2e227f773e1091771c8218ade06190f1218d5b2cf37a4699e90d8fba0e67f42e4c0ce299960ce3eb505f715a51264d321bf55467b47be4 SHA512 ffdf93c720dcc73356fd7035cdbca36081383b3f75b34286432cfcd292076386ba4ddbc8d7bd23ae10331f281553f7d8b0a5d19f1b03cc6178ee9d0715bf81a3
 DIST byacc-20221229.tgz 897125 BLAKE2B a262a9e67eb18915278d6c879e5a68d8f1ac783e2d3002f50903057bda9dfe6ed993f8316e8bfdb5ff52ec0ae8391dbbd92156180078c3b8b2243a71879442db SHA512 064864fa7fd4459c237a6ca98dbe05c102776e0b0d7c07e24e01b56f1ea7d4a3fbec5e3a33f316ee207ad3cc9213fa982013270c6bf82b8df7acbb78caf5a415
 DIST byacc-20221229.tgz.asc 729 BLAKE2B bd836e9fe0bed417756c1b3772fc9f8d0f74c78960cfe5cbc5f4f7db327061089d62a4f9712c326d5526daf238143289f03bc49ac37c972dc6d2954eb36fd3fa SHA512 cb526e7912bd14b378f5129a51854cd4db7b86964a8652b415e3f95a94fff72fbfd2c85e8766eb7f1150d4e361553439078c8cfb0549930d311dc29f81af6966
+DIST byacc-20230201.tgz 897063 BLAKE2B a15bf462532b84d8b60a5a00d0b8c6be3699920bd607e45e5cbddeedacd4450d4fdf53edef68b6658d584f00e1c97c60201a8047e2546d179c02388c2d27d77e SHA512 8dc10fb19cd55086e7c4d5f01c533fbacd8d4ec94d45e00880ea08f26e26ca31cd4eaae7471561af5422c5bed517d4fe8bb86a0c337ea855f6f75f06671c2114
+DIST byacc-20230201.tgz.asc 729 BLAKE2B ee22cd98a551b1d2226684fa592d94880a007297de0beb44d08eff28be2e81679c5f03129701792ab562bb7b8613759a6c7e24aacb38f7c2c3a2b55a24e476fc SHA512 95100111c5af34dfc79ff705aa24378d60359742a0f4ea1f7f800890035641798d65d018cd372811243df78a47380da75fd85763947ee52ec8a57e070325e173
diff --git a/dev-util/byacc/byacc-20221106.ebuild b/dev-util/byacc/byacc-20230201.ebuild
index df25b92826be..b3013c9753bd 100644
--- a/dev-util/byacc/byacc-20221106.ebuild
+++ b/dev-util/byacc/byacc-20230201.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.as
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
 
diff --git a/dev-util/difftastic/Manifest b/dev-util/difftastic/Manifest
index 44a25e913434..17c08ececec0 100644
--- a/dev-util/difftastic/Manifest
+++ b/dev-util/difftastic/Manifest
@@ -21,6 +21,7 @@ DIST ctor-0.1.22.crate 9311 BLAKE2B a13fb97cf767fae19486ca8b970f1712bfcf4ec9edda
 DIST diff-0.1.12.crate 10223 BLAKE2B 369f305661f1da31207f3801ed1841dbce12451ac9c3e9d3736f7158ece433af9b2e42c29063e5d93bb86b1d300e503caa9c3ce7dd0b25553f91d72a9eea5298 SHA512 0e81331c0424e9369963e23894a6412b65a3ed4f3154ccc184fc84cf1c5985b81c586a6b34e8c6c0e5c3afba38fb15277cfd89e7f50c85bd5d8d4d24ba670d16
 DIST difftastic-0.42.0.gh.tar.gz 50324806 BLAKE2B d245673b25b70c14f3f4a5ae5f568b1da1a62f6954d1d425d5472d86eccecb7296169b55cacf1e53b35deeb9128f0b8f9a8b0635ca3c7821ddf3a068ffc5c3c9 SHA512 33d2a5145adf95b00f68ca678d5f1b64e80477fc55f4d661e91673a4b029f430aa22a249c725ec8fb0d98057225646ba6b1c80df5af1ba268966dbd5e10eb43c
 DIST difftastic-0.43.0.gh.tar.gz 50571896 BLAKE2B a31fb731ead453b29ebbd502fd7267681bcfb8c5f74ed4636f94f55ff32b7e44f72279c018e001177b7c0e5ffc132f8dccc75d8ed2ffcf2904be6b800fbb5066 SHA512 5edb07c22ca9637367cad5bb19b20038cf83d7a8d399e9425aaaadd1dd609ddf5c3f77ce9ec90b691aa7cd4aac9e528ce39633adc63c2899982ee3550ac9a8e3
+DIST difftastic-0.43.1.gh.tar.gz 50571590 BLAKE2B fa0531961f54b7713a2cd9cbde3ffe2d853350b5802d703dc9038a712c91c8981ac3010b328c70969c756c243418183c8600a9078a17cb1ebfedec3f853f12c3 SHA512 49a2836c17a45b008cced7734539cf058f8b4440e056d08d39ab0277ecdeeeb45e8f15d1df1a916ab72116160f7869102a31ba7af7f414cf7b9cbb898deca76d
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
 DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
 DIST errno-0.2.8.crate 9276 BLAKE2B b73738deb47d1f76ec91ffd15558126d32312647b82677290725669edb01b8f34a503172fad6518ebf0ffb1633ef0afaf0750982b9384a9fb87833d31721c9a8 SHA512 1f513743224cd9a9b7e4caaf33dab075a4a79efa90c9f46c9edfb0c8600daccd3ad2677ba2116621e19fcf8be456954da5d611cbcea4b6f1410f7731828b50d1
diff --git a/dev-util/difftastic/difftastic-0.43.1.ebuild b/dev-util/difftastic/difftastic-0.43.1.ebuild
new file mode 100644
index 000000000000..4d0e6d4e6aa3
--- /dev/null
+++ b/dev-util/difftastic/difftastic-0.43.1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.5.4
+
+EAPI=8
+
+CRATES="
+	aho-corasick-0.7.18
+	ansi_term-0.12.1
+	atty-0.2.14
+	autocfg-1.1.0
+	bitflags-1.3.2
+	bumpalo-3.11.1
+	bytecount-0.6.2
+	cc-1.0.78
+	cfg-if-1.0.0
+	clap-3.1.18
+	clap_lex-0.2.0
+	const_format-0.2.23
+	const_format_proc_macros-0.2.22
+	crossbeam-channel-0.5.4
+	crossbeam-deque-0.8.1
+	crossbeam-epoch-0.9.8
+	crossbeam-utils-0.8.8
+	crossterm-0.25.0
+	crossterm_winapi-0.9.0
+	ctor-0.1.22
+	diff-0.1.12
+	either-1.6.1
+	env_logger-0.7.1
+	fixedbitset-0.4.1
+	fnv-1.0.7
+	hashbrown-0.11.2
+	hermit-abi-0.1.19
+	humantime-1.3.0
+	indexmap-1.7.0
+	itertools-0.10.3
+	lazy_static-1.4.0
+	libc-0.2.139
+	libmimalloc-sys-0.1.24
+	lock_api-0.4.9
+	log-0.4.17
+	memchr-2.5.0
+	memoffset-0.6.5
+	mimalloc-0.1.28
+	minimal-lexical-0.2.1
+	mio-0.8.5
+	nom-7.1.1
+	num_cpus-1.13.1
+	once_cell-1.12.0
+	os_str_bytes-6.0.1
+	output_vt100-0.1.3
+	owo-colors-3.4.0
+	parking_lot-0.12.1
+	parking_lot_core-0.9.6
+	petgraph-0.6.1
+	pretty_assertions-1.2.1
+	pretty_env_logger-0.4.0
+	proc-macro2-1.0.39
+	quick-error-1.2.3
+	quote-1.0.18
+	radix-heap-0.4.2
+	rayon-1.6.1
+	rayon-core-1.10.1
+	redox_syscall-0.2.16
+	regex-1.5.6
+	regex-syntax-0.6.26
+	rustc-hash-1.1.0
+	same-file-1.0.6
+	scopeguard-1.1.0
+	signal-hook-0.3.14
+	signal-hook-mio-0.2.3
+	signal-hook-registry-1.4.0
+	smallvec-1.10.0
+	strsim-0.10.0
+	syn-1.0.95
+	termcolor-1.1.3
+	terminal_size-0.1.17
+	textwrap-0.15.0
+	tree-sitter-0.20.9
+	typed-arena-2.0.1
+	unicode-ident-1.0.0
+	unicode-width-0.1.9
+	unicode-xid-0.2.3
+	version_check-0.9.4
+	walkdir-2.3.2
+	wasi-0.11.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
+	windows-sys-0.42.0
+	windows_aarch64_gnullvm-0.42.1
+	windows_aarch64_msvc-0.42.1
+	windows_i686_gnu-0.42.1
+	windows_i686_msvc-0.42.1
+	windows_x86_64_gnu-0.42.1
+	windows_x86_64_gnullvm-0.42.1
+	windows_x86_64_msvc-0.42.1
+	wu-diff-0.1.2
+"
+
+inherit cargo
+
+DESCRIPTION="A structural diff that understands syntax."
+# Double check the homepage as the cargo_metadata crate
+# does not provide this value so instead repository is used
+HOMEPAGE="https://github.com/wilfred/difftastic"
+TREE_MAGIC_COMMIT="13dd6dda15c7062bd8f7dd5bc9bb5b16ce9ee613"
+SRC_URI="
+	$(cargo_crate_uris ${CRATES})
+	https://github.com/Wilfred/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz
+	https://github.com/Wilfred/tree_magic/archive/${TREE_MAGIC_COMMIT}.tar.gz -> tree_magic_mini-${TREE_MAGIC_COMMIT}.tar.gz
+"
+
+# License set may be more restrictive as OR is not respected
+# use cargo-license for a more accurate license picture
+LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+
+QA_FLAGS_IGNORED="usr/bin/difft"
+
+DOCS=(
+	CHANGELOG.md
+	README.md
+	manual/
+)
+
+src_prepare() {
+	rm manual/.gitignore || die
+
+	# patch git dep to use pre-fetched tarball
+	local tree_magic_path="tree_magic_mini = { path = '"${WORKDIR}/tree_magic-${TREE_MAGIC_COMMIT}"' }"
+	sed -i "s@^tree_magic_mini =.*@${tree_magic_path}@" "${S}/Cargo.toml" || die
+
+	default
+}
+
+src_install() {
+	cargo_src_install
+	dodoc -r "${DOCS[@]}"
+}
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index f7d08485ada3..e46c96806d80 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-builder-43.4.tar.xz 10284936 BLAKE2B 50af653566b35525a751d1ab0698c42e205aa8ab3205b390d10625f67a984986f24e5c0a5512629d81c082265435d5f39380de2c675d64e9f0b6d47c2fc62451 SHA512 c8600aea7bd01fb8a75baf321d8670600aa0ac77f7a42cccc7107fd9d2addd0264f132a4e36c2ae66ad7dbd8dc94dfc52421655254eee93d0a3298aa2cc224db
 DIST gnome-builder-43.5.tar.xz 10289424 BLAKE2B b0676ebf4b475a6223a57f79d135371d3cfcadd3d4dd37abf48f000f9fc0d0b3e48fb615bc07ed1415324f7661a8f4c7b05c3f31f41a70870f9c4b320d33160c SHA512 24533109c0be9bd595b04ab2abceb2a894034c648837181e8f21fb52e54b8f0e0d043f4d89ab2fff0f84cf0114d3824e05fc8f466745e9e4b577f298cafb483f
+DIST gnome-builder-43.6.tar.xz 10289396 BLAKE2B e9b8c98f5463906e0ec522307f0ec07c130045288db5b1295b56320ac36814019ee3350f73543c8a1655812dcd8b26da4cbe9d1b5bd3bda8cc7a943f308a91ee SHA512 e444843e1eae2a901048dc6f2ff7683c3693fcbceeb113ebd28e7a51d1ea9c3b7e317e28ceae9b659dc89cf3b75cabd526fff9483b81c623d809ca268a2c9a45
diff --git a/dev-util/gnome-builder/gnome-builder-43.6.ebuild b/dev-util/gnome-builder/gnome-builder-43.6.ebuild
new file mode 100644
index 000000000000..64dfe86174a1
--- /dev/null
+++ b/dev-util/gnome-builder/gnome-builder-43.6.ebuild
@@ -0,0 +1,261 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+DISABLE_AUTOFORMATTING=1
+FORCE_PRINT_ELOG=1
+
+inherit gnome.org gnome2-utils llvm meson optfeature python-single-r1 readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="An IDE for writing GNOME-based software"
+HOMEPAGE="https://wiki.gnome.org/Apps/Builder https://gitlab.gnome.org/GNOME/gnome-builder"
+
+# FIXME: Review licenses at some point
+LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="clang doc +d-spy flatpak +git gtk-doc spell +sysprof test +webkit"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	flatpak? ( git )
+"
+
+# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within.
+# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking.
+# The listed RDEPEND order should roughly match that output as well, with toplevel one first then sorted by file path.
+# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of
+# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small
+# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except.
+
+# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2?
+# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4
+
+# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
+RDEPEND="
+	>=dev-libs/glib-2.73.3:2
+	>=gui-libs/gtk-4.7.1:4[introspection]
+	>=gui-libs/libadwaita-1.2.0:1
+	>=gui-libs/libpanel-1.0.0:1
+	>=gui-libs/gtksourceview-5.5.2:5[introspection]
+	>=dev-libs/json-glib-1.2.0
+	>=dev-libs/jsonrpc-glib-3.42.0:=
+	>=dev-libs/libpeas-1.34.0[python,${PYTHON_SINGLE_USEDEP}]
+	dev-libs/libportal:=[gtk,introspection]
+	>=dev-libs/template-glib-3.36.0:=[introspection]
+	>=gui-libs/vte-0.70.0:2.91-gtk4[introspection]
+	>=dev-libs/libxml2-2.9.0
+	webkit? ( >=net-libs/webkit-gtk-2.38.0:5=[introspection] )
+	>=app-text/cmark-0.29.0:0=
+	d-spy? ( >=dev-util/d-spy-1.4.0:1 )
+	app-text/editorconfig-core-c
+	flatpak? (
+		dev-util/ostree
+		>=net-libs/libsoup-3:3.0
+		>=sys-apps/flatpak-1.10.2
+	)
+	git? (
+		dev-libs/libgit2:=[ssh,threads]
+		>=dev-libs/libgit2-glib-1.1.0[ssh]
+	)
+
+	>=dev-libs/gobject-introspection-1.54.0:=
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
+	')
+	${PYTHON_DEPS}
+	clang? ( sys-devel/clang:= )
+	spell? (
+		app-text/enchant:2
+		dev-libs/icu:=
+	)
+	sysprof? (
+		>=dev-util/sysprof-capture-3.46.0:4
+		>=dev-util/sysprof-3.46.0:0/4
+	)
+"
+DEPEND="${RDEPEND}"
+# TODO: runtime ctags path finding..
+
+# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional
+# appstream-glib needed for validation with appstream-util with FEATURES=test
+BDEPEND="
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+		')
+	)
+	gtk-doc? (
+		dev-util/gi-docgen
+		app-text/docbook-xml-dtd:4.3
+	)
+	test? (
+		dev-libs/appstream-glib
+		sys-apps/dbus
+	)
+	dev-util/desktop-file-utils
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
+extra capabilities beyond these expressed via USE flags. Some of these
+that are currently available with packages include:
+
+* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
+  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
+  highlighting and symbol resolving support.
+* dev-python/jedi and dev-python/lxml for more accurate Python
+  autocompletion support.
+* dev-util/valgrind for integration with valgrind.
+* dev-util/meson for integration with the Meson build system.
+* virtual/rust for integration with the Rust Cargo build system.
+* dev-util/cmake for integration with the CMake build system.
+* net-libs/nodejs[npm] for integration with the NPM package system.
+'
+# FIXME: Package codespell and mention here
+# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
+# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..)
+# jhbuild support
+# rust support via rust-analyzer; Go via go-langserver
+# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template
+# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE
+# stylelint for stylesheet (CSS and co) linting
+# gvls for vala language-server integration
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	use clang && llvm_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dchannel=other
+
+		-Ddevelopment=false
+		-Dtracing=false
+		-Dprofiling=false # not passing -pg to CFLAGS
+		-Dtcmalloc=false
+		-Dwith_safe_path=''
+		-Dgnome_sdk_version=master
+		$(meson_use doc help)
+		$(meson_use gtk-doc docs)
+		-Dnetwork_tests=false
+		-Dctags_path=''
+		$(meson_feature webkit)
+
+		-Dplugin_autotools=true
+		-Dplugin_bash_language_server=true
+		-Dplugin_blueprint=true
+		-Dplugin_buildstream=true
+		-Dplugin_c_pack=true
+		-Dplugin_cargo=true
+		$(meson_use clang plugin_clang)
+		$(meson_use clang plugin_clangd)
+		$(meson_use clang plugin_clang_format)
+		-Dplugin_cmake=true
+		-Dplugin_codespell=true
+		-Dplugin_code_index=true
+		-Dplugin_copyright=true
+		-Dplugin_ctags=true
+		-Dplugin_deviced=false # libdeviced not packaged?
+		$(meson_use d-spy plugin_dspy)
+		-Dplugin_editorconfig=true
+		-Dplugin_eslint=true
+		-Dplugin_file_search=true
+		$(meson_use flatpak plugin_flatpak)
+		-Dplugin_gdb=true
+		-Dplugin_gdiagnose=true
+		-Dplugin_gettext=true
+		$(meson_use git plugin_git)
+		-Dplugin_gopls=true
+		-Dplugin_gradle=true
+		-Dplugin_grep=true
+		-Dplugin_html_completion=true
+		$(meson_use webkit plugin_html_preview)
+		-Dplugin_intelephense=true
+		-Dplugin_jdtls=true
+		-Dplugin_jedi_language_server=true
+		-Dplugin_jhbuild=true
+		-Dplugin_make=true
+		-Dplugin_make_templates=true
+		$(meson_use webkit plugin_markdown_preview)
+		-Dplugin_maven=true
+		-Dplugin_meson=true
+		-Dplugin_meson_templates=true
+		-Dplugin_modelines=true
+		-Dplugin_mono=true
+		-Dplugin_newcomers=true
+		-Dplugin_notification=true
+		-Dplugin_npm=true
+		-Dplugin_phpize=true
+		-Dplugin_podman=true
+		-Dplugin_pygi=true
+		# -Dplugin_python_lsp_server=true # isn't recognized by meson even though it's in meson.build and meson-options.txt. See also: https://gitlab.gnome.org/GNOME/gnome-builder/-/issues/1842
+		-Dplugin_qemu=true
+		-Dplugin_quick_highlight=true
+		-Dplugin_retab=true
+		-Dplugin_rstcheck=true
+		-Dplugin_rubocop=true
+		-Dplugin_rust_analyzer=false # rust-analyzer not packaged
+		-Dplugin_shellcmd=true
+		-Dplugin_shellcheck=true
+		$(meson_use spell plugin_spellcheck)
+		$(meson_use webkit plugin_sphinx_preview)
+		-Dplugin_stylelint=true
+		$(meson_use sysprof plugin_sysprof)
+		-Dplugin_sysroot=true
+		-Dplugin_todo=true
+		-Dplugin_ts_language_server=true
+		-Dplugin_update_manager=true
+		-Dplugin_valac=true
+		-Dplugin_vala_indenter=true
+		-Dplugin_valgrind=true
+		-Dplugin_vls=true
+		-Dplugin_waf=true
+		-Dplugin_words=true
+		-Dplugin_xml_pack=true
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_optimize
+	if use doc; then
+		rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die
+		rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die
+		# custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825
+		mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die
+		# _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is.
+		rmdir "${ED}"/usr/share/doc/gnome-builder/ || die
+	fi
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+
+	optfeature_header "Language support"
+	optfeature "Rust's Cargo build system" virtual/rust
+	optfeature "CMake" dev-util/cmake
+	optfeature "Java Maven build system" dev-java/maven-bin
+	optfeature "Meson Build system" dev-util/meson
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
+
+src_test() {
+	virtx dbus-run-session meson test -C "${BUILD_DIR}"
+}
diff --git a/dev-util/hip/files/hip-5.3.3-correct-ldflag.patch b/dev-util/hip/files/hip-5.3.3-correct-ldflag.patch
new file mode 100644
index 000000000000..20d117841c2b
--- /dev/null
+++ b/dev-util/hip/files/hip-5.3.3-correct-ldflag.patch
@@ -0,0 +1,20 @@
+This removes ldflag -L"/usr/lib" and -Wl,-rpath=/usr/lib:/usr/lib which
+causes `ld: skipping incompatible /usr/lib/libm.so when searching for -lm`
+Reference: https://github.com/justxi/rocm/issues/8#issuecomment-1166193820
+===================================================================
+Index: HIP-rocm-5.3.3/bin/hipcc.pl
+===================================================================
+--- HIP-rocm-5.3.3.orig/bin/hipcc.pl
++++ HIP-rocm-5.3.3/bin/hipcc.pl
+@@ -711,9 +711,9 @@ if ($HIP_PLATFORM eq "amd") {
+ 
+     if (not $isWindows  and not $compileOnly) {
+       if ($linkType eq 0) {
+-        $toolArgs = " -L$HIP_LIB_PATH -lamdhip64 -L$ROCM_PATH/lib -lhsa-runtime64 -ldl -lnuma " . ${toolArgs};
++        $toolArgs = " -lamdhip64 -lhsa-runtime64 -ldl -lnuma " . ${toolArgs};
+       } else {
+-        $toolArgs = ${toolArgs} . " -Wl,--enable-new-dtags -Wl,-rpath=$HIP_LIB_PATH:$ROCM_PATH/lib -lamdhip64 ";
++        $toolArgs = ${toolArgs} . " -Wl,--enable-new-dtags -lamdhip64 ";
+       }
+       # To support __fp16 and _Float16, explicitly link with compiler-rt
+       $HIP_CLANG_BUILTIN_LIB="$HIP_CLANG_PATH/../lib/clang/$HIP_CLANG_VERSION/lib/$HIP_CLANG_TARGET/libclang_rt.builtins.a";
diff --git a/dev-util/hip/hip-5.3.3-r2.ebuild b/dev-util/hip/hip-5.3.3-r3.ebuild
index 072b8d319e97..c11b85e3f2ec 100644
--- a/dev-util/hip/hip-5.3.3-r2.ebuild
+++ b/dev-util/hip/hip-5.3.3-r3.ebuild
@@ -77,6 +77,7 @@ src_prepare() {
 	pushd ${HIP_S} || die
 	eapply "${FILESDIR}/${PN}-5.1.3-rocm-path.patch"
 	eapply "${FILESDIR}/${PN}-5.1.3-fno-stack-protector.patch"
+	eapply "${FILESDIR}/${PN}-5.3.3-correct-ldflag.patch"
 	eapply "${FILESDIR}/0001-SWDEV-344620-hipcc-fails-to-parse-version-of-clang-i.patch"
 	eapply "${FILESDIR}/0002-SWDEV-355608-Remove-clang-include-path-2996.patch"
 	eapply "${FILESDIR}/0003-SWDEV-352878-Removed-relative-path-based-CLANG-inclu.patch"