9 files changed, 441 insertions, 9 deletions
diff --git a/dev-debug/Manifest.gz b/dev-debug/Manifest.gz
index 672c07d54a0b..14669643c1d2 100644
--- a/dev-debug/Manifest.gz
+++ b/dev-debug/Manifest.gz
diff --git a/dev-debug/gdb/Manifest b/dev-debug/gdb/Manifest
index 07ae338e99d0..7b588e349c44 100644
--- a/dev-debug/gdb/Manifest
+++ b/dev-debug/gdb/Manifest
@@ -2,7 +2,8 @@ AUX gdb-8.3.1-verbose-build.patch 395 BLAKE2B e2e82307ceae64d16aa9b57a5e639eb5d2
 DIST gdb-15.2.tar.xz 24332820 BLAKE2B 073668c21b41f12bf40160c6d3df808056453cc9df3b5b86374abe38e955d208f86467458b7e64b3c3e93d70b7f87425619778173fdb375256cd85be15419f14 SHA512 624007deceb5b15ba89c0725883d1a699fa46714ef30887f3d0165e17c5d65d634671740a135aa69e437d916218abb08cfa2a38ed309ff19d48f51da56b2a8ba
 DIST gdb-16.2.tar.xz 24426680 BLAKE2B 480cc5c116e418d7eb13a68bee8a2ced8e7a40bd38826dde3590a8d5b690c3dd46be6fa3790518b39ac7255698a1ecf35a2bb51d7e38d849f7b9277c15fe38fc SHA512 f04a6335dbdee371edb7e3213294fcbb878ac39adedb73f7e17e621f54350488f5f5bea9bc742639239c122d590bed158771a74fc3aaeaa7fa0ae304232576a3
 EBUILD gdb-15.2-r100.ebuild 9185 BLAKE2B ef2d07f452d550a9ad6e9be37e6873d1edd78ef5b40832d33c5f241f2facf13ad226f4c08b7c3762b8b298eaae9b3004d6de9344b3209731874c88ce59c2b472 SHA512 0a537e66d10b8b53e16235f5251790a6c9154cddc9afe6a34843ab6d1b20e1f3d8c32e447035f19330f108b2d7e2a1c7fe5080d745fd298471bde7d9a8c19a28
-EBUILD gdb-15.2-r101.ebuild 9682 BLAKE2B 7bd71dd525a43b8937dbfab1815e3ed7ab7a58ee9ad10dae4637eb154817103f99f275571bb095f6d30bfde7c037bb8e3a830a38fdd197fe2095b1f927312fad SHA512 8075787c79d1d177001d45bc23dff41172099e680cd9e7e907e4ccc7459b029e77de6b047b9a4460835fab48ba49b4565f2153719825b87efa5ce7f7964d3a2b
-EBUILD gdb-16.2.ebuild 9795 BLAKE2B 8dc68a014c206c55e472fe9ebc26ba46cd5343901b2188979c1b9343e57c70b1cee81bab0dd0cd2bf3b9eafd54965af489d6c3eb93dd057bf7ca260a2ee2072c SHA512 72b11c86fdb7ed664f31693019eb223bce2c28c73b133aa9f59c98f1e42d521fb4a372ef2d01216dedac0d0230ca799c58b9369ee65f91b85edd648af675351c
-EBUILD gdb-9999.ebuild 9795 BLAKE2B 8dc68a014c206c55e472fe9ebc26ba46cd5343901b2188979c1b9343e57c70b1cee81bab0dd0cd2bf3b9eafd54965af489d6c3eb93dd057bf7ca260a2ee2072c SHA512 72b11c86fdb7ed664f31693019eb223bce2c28c73b133aa9f59c98f1e42d521fb4a372ef2d01216dedac0d0230ca799c58b9369ee65f91b85edd648af675351c
-MISC metadata.xml 1446 BLAKE2B c62ea8e285f00353200641c7d7a0b94d62ce32669643d2d770a4bbbc437bda96d0fd98ec81bcafbf1f318df3eb39a4e00a75a965bcdec615456307976ef0d0f9 SHA512 7f06a197bfd4d22933448e87b58d0f1bd9da293835a5b58697240ccafc1f350845a2f6875416fd2b6eef1cecbcc82a782320607d6ca620e3daf374f0fd51fa28
+EBUILD gdb-15.2-r101.ebuild 9646 BLAKE2B 58da2f3fd9a8cf200dc5f8c728fc2b54a945e12b53c0e160bbb4a90b39e3faea2aa90f614295c34cd1551187f8e4a32624d5ea0b05352fce2f0b39ff3345d1c9 SHA512 cb30898f00f9783cc0e29324b0d95d4b687aacef7bcecf8d35688c47bb8c04bd1bbae0a35cbd9716c8dfbbdfaa533ccefb035af6866770ae15e3563e9924e664
+EBUILD gdb-15.2-r103.ebuild 9728 BLAKE2B 6d3db7d4cef1a0264211cd3a00bf15acb76516e3ad05c605cb3f6fdbec1e977a75791de1247059e60cf624a2972c67adb1ace3aa76877c9b45db50a5dfb8b1ba SHA512 78f596bb4205418ae48a5e06542c07dc730a15988f82723108aecf7d7d40fc2fd5c574f3501a4c513756f97ebfba547203e77c949b1ca7263d11ad118edc1246
+EBUILD gdb-16.2-r2.ebuild 9834 BLAKE2B 20b2cb221e6e9faab026daf3b8e4982ef7359b099fcd8bf0fa2367ac8db3ec7d94033bbd5e965037493bbad853a4bb218a6e0a89d1c8ab5943f7ae6c7049f9a2 SHA512 17315665abd704662f53db1d7710348d05ecc58901f30f5ee687995d202801eb70679bc1f36c333e49bbd81958af9c759a3cffefc9494e6c6ef08a16302e7b04
+EBUILD gdb-9999.ebuild 9834 BLAKE2B 20b2cb221e6e9faab026daf3b8e4982ef7359b099fcd8bf0fa2367ac8db3ec7d94033bbd5e965037493bbad853a4bb218a6e0a89d1c8ab5943f7ae6c7049f9a2 SHA512 17315665abd704662f53db1d7710348d05ecc58901f30f5ee687995d202801eb70679bc1f36c333e49bbd81958af9c759a3cffefc9494e6c6ef08a16302e7b04
+MISC metadata.xml 1525 BLAKE2B 01da40ca52658bfbbe95c525d647dc01bbe85ed7e667f67fa98eb13c63dc31cde5449497345f1c8a4c21bc6585deac9a9947f086a7c8229cc34eaee3e59158d9 SHA512 e58d0ac3dd0394f16c8a0da8a1cc4a4f14f56f793a55a8b3ed60bd562a3e79671a112d4c459b310d716350fc62112f3d45c2ae10b85cf56f54049312ac21d8c7
diff --git a/dev-debug/gdb/gdb-15.2-r101.ebuild b/dev-debug/gdb/gdb-15.2-r101.ebuild
index 118411bb3757..66b4bc45cacf 100644
--- a/dev-debug/gdb/gdb-15.2-r101.ebuild
+++ b/dev-debug/gdb/gdb-15.2-r101.ebuild
@@ -90,7 +90,6 @@ RDEPEND="
 	>=sys-libs/ncurses-5.2-r2:=
 	>=sys-libs/readline-7:=
 	sys-libs/zlib
-	elibc_glibc? ( net-libs/libnsl:= )
 	debuginfod? (
 		dev-libs/elfutils[debuginfod(-)]
 	)
diff --git a/dev-debug/gdb/gdb-15.2-r103.ebuild b/dev-debug/gdb/gdb-15.2-r103.ebuild
new file mode 100644
index 000000000000..37ff9d538bf0
--- /dev/null
+++ b/dev-debug/gdb/gdb-15.2-r103.ebuild
@@ -0,0 +1,351 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# See https://sourceware.org/gdb/wiki/DistroAdvice for general packaging
+# tips & notes.
+
+GUILE_COMPAT=( 2-2 3-0 )
+PYTHON_COMPAT=( python3_{10..13} )
+inherit flag-o-matic guile-single linux-info python-single-r1 strip-linguas toolchain-funcs
+
+export CTARGET=${CTARGET:-${CHOST}}
+
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+case ${PV} in
+	9999*)
+		# live git tree
+		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
+		inherit git-r3
+		SRC_URI=""
+		;;
+	*.*.50_p2???????|*.*.90_p2???????)
+		# Weekly snapshots
+		MY_PV="${PV/_p/.}"
+		SRC_URI="
+			https://sourceware.org/pub/gdb/snapshots/branch/gdb-weekly-${MY_PV}.tar.xz
+			https://sourceware.org/pub/gdb/snapshots/current/gdb-weekly-${MY_PV}.tar.xz
+			https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/gdb-weekly-${MY_PV}.tar.xz
+		"
+		S="${WORKDIR}/${PN}-${MY_PV}"
+
+		# e.g. 13.1.90_p20230325 is a snapshot on the stable branch, so it's fine
+		if [[ ${PV} == *.[123456789].9?_p2??????? ]] ; then
+			REGULAR_RELEASE=1
+		fi
+		;;
+	*.*.9?)
+		# Prereleases
+		MY_PV="${PV/_p/.}"
+		SRC_URI="
+			https://sourceware.org/pub/gdb/snapshots/branch/gdb-${MY_PV}.tar.xz
+			https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/gdb-${MY_PV}.tar.xz
+		"
+		S="${WORKDIR}/${PN}-${MY_PV}"
+		;;
+	*)
+		# Normal upstream release
+		SRC_URI="
+			mirror://gnu/gdb/${P}.tar.xz
+			https://sourceware.org/pub/gdb/releases/${P}.tar.xz
+		"
+
+		REGULAR_RELEASE=1
+esac
+
+PATCH_DEV=""
+PATCH_VER=""
+DESCRIPTION="GNU debugger"
+HOMEPAGE="https://sourceware.org/gdb/"
+SRC_URI="
+	${SRC_URI}
+	${PATCH_DEV:+https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${CATEGORY}/${PN}/${P}-patches-${PATCH_VER}.tar.xz}
+	${PATCH_VER:+mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz}
+"
+
+LICENSE="GPL-3+ LGPL-2.1+"
+SLOT="0"
+IUSE="babeltrace cet debuginfod guile lzma multitarget nls +python rocm +server sim source-highlight test vanilla xml xxhash zstd"
+if [[ -n ${REGULAR_RELEASE} ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+fi
+REQUIRED_USE="
+	guile? ( ${GUILE_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	rocm? ( multitarget )
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/mpfr:=
+	dev-libs/gmp:=
+	>=sys-libs/ncurses-5.2-r2:=
+	>=sys-libs/readline-7:=
+	sys-libs/zlib
+	babeltrace? ( dev-util/babeltrace:= )
+	debuginfod? (
+		dev-libs/elfutils[debuginfod(-)]
+	)
+	lzma? ( app-arch/xz-utils )
+	python? ( ${PYTHON_DEPS} )
+	guile? ( ${GUILE_DEPS} )
+	xml? ( dev-libs/expat )
+	rocm? ( <dev-libs/rocdbgapi-6.3 )
+	source-highlight? (
+		dev-util/source-highlight
+	)
+	xxhash? (
+		dev-libs/xxhash
+	)
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	sys-apps/texinfo
+	app-alternatives/yacc
+	nls? ( sys-devel/gettext )
+	source-highlight? ( virtual/pkgconfig )
+	test? ( dev-util/dejagnu )
+"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	MIN # gnulib FP (bug #898688)
+)
+
+QA_PREBUILT="usr/share/gdb/guile/*"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-8.3.1-verbose-build.patch
+)
+
+pkg_setup() {
+	local CONFIG_CHECK
+
+	if kernel_is -ge 6.11.3 ; then
+		# https://forums.gentoo.org/viewtopic-p-8846891.html
+		#
+		# Either CONFIG_PROC_MEM_ALWAYS_FORCE or CONFIG_PROC_MEM_FORCE_PTRACE
+		# should be okay, but not CONFIG_PROC_MEM_NO_FORCE.
+		CONFIG_CHECK+="
+			~!PROC_MEM_NO_FORCE
+		"
+	fi
+
+	linux-info_pkg_setup
+
+	use guile && guile-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	use guile && guile_bump_sources
+
+	strip-linguas -u bfd/po opcodes/po
+
+	# Avoid using ancient termcap from host on Prefix systems
+	sed -i -e 's/termcap tinfow/tinfow/g' \
+		gdb/configure{.ac,} || die
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# code relies on C++11, so make sure we get that selected
+		# due to Python 3.11 pymacro.h doing stuff to work around
+		# versioning mess based on the C version, while we're compiling
+		# C++ here, so we need to make it clear we're doing C++11/C11
+		# because Solaris system headers act on these
+		sed -i -e 's/-x c++/-std=c++11/' gdb/Makefile.in || die
+	fi
+}
+
+gdb_branding() {
+	printf "Gentoo ${PV} "
+
+	if ! use vanilla && [[ -n ${PATCH_VER} ]] ; then
+		printf "p${PATCH_VER}"
+	else
+		printf "vanilla"
+	fi
+
+	[[ -n ${EGIT_COMMIT} ]] && printf " ${EGIT_COMMIT}"
+}
+
+src_configure() {
+	strip-unsupported-flags
+
+	# See https://www.gnu.org/software/make/manual/html_node/Parallel-Output.html
+	# Avoid really confusing logs from subconfigure spam, makes logs far
+	# more legible.
+	MAKEOPTS="--output-sync=line ${MAKEOPTS}"
+
+	local myconf=(
+		# portage's econf() does not detect presence of --d-d-t
+		# because it greps only top-level ./configure. But not
+		# libiberty's or gdb's configure.
+		--disable-dependency-tracking
+		--disable-silent-rules
+
+		--with-pkgversion="$(gdb_branding)"
+		--with-bugurl='https://bugs.gentoo.org/'
+		--disable-werror
+		# Disable modules that are in a combined binutils/gdb tree. bug #490566
+		--disable-{binutils,etc,gas,gold,gprof,gprofng,ld}
+
+		$(use_with babeltrace)
+		$(use_with debuginfod)
+
+		$(use_enable test unit-tests)
+
+		# Allow user to opt into CET for host libraries.
+		# Ideally we would like automagic-or-disabled here.
+		# But the check does not quite work on i686: bug #760926.
+		$(use_enable cet)
+
+		# Helps when cross-compiling. Not to be confused with --with-sysroot.
+		--with-build-sysroot="${ESYSROOT}"
+	)
+
+	is_cross && myconf+=(
+		--with-sysroot="\${prefix}/${CTARGET}"
+		--includedir="\${prefix}/include/${CTARGET}"
+		--with-gdb-datadir="\${datadir}/gdb/${CTARGET}"
+	)
+
+	# gdbserver only works for native targets (CHOST==CTARGET).
+	# it also doesn't support all targets, so rather than duplicate
+	# the target list (which changes between versions), use the
+	# "auto" value when things are turned on, which is triggered
+	# whenever no --enable or --disable is given
+	if is_cross || use !server ; then
+		myconf+=( --disable-gdbserver )
+	fi
+
+	myconf+=(
+		--enable-64-bit-bfd
+		--disable-install-libbfd
+		--disable-install-libiberty
+		--enable-obsolete
+		# This only disables building in the readline subdir.
+		# For gdb itself, it'll use the system version.
+		--disable-readline
+		--with-system-readline
+		# This only disables building in the zlib subdir.
+		# For gdb itself, it'll use the system version.
+		--without-zlib
+		--with-system-zlib
+		--with-separate-debug-dir="${EPREFIX}"/usr/lib/debug
+		--with-amd-dbgapi=$(usex rocm)
+		$(use_with xml expat)
+		$(use_with lzma)
+		$(use_enable nls)
+		$(use_enable sim)
+		$(use_enable source-highlight)
+		$(use multitarget && echo --enable-targets=all)
+		$(use_with python python "${EPYTHON}")
+		$(use_with xxhash)
+		$(use_with guile)
+		$(use_with zstd)
+
+		# Find libraries using the toolchain sysroot rather than the configured
+		# prefix. Needed when cross-compiling.
+		#
+		# Check which libraries to apply this to with:
+		# "${S}"/gdb/configure --help | grep without-lib | sort
+		--without-lib{babeltrace,expat,gmp,iconv,ipt,lzma,mpfr,xxhash}-prefix
+	)
+
+	# source-highlight is detected with pkg-config: bug #716558
+	export ac_cv_path_pkg_config_prog_path="$(tc-getPKG_CONFIG)"
+
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+
+	# ensure proper compiler is detected for Clang builds: bug #831202
+	export GCC_FOR_TARGET="${CC_FOR_TARGET:-$(tc-getCC)}"
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	# Run the unittests (nabbed invocation from Fedora's spec file) at least
+	emake -k -C gdb run GDBFLAGS='-batch -ex "maintenance selftest"'
+
+	# Too many failures
+	# In fact, gdb's test suite needs some work to get passing.
+	# See e.g. https://sourceware.org/gdb/wiki/TestingGDB.
+	# As of 11.2, on amd64: "# of unexpected failures    8600"
+	# Also, ia64 kernel crashes when gdb testsuite is running.
+	#emake -k check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	find "${ED}"/usr -name libiberty.a -delete || die
+
+	# Delete translations that conflict with binutils-libs. bug #528088
+	# Note: Should figure out how to store these in an internal gdb dir.
+	if use nls ; then
+		find "${ED}" \
+			-regextype posix-extended -regex '.*/(bfd|opcodes)[.]g?mo$' \
+			-delete || die
+	fi
+
+	# Don't install docs when building a cross-gdb
+	if [[ ${CTARGET} != ${CHOST} ]] ; then
+		rm -rf "${ED}"/usr/share/{doc,info,locale} || die
+		local f
+		for f in "${ED}"/usr/share/man/*/* ; do
+			if [[ ${f##*/} != ${CTARGET}-* ]] ; then
+				mv "${f}" "${f%/*}/${CTARGET}-${f##*/}" || die
+			fi
+		done
+		return 0
+	fi
+
+	# Install it by hand for now:
+	# https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
+	# Only install if it exists due to the twisted behavior (see
+	# notes in src_configure above).
+	[[ -e gdbserver/gdbreplay ]] && dobin gdbserver/gdbreplay
+
+	docinto gdb
+	dodoc gdb/CONTRIBUTE gdb/README gdb/MAINTAINERS \
+		gdb/NEWS gdb/PROBLEMS
+	docinto sim
+	dodoc sim/{MAINTAINERS,README-HACKING}
+
+	if use server ; then
+		docinto gdbserver
+		dodoc gdbserver/README
+	fi
+
+	# Remove shared info pages
+	rm -f "${ED}"/usr/share/info/{annotate,bfd,configure,ctf-spec,standards}.info*
+
+	use guile && guile_unstrip_ccache
+
+	if use python ; then
+		python_optimize "${ED}"/usr/share/gdb/python/gdb
+	fi
+}
+
+pkg_postinst() {
+	# Portage doesn't unmerge files in /etc
+	rm -vf "${EROOT}"/etc/skel/.gdbinit
+
+	if use prefix && [[ ${CHOST} == *-darwin* ]] ; then
+		ewarn "gdb is unable to get a mach task port when installed by Prefix"
+		ewarn "Portage, unprivileged.  To make gdb fully functional you'll"
+		ewarn "have to perform the following steps:"
+		ewarn "  % sudo chgrp procmod ${EPREFIX}/usr/bin/gdb"
+		ewarn "  % sudo chmod g+s ${EPREFIX}/usr/bin/gdb"
+	fi
+}
diff --git a/dev-debug/gdb/gdb-16.2.ebuild b/dev-debug/gdb/gdb-16.2-r2.ebuild
index fd6b67c815cc..94a55473c3a3 100644
--- a/dev-debug/gdb/gdb-16.2.ebuild
+++ b/dev-debug/gdb/gdb-16.2-r2.ebuild
@@ -77,7 +77,7 @@ SRC_URI="
 
 LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
-IUSE="cet debuginfod guile lzma multitarget nls +python rocm +server sim source-highlight test vanilla xml xxhash zstd"
+IUSE="babeltrace cet debuginfod guile lzma multitarget nls +python rocm +server sim source-highlight test vanilla xml xxhash zstd"
 if [[ -n ${REGULAR_RELEASE} ]] ; then
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
@@ -94,7 +94,7 @@ RDEPEND="
 	>=sys-libs/ncurses-5.2-r2:=
 	>=sys-libs/readline-7:=
 	sys-libs/zlib
-	elibc_glibc? ( net-libs/libnsl:= )
+	babeltrace? ( dev-util/babeltrace:= )
 	debuginfod? (
 		dev-libs/elfutils[debuginfod(-)]
 	)
@@ -203,6 +203,7 @@ src_configure() {
 		# Disable modules that are in a combined binutils/gdb tree. bug #490566
 		--disable-{binutils,etc,gas,gold,gprof,gprofng,ld}
 
+		$(use_with babeltrace)
 		$(use_with debuginfod)
 
 		$(use_enable test unit-tests)
diff --git a/dev-debug/gdb/gdb-9999.ebuild b/dev-debug/gdb/gdb-9999.ebuild
index fd6b67c815cc..94a55473c3a3 100644
--- a/dev-debug/gdb/gdb-9999.ebuild
+++ b/dev-debug/gdb/gdb-9999.ebuild
@@ -77,7 +77,7 @@ SRC_URI="
 
 LICENSE="GPL-3+ LGPL-2.1+"
 SLOT="0"
-IUSE="cet debuginfod guile lzma multitarget nls +python rocm +server sim source-highlight test vanilla xml xxhash zstd"
+IUSE="babeltrace cet debuginfod guile lzma multitarget nls +python rocm +server sim source-highlight test vanilla xml xxhash zstd"
 if [[ -n ${REGULAR_RELEASE} ]] ; then
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
@@ -94,7 +94,7 @@ RDEPEND="
 	>=sys-libs/ncurses-5.2-r2:=
 	>=sys-libs/readline-7:=
 	sys-libs/zlib
-	elibc_glibc? ( net-libs/libnsl:= )
+	babeltrace? ( dev-util/babeltrace:= )
 	debuginfod? (
 		dev-libs/elfutils[debuginfod(-)]
 	)
@@ -203,6 +203,7 @@ src_configure() {
 		# Disable modules that are in a combined binutils/gdb tree. bug #490566
 		--disable-{binutils,etc,gas,gold,gprof,gprofng,ld}
 
+		$(use_with babeltrace)
 		$(use_with debuginfod)
 
 		$(use_enable test unit-tests)
diff --git a/dev-debug/gdb/metadata.xml b/dev-debug/gdb/metadata.xml
index a9c1d3521c85..69d4e98e2c0f 100644
--- a/dev-debug/gdb/metadata.xml
+++ b/dev-debug/gdb/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Toolchain Project</name>
 	</maintainer>
 	<use>
+		<flag name="babeltrace">Enable <pkg>dev-util/babeltrace</pkg> support</flag>
 		<flag name="cet">Enable Intel Control-flow Enforcement Technology.</flag>
 		<flag name="lzma">Support lzma compression in ELF debug info</flag>
 		<flag name="multitarget">Support all known targets in one gdb binary</flag>
diff --git a/dev-debug/gfxreconstruct/Manifest b/dev-debug/gfxreconstruct/Manifest
index 8184820d7c45..184b4f99cfc6 100644
--- a/dev-debug/gfxreconstruct/Manifest
+++ b/dev-debug/gfxreconstruct/Manifest
@@ -1,7 +1,10 @@
 AUX 1.3.296.0-use-system-vulkan.patch 851 BLAKE2B e6b52ff636161b11d8c0312bda3ede134af502e4c648fae05dd9f9cf16fa7ee4db494aa34877012621791d14a104e1e7e72bc769ebc75b02828c32e67224eedb SHA512 8c0bfe9cf9b8ef0027d1f8873e8ecdceb5ac6507d0fcc825b0210f6c93c39b4af005373c43e170515d42d00fe9689f78e67e0395293c4c667efdca50c213866c
 AUX 1.4.304.0-fix-build.patch 1318 BLAKE2B f707da432d894cb46271e55e2d0632b700907888ac08387d669bb1e1e5b2c75ecd409419e062ceabc2ba3483c89d3f6074ba7ec5c4254a629b5fadbdebc89b74 SHA512 154d89b5b67c624c576f6b21cbe40577b7b81e2eb6a9f76ce2f419864aad83628add012434bd94d32cf386e865881628f4b6dffa5608051462b6416b55e9b14e
 DIST SPIRV-Reflect-1.4.304.0.tar.gz 307488 BLAKE2B f2268287c6ca70dc8e51898b541bea51dad406715de0e3c8c9467c964f48085332d274ce3086824a6c13369f37c79467930d425ae958eecbaa1fb5cf1514243a SHA512 19eade2f661e3bd58665167265dc79e3c94690910d28089ac1d1acfb1771e010a75a23b85555dd494020d0e9584d68f2a97f33ab2f8271f90ea2295bcc484150
+DIST SPIRV-Reflect-1.4.309.0.tar.gz 326234 BLAKE2B 5d2d9dc3b6f3639259f089dbaf623c9358bf47e52c059a9acd6bff02691373acb5fdaaad7f752b0a6bce2a75ef1ade9407494b04835cf17617bfc592702e8c63 SHA512 d87ab91fd9b2ca6c86aaf72fd19332fb2d9eb7d5056480868ed79312fe111a3832099806d7a297fc82024683c8fe7ab96d7bec260f2828c111e535a85e288efb
 DIST gfxreconstruct-1.4.304.0.tar.gz 40390002 BLAKE2B 5e99d6685648617c8ef35a0f9199f5ef75aa8b670e0a4e2a75c8dae68620ab39ca7fcc9c3804b1f30f196d71b1b4aa061c9dc0532004dfec0598c25206868d41 SHA512 5a08e8565218119c980f6511dc9dc26660f5eb86307d47feeb220efb9ec817827b02d2da10da68b5beaf71f7ce2d56b381201d98be220229fa6a22a2b6560441
+DIST gfxreconstruct-1.4.309.0.tar.gz 40772524 BLAKE2B e03b78f73010a5bee790b516c9e30495dc8f3a8a94d48aecf6ffd6be1c831197295546cb5498dcba616caa46c22af9fd57681adcfd0f86624b36336e9b2c048a SHA512 e1b5ac67fc6c42cf1794e40bf4cc360eb9cbe3d2d6aee80671f66375df9f2ff88b7883b0aeb5038a92d4b73242540a9e0bff25819b805def51f8396f0ddb2cb8
 EBUILD gfxreconstruct-1.4.304.0.ebuild 1719 BLAKE2B c72bda0bc813f81b0a98335588192e0f7e0806e9dc0363b29a02f2ddd10e92f261dc79f85f53ca8cba83cacf01590013a17c1a3d2d982b55334916a403cec735 SHA512 4b5bfa9bc0aed6aae9c3490c0ae978117f99cbf8bd2b4b0b1fcc43b12470a5be6fcecd983f95134a3c9adc8f999f826c5356327e53cd203e88819164f6ec4aa9
+EBUILD gfxreconstruct-1.4.309.0.ebuild 1677 BLAKE2B dd9337df7f5ea5e94c16e761edd331e828bed8e859988c48fa23e345d027a0abeabd1fe300ecdae6ca9f2a334b220f73aa0ca30a28889c65ec8225a21e652005 SHA512 1eecc5958c447ebb1d83dbe6af7ab7c86426011c8a556c2c4b68a4cc8b10904ffb9384b1d1dc6704f032a391daa544c7d72ffd9659979173953e261d81d3e31e
 EBUILD gfxreconstruct-9999.ebuild 1719 BLAKE2B c72bda0bc813f81b0a98335588192e0f7e0806e9dc0363b29a02f2ddd10e92f261dc79f85f53ca8cba83cacf01590013a17c1a3d2d982b55334916a403cec735 SHA512 4b5bfa9bc0aed6aae9c3490c0ae978117f99cbf8bd2b4b0b1fcc43b12470a5be6fcecd983f95134a3c9adc8f999f826c5356327e53cd203e88819164f6ec4aa9
 MISC metadata.xml 335 BLAKE2B 702d4e895866c7e256651f3937f8f0b9fbdd56d79a5729c2b17a38c1d0d17202340bcc314e49867ee88c5d6a002a87c8b120f061705417d919990645564e160a SHA512 d70d1ead0c5991e3a344d84f7f4ff771cc590070aef3b8aa1ce96427c6572944359c2c7c4d93b72114b6524e3d13e4254db308f86621f8ef13b816325dbf841f
diff --git a/dev-debug/gfxreconstruct/gfxreconstruct-1.4.309.0.ebuild b/dev-debug/gfxreconstruct/gfxreconstruct-1.4.309.0.ebuild
new file mode 100644
index 000000000000..89faea5c0da3
--- /dev/null
+++ b/dev-debug/gfxreconstruct/gfxreconstruct-1.4.309.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/LunarG/gfxreconstruct.git"
+	EGIT_SUBMODULES=( external/{Vulkan-Headers,SPIRV-Headers,SPIRV-Reflect} )
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/LunarG/${PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/KhronosGroup/SPIRV-Reflect/archive/vulkan-sdk-${PV}.tar.gz -> SPIRV-Reflect-${PV}.tar.gz
+	"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}"/${PN}-vulkan-sdk-${PV}
+fi
+
+DESCRIPTION="Graphics API Capture and Replay Tools"
+HOMEPAGE="https://github.com/LunarG/gfxreconstruct"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="wayland X"
+
+RDEPEND="
+	app-arch/lz4:=
+	app-arch/zstd:=
+	sys-libs/zlib:=
+
+	media-libs/vulkan-loader[wayland?,X?]
+	wayland? ( dev-libs/wayland )
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/xcb-util-keysyms
+	)
+"
+DEPEND="${RDEPEND}
+	X? ( x11-libs/libXrandr )
+"
+if [[ ${PV} != 9999* ]]; then
+	DEPEND+="
+		~dev-util/spirv-headers-${PV}
+		~dev-util/vulkan-headers-${PV}
+	"
+	PATCHES=(
+		"${FILESDIR}"/1.3.296.0-use-system-vulkan.patch
+	)
+fi
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+		rmdir "${S}"/external/SPIRV-Reflect || die
+		mv "${WORKDIR}"/SPIRV-Reflect-vulkan-sdk-${PV} "${S}"/external/SPIRV-Reflect || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_WERROR=OFF
+		-DBUILD_WSI_DISPLAY_SUPPORT=ON
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+	)
+	cmake_src_configure
+}