gentoo auto-resync : 31:08:2024 - 12:01:05

13 files changed, 112 insertions, 24 deletions

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 04c3eda4f34b..2fe272bfd3a9 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -34,15 +34,15 @@ DIST qemu-8.2.6.tar.xz 132750000 BLAKE2B da5fdb03fcb44cf764d2ccaf9011b726e5c152d
 DIST qemu-9.0.0-docs.tar.xz 2290196 BLAKE2B 82d22637ff2629bee372550e86651f12051ea6b4a57e314ef83f290425d4973ef01827eaf28a85b635788f22cb7cc1c747438b7525c92c99b90b234fb8f7655c SHA512 7c0ba1f3e7bbaa4e3feebc33a1946a5c190f2c14b9ed78b15c1f642668c8124960f8c85bcf36fe54a10d4edef47d2256e500f06d9173b92b03c599811a15a073
 DIST qemu-9.0.1.tar.xz 132368412 BLAKE2B e96ae5cc3ee935dd31232d38d46bbdc74fd3a2a0dd8517c0e035757f3ded92712dfa68d0068cd8c37f314a92d237e2b4a725b509ba402b7a1ce92df63207a08d SHA512 6c120aaf52f15e79c32d883cc83df8fc83222d538ea6be9c19aaddfba0aef91479b5826bbc03e58688fba639cb24bc6f54e525ccc2404ed5d820766d11735210
 DIST qemu-9.0.2.tar.xz 132387528 BLAKE2B 6b5301f985919ae53e056410be7486b8150a65016127568bd4d58f596e94960d08eb3fc57cff7ff6a3435d71274adee516f57375d856d61b4fc7a3f24cbf75c4 SHA512 58ed84f6fe6263d279356bc9193f96edf62cf3663fb151daa3f047d52329fe49cb91c2d45e09697e0469f4f5409be96403aec9572d4871ffa40848a786c21599
-EBUILD qemu-7.2.11.ebuild 27452 BLAKE2B 9f37430e0de665f367f45cdce0330a5b50a4cb651334d3705ba3e39025046ab32592726b1473a29955ef68590acbde524f9c0739d252d3e9584f08b9a567494c SHA512 3b0e445b7224d9d23b5bb9b2f53cbfc3a9076850e315f41b07b6444b27d050a2f258e1af462a998ceea67eefed9524bb57d69757ac7be336f06ddd6ea642d99d
-EBUILD qemu-7.2.12.ebuild 27456 BLAKE2B aaad1a9bcfa95ce6dae0dc81b5d2de99e8a3805fb9df5b2ba6ef6e86e5633442fd0d8c1f5162819fe0f80392a23898eed33568040f01ff4ae94fb67f5f4dbc89 SHA512 02f3ad7b3840f9bd75efde555169fbb8bbcfa958b1316fa8169f027d6325834566fbf05806e23855195694ae8686ae1adfbf8bbaeb246b54006c355582594f5d
-EBUILD qemu-7.2.13.ebuild 27456 BLAKE2B aaad1a9bcfa95ce6dae0dc81b5d2de99e8a3805fb9df5b2ba6ef6e86e5633442fd0d8c1f5162819fe0f80392a23898eed33568040f01ff4ae94fb67f5f4dbc89 SHA512 02f3ad7b3840f9bd75efde555169fbb8bbcfa958b1316fa8169f027d6325834566fbf05806e23855195694ae8686ae1adfbf8bbaeb246b54006c355582594f5d
-EBUILD qemu-8.0.5.ebuild 27478 BLAKE2B 31948c0d4905f5a81b576ef39d426d1716fb6fd2bedcce0b5c31455d9d2ca082381a799eab0bbd658045d2ebbc85eaed054dec24a4fb94178fef4f4ddb0d9b6c SHA512 5bb8276c53412d277d4ff17cf70ff5cf5679db8c6c51c67d68d953fa944b5087528f8cea325ce9e3d2be410851718f76f27b31415d5aaa56eef3b2c4abac5901
-EBUILD qemu-8.1.5.ebuild 27401 BLAKE2B 1d3442b07c850a275cee38bf8d3651c91fcde30498922f7e95886d427d85e42d78119e5953410d46ea5746e725f46e630211bc37d485e0cf26eca6d32253af40 SHA512 7323757a44c98b5c99dcd6110ad236be2e50585fbc02acb9e4c1ed233fe385a6f6b92f24514c3064543511ef9f63a96c6b52d83eade7e12e9a5024c3c46d64c3
-EBUILD qemu-8.2.3.ebuild 27906 BLAKE2B 67dd19fc597d5d6afe779edc2846dba758d85296b6e787ab920ca8f6e5f03399ae962c337bbaa9d8322fe61f8199f74ad4136df26648cc7885ba918b2ab9341f SHA512 4a39d66c089e7b6135950bb631d07be02e62487282ceabe5680bd329ff6bf78e8693248595e74c177228f37cbd4867b6cea3b558ce94da29969182f7836ccf95
-EBUILD qemu-8.2.5.ebuild 27910 BLAKE2B 7fb78cf6a72e19f28af863aa0502fa964e90881997f64bbd4ac43fd3a2022f1f7daeb47117047230e9b1bbf3bae41b8fd43fa0a7a58599a0516c97bb64fea6fd SHA512 15cb3186c34cf9b328f62685c471af897e0b9fa40794fcf6db91becc0d35d2e9279bd1e76d68a61f956e68fba7290058e82ccd05821378ee39568b4a53f9bf37
-EBUILD qemu-8.2.6.ebuild 27910 BLAKE2B 7fb78cf6a72e19f28af863aa0502fa964e90881997f64bbd4ac43fd3a2022f1f7daeb47117047230e9b1bbf3bae41b8fd43fa0a7a58599a0516c97bb64fea6fd SHA512 15cb3186c34cf9b328f62685c471af897e0b9fa40794fcf6db91becc0d35d2e9279bd1e76d68a61f956e68fba7290058e82ccd05821378ee39568b4a53f9bf37
-EBUILD qemu-9.0.1.ebuild 28049 BLAKE2B 274acedae91713834b13ba06ee2c39a2035ed278f3b11b5f95dd0915a6c1a63ed85eb17a810a4fc5b35771bbc3635b5130edf4488e6fea8f494e2f0c11f5c910 SHA512 80970b6ba671ecc2b8c772fd5ff72de176b7ac92ab05c1ebc3e54b9d210168efb949df58ddc5627fa1f197291d67ccf0ed652e400eb352316c495f04ecbfe765
-EBUILD qemu-9.0.2.ebuild 28049 BLAKE2B 274acedae91713834b13ba06ee2c39a2035ed278f3b11b5f95dd0915a6c1a63ed85eb17a810a4fc5b35771bbc3635b5130edf4488e6fea8f494e2f0c11f5c910 SHA512 80970b6ba671ecc2b8c772fd5ff72de176b7ac92ab05c1ebc3e54b9d210168efb949df58ddc5627fa1f197291d67ccf0ed652e400eb352316c495f04ecbfe765
-EBUILD qemu-9999.ebuild 28040 BLAKE2B 8b434c889b45b169e3d0498239b69be05e554b506c2e62e1e0c4a2b23d13dac49f555d43daf4d7b0e708b5f6e4f984d21ee6f1e3841752cafdc6e6f7838583b9 SHA512 172e62e67424a237f74aafca79dbde1701a6e1ddf1aaf83df42a73e7f661ee7bd83f6690dccaae48b4ca9d8c0619abeb6a37661428acbe01dac71ee0143e968a
-MISC metadata.xml 4410 BLAKE2B 8991a6fb819fb1621ad78ee9d32568dddc7ed2e4876ac5d6ebc6cde9eeb7badb6d0549b72afe8373118bf9dea0cba457bc4cfe65f49040bdcb272a5734eb47fe SHA512 f2a4c53da7f9b3443a76439d31cadccfb026c74226c5c4654d9f50ec19e71e4939d6685fae44fd28e194881ba11ad42215cea7b48963a31a1e0ecf427e826b9e
+EBUILD qemu-7.2.11.ebuild 27666 BLAKE2B fa22a7774b16fe27564fb59d0c1f6a8f5c3bc27638a9c22b2948b1eadd7d304e49e8ec591adb80585bee4b7be13cedd6b7d640867baab3e7f66feecc4474c34d SHA512 6053f5b168a181822a09e1781d0c556e9a3349d5a8bfd610e7fc8f29c3525145ee58fe035ed6e8213f54c11d3201f04e7d567c47071d3980e2ff25f60047a877
+EBUILD qemu-7.2.12.ebuild 27670 BLAKE2B 4b593ae62c806b3332b70ed8b3c87ddb9cc73aadd02b6f970a3862422e2fa395a0defbe68c2d76146b5d2b34559ddeccd4e6ca594844443643f8d59ae94913b3 SHA512 3cea6120791d5e80628ad2fc33d2e28f91a3d7df0de89d3331eb3da060171de4ea4efed3e6499b96ea476ac469b3e9b38f9256b574398fa51eaa1430a3949c96
+EBUILD qemu-7.2.13.ebuild 27670 BLAKE2B 4b593ae62c806b3332b70ed8b3c87ddb9cc73aadd02b6f970a3862422e2fa395a0defbe68c2d76146b5d2b34559ddeccd4e6ca594844443643f8d59ae94913b3 SHA512 3cea6120791d5e80628ad2fc33d2e28f91a3d7df0de89d3331eb3da060171de4ea4efed3e6499b96ea476ac469b3e9b38f9256b574398fa51eaa1430a3949c96
+EBUILD qemu-8.0.5.ebuild 27692 BLAKE2B 8d698245cb2087d9648b9d5774613e08b7240bc8e329728a357ece91dbb3adba35b6418ed85a37d782c843cdb0838be9e96aec933a459a4562d54313a6c2b8d6 SHA512 532ed635e9dc7a6b32df62202fdea5a0fddec0073aff4a3d60be1a454caa9810dc0b3d6eed7e04d7641096b3f6f269094695e44127f959c72ef6a835dd453780
+EBUILD qemu-8.1.5.ebuild 27615 BLAKE2B 9c0d72d8d49fb3a7275fcd4d28b4c4d11fd0b4b2791d1150720c69b35ea9c6a3e8921dc70a5439c8eda9a3b556570ddcb039f5281fdd0f0f4652491e0a324e6c SHA512 184d3c7d9d35721cfce6e82d4a21686bd1708802843dd7ffe93336b8c1f976f8886ef6929cb84b8abbcb49389d5925a899a96309f688546de61b29203519a272
+EBUILD qemu-8.2.3.ebuild 28120 BLAKE2B e96a47b6347b1624e18ddfc5f3aa205f6830c637b8adeb6c90198007551046b7aa86b8e7785ba86875dfbc62839d35373265e1af14ab3e9aa5c4129e40aac39d SHA512 27c98a5beece38f71a6754e33d0ad6cd1ad8390ab83ce4d2e529174aec0ad74697380c6754fe9653838a2b80fd872b6c78d40736842ed427a2eb82ed9b386d3d
+EBUILD qemu-8.2.5.ebuild 28124 BLAKE2B 3aab1924b4a90699c2e832f3352b9d3b36c99cfceb73a5457adea09bd6a3dd27f7b334cd0ff0f90b7fc86cc62bdb97145cd3f53e9ee159deff62548f5f21b165 SHA512 1db4d29d3a4d51d78808a86900a876db2f6dad8d9678e8520de581825b6e511e453b79179205c8fd41f1c4d1d7e002dbe5bc935853c542322e8417d735301a8e
+EBUILD qemu-8.2.6.ebuild 28124 BLAKE2B 3aab1924b4a90699c2e832f3352b9d3b36c99cfceb73a5457adea09bd6a3dd27f7b334cd0ff0f90b7fc86cc62bdb97145cd3f53e9ee159deff62548f5f21b165 SHA512 1db4d29d3a4d51d78808a86900a876db2f6dad8d9678e8520de581825b6e511e453b79179205c8fd41f1c4d1d7e002dbe5bc935853c542322e8417d735301a8e
+EBUILD qemu-9.0.1.ebuild 28263 BLAKE2B fe6bd92ad624e8eb41b4d3c7cc9def1332151d9fd268373025e75d653009bb0ea52ad734947fa801cefa7df4ec250a803ba1f79f441895984af4597ba4a86730 SHA512 0cd8b8055c697f15a8b9f0574a40028cbe7233f57154d949e6786deb96c4514d2038e914d9189981baaa699feb130d7f9a82fd083da2f3da87d3fff215ef8c93
+EBUILD qemu-9.0.2.ebuild 28263 BLAKE2B fe6bd92ad624e8eb41b4d3c7cc9def1332151d9fd268373025e75d653009bb0ea52ad734947fa801cefa7df4ec250a803ba1f79f441895984af4597ba4a86730 SHA512 0cd8b8055c697f15a8b9f0574a40028cbe7233f57154d949e6786deb96c4514d2038e914d9189981baaa699feb130d7f9a82fd083da2f3da87d3fff215ef8c93
+EBUILD qemu-9999.ebuild 28254 BLAKE2B af6e366dcb333a34e2984ceca5c394fa297068329d53dde710116b31741634bdaf7ba030ee8df1b311daa37d22c344bd3db40af66a30fed8a2fd471e1e0b6c18 SHA512 434de7e6854c69aa3d6262c5e2e8ab76b8b41af48a35c589922b1c139d7614391e30e14ba389fa5ecf40d682fb2e4720bc6fda7f6df44c4ac147c63aefc1eb61
+MISC metadata.xml 4410 BLAKE2B 143914bd1894e1521d84cc012d20064b3a35c4bccf4b9fc973cbb5435e408e89177e6f15386fedc6c53b088536ba36af701084de44d32f24a78e701a757d2afe SHA512 8bfaa01e837eb32f3f622be1cf1d857cd85373b8f3e6aac226bc09902bdecc7bf38d43fb09a9bc855666ecb3fc2d73d256ee25369ec71b8861c90f7bce70949a
diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml
index adb556795249..6ebf4f397db5 100644
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@@ -47,7 +47,7 @@
 		<flag name="ssh">Enable SSH based block device support via <pkg>net-libs/libssh2</pkg></flag>
 		<flag name="static-user">Build the User targets as static binaries</flag>
 		<flag name="static">Build the User and Software MMU (system) targets as well as tools as static binaries</flag>
-		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
+		<flag name="systemtap">Enable SystemTap/DTrace tracing</flag>
 		<flag name="jemalloc">Enable jemalloc allocator support</flag>
 		<flag name="jpeg">Enable jpeg image support for the VNC console server</flag>
 		<flag name="png">Enable png image support for the VNC console server</flag>
diff --git a/app-emulation/qemu/qemu-7.2.11.ebuild b/app-emulation/qemu/qemu-7.2.11.ebuild
index e59ab048ded1..5a9af9426352 100644
--- a/app-emulation/qemu/qemu-7.2.11.ebuild
+++ b/app-emulation/qemu/qemu-7.2.11.ebuild
@@ -451,6 +451,14 @@ src_prepare() {
 	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
 	export WINDRES=${CHOST}-windres
 
+	# Workaround for bug #938302
+	if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
+		cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+	fi
+
 	# Verbose builds
 	MAKEOPTS+=" V=1"
 
@@ -660,7 +668,7 @@ qemu_src_configure() {
 	local targets="${buildtype}_targets"
 	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
 
-	# Add support for SystemTAP
+	# Add support for SystemTap
 	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
 
 	# We always want to attempt to build with PIE support as it results
diff --git a/app-emulation/qemu/qemu-7.2.12.ebuild b/app-emulation/qemu/qemu-7.2.12.ebuild
index ac517632fb22..d9dab196a8bb 100644
--- a/app-emulation/qemu/qemu-7.2.12.ebuild
+++ b/app-emulation/qemu/qemu-7.2.12.ebuild
@@ -451,6 +451,14 @@ src_prepare() {
 	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
 	export WINDRES=${CHOST}-windres
 
+	# Workaround for bug #938302
+	if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
+		cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+	fi
+
 	# Verbose builds
 	MAKEOPTS+=" V=1"
 
@@ -660,7 +668,7 @@ qemu_src_configure() {
 	local targets="${buildtype}_targets"
 	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
 
-	# Add support for SystemTAP
+	# Add support for SystemTap
 	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
 
 	# We always want to attempt to build with PIE support as it results
diff --git a/app-emulation/qemu/qemu-7.2.13.ebuild b/app-emulation/qemu/qemu-7.2.13.ebuild
index ac517632fb22..d9dab196a8bb 100644
--- a/app-emulation/qemu/qemu-7.2.13.ebuild
+++ b/app-emulation/qemu/qemu-7.2.13.ebuild
@@ -451,6 +451,14 @@ src_prepare() {
 	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
 	export WINDRES=${CHOST}-windres
 
+	# Workaround for bug #938302
+	if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
+		cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+	fi
+
 	# Verbose builds
 	MAKEOPTS+=" V=1"
 
@@ -660,7 +668,7 @@ qemu_src_configure() {
 	local targets="${buildtype}_targets"
 	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
 
-	# Add support for SystemTAP
+	# Add support for SystemTap
 	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
 
 	# We always want to attempt to build with PIE support as it results
diff --git a/app-emulation/qemu/qemu-8.0.5.ebuild b/app-emulation/qemu/qemu-8.0.5.ebuild
index 32cb18d7115d..d1a99943c1f8 100644
--- a/app-emulation/qemu/qemu-8.0.5.ebuild
+++ b/app-emulation/qemu/qemu-8.0.5.ebuild
@@ -454,6 +454,14 @@ src_prepare() {
 	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
 	export WINDRES=${CHOST}-windres
 
+	# Workaround for bug #938302
+	if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
+		cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+	fi
+
 	# Verbose builds
 	MAKEOPTS+=" V=1"
 
@@ -661,7 +669,7 @@ qemu_src_configure() {
 	local targets="${buildtype}_targets"
 	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
 
-	# Add support for SystemTAP
+	# Add support for SystemTap
 	use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
 
 	# We always want to attempt to build with PIE support as it results
diff --git a/app-emulation/qemu/qemu-8.1.5.ebuild b/app-emulation/qemu/qemu-8.1.5.ebuild
index 05d55122f855..f25b0b58db19 100644
--- a/app-emulation/qemu/qemu-8.1.5.ebuild
+++ b/app-emulation/qemu/qemu-8.1.5.ebuild
@@ -455,6 +455,14 @@ src_prepare() {
 	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
 	export WINDRES=${CHOST}-windres
 
+	# Workaround for bug #938302
+	if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
+		cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+	fi
+
 	# Verbose builds
 	MAKEOPTS+=" V=1"
 
@@ -661,7 +669,7 @@ qemu_src_configure() {
 	local targets="${buildtype}_targets"
 	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
 
-	# Add support for SystemTAP
+	# Add support for SystemTap
 	use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
 
 	# We always want to attempt to build with PIE support as it results
diff --git a/app-emulation/qemu/qemu-8.2.3.ebuild b/app-emulation/qemu/qemu-8.2.3.ebuild
index 1c6bab186548..cd2bb3a7f555 100644
--- a/app-emulation/qemu/qemu-8.2.3.ebuild
+++ b/app-emulation/qemu/qemu-8.2.3.ebuild
@@ -475,6 +475,14 @@ src_prepare() {
 	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
 	export WINDRES=${CHOST}-windres
 
+	# Workaround for bug #938302
+	if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
+		cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+	fi
+
 	# Verbose builds
 	MAKEOPTS+=" V=1"
 
@@ -681,7 +689,7 @@ qemu_src_configure() {
 	local targets="${buildtype}_targets"
 	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
 
-	# Add support for SystemTAP
+	# Add support for SystemTap
 	use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
 
 	# We always want to attempt to build with PIE support as it results
diff --git a/app-emulation/qemu/qemu-8.2.5.ebuild b/app-emulation/qemu/qemu-8.2.5.ebuild
index b62207759882..fa173f859c86 100644
--- a/app-emulation/qemu/qemu-8.2.5.ebuild
+++ b/app-emulation/qemu/qemu-8.2.5.ebuild
@@ -475,6 +475,14 @@ src_prepare() {
 	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
 	export WINDRES=${CHOST}-windres
 
+	# Workaround for bug #938302
+	if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
+		cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+	fi
+
 	# Verbose builds
 	MAKEOPTS+=" V=1"
 
@@ -681,7 +689,7 @@ qemu_src_configure() {
 	local targets="${buildtype}_targets"
 	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
 
-	# Add support for SystemTAP
+	# Add support for SystemTap
 	use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
 
 	# We always want to attempt to build with PIE support as it results
diff --git a/app-emulation/qemu/qemu-8.2.6.ebuild b/app-emulation/qemu/qemu-8.2.6.ebuild
index b62207759882..fa173f859c86 100644
--- a/app-emulation/qemu/qemu-8.2.6.ebuild
+++ b/app-emulation/qemu/qemu-8.2.6.ebuild
@@ -475,6 +475,14 @@ src_prepare() {
 	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
 	export WINDRES=${CHOST}-windres
 
+	# Workaround for bug #938302
+	if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
+		cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+	fi
+
 	# Verbose builds
 	MAKEOPTS+=" V=1"
 
@@ -681,7 +689,7 @@ qemu_src_configure() {
 	local targets="${buildtype}_targets"
 	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
 
-	# Add support for SystemTAP
+	# Add support for SystemTap
 	use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
 
 	# We always want to attempt to build with PIE support as it results
diff --git a/app-emulation/qemu/qemu-9.0.1.ebuild b/app-emulation/qemu/qemu-9.0.1.ebuild
index 6d9b868ae64c..fe1feb38bc89 100644
--- a/app-emulation/qemu/qemu-9.0.1.ebuild
+++ b/app-emulation/qemu/qemu-9.0.1.ebuild
@@ -479,6 +479,14 @@ src_prepare() {
 	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
 	export WINDRES=${CHOST}-windres
 
+	# Workaround for bug #938302
+	if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
+		cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+	fi
+
 	# Verbose builds
 	MAKEOPTS+=" V=1"
 
@@ -685,7 +693,7 @@ qemu_src_configure() {
 	local targets="${buildtype}_targets"
 	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
 
-	# Add support for SystemTAP
+	# Add support for SystemTap
 	use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
 
 	# We always want to attempt to build with PIE support as it results
diff --git a/app-emulation/qemu/qemu-9.0.2.ebuild b/app-emulation/qemu/qemu-9.0.2.ebuild
index 6d9b868ae64c..fe1feb38bc89 100644
--- a/app-emulation/qemu/qemu-9.0.2.ebuild
+++ b/app-emulation/qemu/qemu-9.0.2.ebuild
@@ -479,6 +479,14 @@ src_prepare() {
 	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
 	export WINDRES=${CHOST}-windres
 
+	# Workaround for bug #938302
+	if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
+		cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+	fi
+
 	# Verbose builds
 	MAKEOPTS+=" V=1"
 
@@ -685,7 +693,7 @@ qemu_src_configure() {
 	local targets="${buildtype}_targets"
 	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
 
-	# Add support for SystemTAP
+	# Add support for SystemTap
 	use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
 
 	# We always want to attempt to build with PIE support as it results
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 02a65ccd518a..3811b8699f12 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -478,6 +478,14 @@ src_prepare() {
 	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS
 	export WINDRES=${CHOST}-windres
 
+	# Workaround for bug #938302
+	if use systemtap && ! has_version "dev-debug/systemtap[dtrace-symlink(-)]" ; then
+		cat >> "${S}"/configs/meson/linux.txt <<-EOF || die
+		[binaries]
+		dtrace='stap-dtrace'
+		EOF
+	fi
+
 	# Verbose builds
 	MAKEOPTS+=" V=1"
 
@@ -684,7 +692,7 @@ qemu_src_configure() {
 	local targets="${buildtype}_targets"
 	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
 
-	# Add support for SystemTAP
+	# Add support for SystemTap
 	use systemtap && conf_opts+=( --enable-trace-backends="dtrace" )
 
 	# We always want to attempt to build with PIE support as it results