gentoo auto-resync : 19:08:2024 - 12:25:21

3 files changed, 18 insertions, 3 deletions

diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 09c3f5ec16a8..84a686d3e5a1 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -10,6 +10,7 @@ AUX virtualbox-6.1.36-fcf-protection.patch 374 BLAKE2B 6c7410ce1fa78aa7476c9b9a6
 AUX virtualbox-6.1.44-fix-libxml2.patch 1115 BLAKE2B bdcbd6ef7e4812065ad1aa47c3acbff5c402a21af7ece4c3e3ca1867248eff3f16e0d98d8c70c3306d900f285de077ee7f48d744b40df7e2f3566517ebdd6150 SHA512 fe3ee1671dbcacd71c0cdc9f2179dcb0a05121ded8e7f6a1acfea07b5e951d4d2701377c57ae638148e09cc224893f0efdb2f760cd9ccbdf7f3415d9ff563711
 AUX virtualbox-7.0.14-libxml2-2.12.patch 1764 BLAKE2B e61bc333f69095eb3341af2f7c94b20dee7c7802077bb7dab8ed29f67ada3738e82bae40645f892eb68291886722c0f4260ac025fbee5380b4215d47f1c4b0af SHA512 d461ee61eb3c4fcff079033e5bb5a7181a627cb295927f2b302120043c16b21c962edb360e79787eaa543833c07b2d5dc1119bcc210a346dafe4cc3104f9d77c
 AUX virtualbox-7.0.8-disable-rebuild-iPxeBiosBin.patch 843 BLAKE2B bd7fef7afc725a247e9c84999786c27398ee9bdc4dd6f62f153202ab2f281ca8fb8445aa369aa1270a00acc6ba7f709f4d7923eea1acf02779827ba9ae2c2fa9 SHA512 d79b5be03417fbbf90634da5c63ac8975a950f559e42ed97a556edce28ada4d592b1807e89145e58caea1648486916bf0b7bf96e0843bad1cc3cace9048a3a4b
+AUX virtualbox-7.1.0_beta1-link-with-mold.patch 520 BLAKE2B 5db268cb6ac344320255a4023fa26285930260031d0733954f841aac52baefec504a29f02b8f95cb32da7b4482cb7e3cd1b6cc8f9e920dea1850ef65dfd81aa2 SHA512 80ec8c1370d70b22bb06971e5b77759cbaac23356c98710ad84bbdfdde111c6eedbdc750e8edbd8566d203a72055bb392de8e5ea83f182fdb5e81923eaf48836
 AUX virtualbox-ose-6-wrapper 3578 BLAKE2B c150e578212435268de3c5fb0eea701bc843ec2241dc3839d3d1e33604fc01f6bdff6ed0425ba6917072f652b8c29d0df9a550a92900ca13306fcd36521afbee SHA512 315d981f3e92f2e0134946f6bbb8ad4ea4228afb8f73aaed7feead59b3f55cef01cec4285a7fdaf30ce0931d8b69bda4698baebd63d11f2cd9dfe9d0591a0f40
 AUX virtualbox-vboxusb_tmpfilesd 35 BLAKE2B 56937e236a0e4d1a2aa085271e8ae0af9553fdf7c3b804af4d3fda3aa8dbc32d63762fee90bc949390cb9cd67f2f0111894c8af084731dab6920ae1675c69a64 SHA512 72e4602f5f214f8833486f5c787c263a10390e8bdf65b5615d67c35ec44048f02add12fe43b19f9c57a9d2f12d768c52e54fcfb9052c0611d06cc988a698c171
 DIST VirtualBox-6.1.50.tar.bz2 165959648 BLAKE2B e244c4fa2ffe86216664104473e27e8ddbad86aae3bc26612d18204a4e67cece91d1fa3aa9e70f1c39f915bf5e4a1e6a14bbb19162c3ae2ff554373df95bce51 SHA512 ee2ec352e020f07262bf2120278d0d9807c501cd7c4d621d4e12ce18a821b134d48eb852bc7136008cfa77ed709703d3c2835b7a7177c325d989e8f433aff73f
@@ -25,6 +26,6 @@ DIST virtualbox-patches-7.1.0_beta1.tar.bz2 5287 BLAKE2B 5286b5ad2a8c54150f58e26
 EBUILD virtualbox-6.1.50-r3.ebuild 18929 BLAKE2B 5361667320ccdc5534959f12f40665f7a8a19e8b09b0b172c3537bb0d93a7bb0117dc35114e27e7a6de35eefb0811aaf94c54568b32cd1dcc62524ec22d7b393 SHA512 54719ef39276acff779d399ed744d5aef88e6275dce7d06cec9fc611335d243b8dd1b817aea56fa5b93b96345f7b19dccdf8facdfc49e58d42524f9050ba7776
 EBUILD virtualbox-7.0.18-r1.ebuild 20842 BLAKE2B ecbe8b10b4f87550cdd04b878009b5443d859f141b5b214cab7cb53c693ee00470e89140f6ee2c66a24435ceba7484ded028a9594b8a7a7594cd00cd59a4ca74 SHA512 9fc697f31fab0ffbea2ac94fe031400ce544d93069a720fc3871452d8074e97fd4a075603732ca1bb5441ddfccf95664f3b5f5ff44b2dd3be4554129121918ba
 EBUILD virtualbox-7.0.20.ebuild 20843 BLAKE2B 9f08caededc08435490435ac6c68612d760b0794c167fdba090304cf980e3847da1590ce8e9a45ad1edbe71414e4df2d4d6ca428f8f1d37b90693dee19878589 SHA512 55854fc05217d9ca1f3b0f1bff9d15175e75f79b76a16de8917ea0108b5b27b4937546199472893d64797fd780353216918a71e3b8344cc5f477bb55024a71af
-EBUILD virtualbox-7.1.0_beta1.ebuild 20716 BLAKE2B 3c92162657a9273289a1fe2ed181551103c00c68eed50fe448376a97c48f13157b26fd859d55789a81eef1d28aeca1bbc4aabf8f3a324d29bcc08137845f0972 SHA512 86d9ff819c8a92b89c16fe273865d8dc300c63571d2eda4e4fb50f02d1cadc9fef5c9e8cc832e81930c3548261329082a4cfcf98d55e81c976df49c4f7d22d3f
+EBUILD virtualbox-7.1.0_beta1.ebuild 20783 BLAKE2B 4488ba6daf65fead8c7429c0ec53421579b091de6bad80185f436bf3dd047173831af75d8c52e812831181dc511fe9e4bd976fee3e11af7af6e076819772d10f SHA512 3ca587537a43bbee0f63842af3a298f05e79a43d0b2b6f7ddfa1d02b8090d5ae2720359223238651475a70d6a819386c5e9a24fa6318c7602a3887dbaa866a21
 EBUILD virtualbox-9999.ebuild 21614 BLAKE2B 5a249ee2161ae3df7004764eaab6958fd431925a6328ae411b45f489395b2d13056c3df100b5e85506e14850378a38a0bb2c93f45a887eb1a15b5f0c4f252b4e SHA512 0651bf7b369e0b97b0181564a928d1bf7efab2fec6b161cbbebc1fad4129e9223fd55e6016a6c4aaf9ac57709143dd2f73ce80f05d394c6d283ce8f3f57b21ae
 MISC metadata.xml 948 BLAKE2B c074e494d9affda91addd2355f8e71616602102b4cc151d2b45efd04754f1f92621ecd313dbe3baa44c3301f57b61e9cff780d445c2ea3d19ce3d9c8ae05213a SHA512 5338812da9334aedf08dd7a31a4a07c7bfa8232e8f0de6af9de9ac0f5585397cea16e66cb73d56632efa4cf21386782108182d803de6ff45c08082a13dc5fed9
diff --git a/app-emulation/virtualbox/files/virtualbox-7.1.0_beta1-link-with-mold.patch b/app-emulation/virtualbox/files/virtualbox-7.1.0_beta1-link-with-mold.patch
new file mode 100644
index 000000000000..71e3edb26b3c
--- /dev/null
+++ b/app-emulation/virtualbox/files/virtualbox-7.1.0_beta1-link-with-mold.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/925347
+
+--- a/src/VBox/Frontends/VirtualBox/Makefile.kmk
++++ b/src/VBox/Frontends/VirtualBox/Makefile.kmk
+@@ -1669,7 +1669,7 @@
+ # The Qt modules we're using.
+ # (The include directory and lib/framework for each module will be added by the Qt unit.)
+ #
+-UICommon_QT_MODULES = Core Gui Widgets Help StateMachine
++UICommon_QT_MODULES = Core Gui Widgets Help PrintSupport StateMachine
+ ifdef VBOX_WITH_SCREENSAVER_CONTROL
+  UICommon_QT_MODULES.linux    += DBus
+  UICommon_QT_MODULES.linux    += Xml
diff --git a/app-emulation/virtualbox/virtualbox-7.1.0_beta1.ebuild b/app-emulation/virtualbox/virtualbox-7.1.0_beta1.ebuild
index cc9921a521ed..40cc4cfebb03 100644
--- a/app-emulation/virtualbox/virtualbox-7.1.0_beta1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-7.1.0_beta1.ebuild
@@ -195,6 +195,7 @@ REQUIRED_USE="
 PATCHES=(
 	# Downloaded patchset
 	"${WORKDIR}"/virtualbox-patches-7.1.0_beta1/patches
+	"${FILESDIR}"/${P}-link-with-mold.patch
 )
 
 DOCS=()	# Don't install the default README file during einstalldocs
@@ -251,8 +252,8 @@ src_prepare() {
 			>> LocalConfig.kmk || die
 	fi
 
-	# bug #916002, #488176
-	tc-ld-force-bfd
+	# bug #916002, #488176, #925347
+	tc-ld-is-mold || tc-ld-force-bfd
 
 	# Respect LDFLAGS
 	sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \