gentoo auto-resync : 20:01:2024 - 02:08:45

6 files changed, 44 insertions, 8 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index dfc0719f0e6a..e80d3d85aa7c 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index 25191f8f48ad..42f63c167059 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -5,8 +5,8 @@ AUX qtbase-6.6.1-CVE-2023-51714.patch 2168 BLAKE2B dd30b68aea17c3a2d4d57327226cb
 AUX qtbase-6.6.1-forkfd-childstack-size.patch 861 BLAKE2B c5b1f471cf91150b6d6a643994284e95721f0739284680ba3e2d5d2332b3e0544c85f6dfb7129fccc3ed3beae24d7d3c919357d160bc9d5004426c68e8fa6321 SHA512 8c619b24cd9b7dd72ee975a66d6919718a0594eaeb0907454a9a9fd68a259db345f685aa9c87cf0c0c27b4194f621306a6f00f20dce95482bce7efe55fae00d6
 DIST qtbase-6.6.1-QTBUG-116905.patch.xz 7132 BLAKE2B 5ad6108f3d278c7014a124733a7e0151d79ab9b82256948c09f2d7d93494020131ec52bae0a0c9ae1959afe724bc033805b28f12676b018dce7d04668d8dec01 SHA512 61c13a96b19bd9c06056681101c2c9d301a5d014c4a155b82ba9b7bce2ba0e715041cd6c3e8e45c9ec3d52c3b77bcf3145fbbf502a72ffbaac02f4eb6b82c912
 DIST qtbase-everywhere-src-6.6.1.tar.xz 48370760 BLAKE2B 2dd551d15eef30c7d9a5f4c406143d6f8908d7ebade9daf9fbd3d82a25765425956f2cb8689c50f87f6477de2150eee7b820ef25bb4355c51e7e7fad3ef73005 SHA512 93e77b9b077a3acd5607b643db282fdd7ed0bdfa07df74c3f0d2285afeb1672a6fa229a7e7a6c8a462701305fc22ffef20c212d906484e50fb5cdb706a7b72e1
-EBUILD qtbase-6.6.1-r3.ebuild 9949 BLAKE2B 29a58030f9a02b0c3780bd370f018f99badaf1eeacb7b4da193258ee14be0fe011bca80a05da86ad82ada1527da935861c324bae5494a3f796c05c858020dcc8 SHA512 e7f1fdcc6bdef7b3bf3b9efd295fe53d3c1f17af5d6f12dc127a01f4a88845689f449412bc7902a96c2f7991d652f8ce7250ccbda0f924485f5b5e1075e83610
-EBUILD qtbase-6.6.9999.ebuild 9766 BLAKE2B 85af4a3ab8b94d033eb61909c458f05f3c078850fc7a07bc6a3142b059f97b2906865ec34877d580cafd29cd4088c3f930d9b69dcb288f776fbe7afe5985c10c SHA512 3c98aaa86cb4d76643f7845ab7c53f0be523ef35550f0187984daf3b74438ea0404aaa0e25988c29b704c345715d1ca13df0d610494bd1ae7762396a5f92dce4
-EBUILD qtbase-6.7.9999.ebuild 9857 BLAKE2B 312b166bee415a580bcf0ef31e3ed72971dc0b57621db13c74411ac9277a25ce60974113c02fd34f17f8ad6cf8c2d00f79a283be5bf1aaaf059b3decdba34f96 SHA512 fd20e1500b90d7548ff1044097662ee7322d91ea9b3b62d58f1fd97b89e98ab2d257024d7af574cac605ef14b727255cc54e14b57104517cf04d760a24490728
-EBUILD qtbase-6.9999.ebuild 9857 BLAKE2B 312b166bee415a580bcf0ef31e3ed72971dc0b57621db13c74411ac9277a25ce60974113c02fd34f17f8ad6cf8c2d00f79a283be5bf1aaaf059b3decdba34f96 SHA512 fd20e1500b90d7548ff1044097662ee7322d91ea9b3b62d58f1fd97b89e98ab2d257024d7af574cac605ef14b727255cc54e14b57104517cf04d760a24490728
+EBUILD qtbase-6.6.1-r3.ebuild 10174 BLAKE2B 0d7b43106d8473b25bcf83a9f2aacf4ada81762a4b310e9cf5f8a92a621c577fb8ab8623ddcbb909975eb3b38dc665bc2a061a5d7566fdefcf2c08821529b47f SHA512 52166d9519873e299290bfcd4be4c27851f4e413194a477e850b4886995881cba8e0d3b82138bd03335e21bfd65fb5ecff897535707ecf2397c771e187f6c097
+EBUILD qtbase-6.6.9999.ebuild 9991 BLAKE2B 7306a9d90eeabbe5e259e5f20353b562d8117588a8045eda0f1d082dfc2f3bb521b653671dc749fc75ef2e1e9dac79e3bd34846824fc64e256e6132467beecfc SHA512 842a1f0188e58bcb47290fd82a0280ccb4edee2bb8bd2340d880ca5da508545da8bfbd9eb1a30c5b29a2d36e9f9df43fc3f34515e9c7f834c069bec897daa222
+EBUILD qtbase-6.7.9999.ebuild 10082 BLAKE2B 07c2196536f5ef4061f8b14a7251c419441e0ca6a8e627e4a07ee91676b4d8ea1bee4185381ed32818674cda7507b0512c2736a05412e3428e81b7ed692485cf SHA512 01b0f51afc08298239cc6fc1ecc311adfb28dbdb7c452351a151a407fd2fb2dba7ecbbc400f75aa5e1681fbbe0be032bd9bf10be280eca142eea7df072c0e589
+EBUILD qtbase-6.9999.ebuild 10082 BLAKE2B 07c2196536f5ef4061f8b14a7251c419441e0ca6a8e627e4a07ee91676b4d8ea1bee4185381ed32818674cda7507b0512c2736a05412e3428e81b7ed692485cf SHA512 01b0f51afc08298239cc6fc1ecc311adfb28dbdb7c452351a151a407fd2fb2dba7ecbbc400f75aa5e1681fbbe0be032bd9bf10be280eca142eea7df072c0e589
 MISC metadata.xml 1655 BLAKE2B 1f3bdbe5f14716d1825ff0ce6d3a9439a87c0c18abd0bb6a2286c9709e815205f2f6911ef5d053b57598aa54471d4316f87c9a4d36004be15f499447785f14bd SHA512 d1479bae177f75991241eacaa1300f43d644730fa3d6d7e6e039b8a212f1289b920b6e1aad7c56576857049f133492f5cf648c7931228c6c4ee272d93437e351
diff --git a/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild b/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild
index a0defb2de975..d9f21bee7611 100644
--- a/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild
@@ -25,6 +25,8 @@ declare -A QT6_IUSE=(
 	[sql]="mysql oci8 odbc postgres +sqlite"
 	[widgets]="cups gtk"
 
+	[cpuflags]="cpu_flags_x86_rdrand"
+
 	[optfeature]="nls wayland" #810802,864509
 )
 IUSE="${QT6_IUSE[*]}"
@@ -235,7 +237,14 @@ src_configure() {
 	)
 
 	if use amd64 || use x86; then
-		# see bug #913400 for explanations
+		# see bug #922498, let detection do its thing if set
+		use cpu_flags_x86_rdrand ||
+			mycmakeargs+=(
+				-DQT_FEATURE_rdrnd=OFF
+				-DQT_FEATURE_rdseed=OFF
+			)
+
+		# see bug #913400 for explanations, mostly to handle -mno-*
 		local cpufeats=(
 			# list of checked cpu features in configure.cmake
 			avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}
diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
index dcaf37200a90..1df2ecec87b6 100644
--- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild
@@ -24,6 +24,8 @@ declare -A QT6_IUSE=(
 	[sql]="mysql oci8 odbc postgres +sqlite"
 	[widgets]="cups gtk"
 
+	[cpuflags]="cpu_flags_x86_rdrand"
+
 	[optfeature]="nls wayland" #810802,864509
 )
 IUSE="${QT6_IUSE[*]}"
@@ -232,7 +234,14 @@ src_configure() {
 	)
 
 	if use amd64 || use x86; then
-		# see bug #913400 for explanations
+		# see bug #922498, let detection do its thing if set
+		use cpu_flags_x86_rdrand ||
+			mycmakeargs+=(
+				-DQT_FEATURE_rdrnd=OFF
+				-DQT_FEATURE_rdseed=OFF
+			)
+
+		# see bug #913400 for explanations, mostly to handle -mno-*
 		local cpufeats=(
 			# list of checked cpu features in configure.cmake
 			avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}
diff --git a/dev-qt/qtbase/qtbase-6.7.9999.ebuild b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
index 10afd1ff2ad0..558e1b6b1caf 100644
--- a/dev-qt/qtbase/qtbase-6.7.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
@@ -24,6 +24,8 @@ declare -A QT6_IUSE=(
 	[sql]="mysql oci8 odbc postgres +sqlite"
 	[widgets]="cups gtk"
 
+	[cpuflags]="cpu_flags_x86_rdrand"
+
 	[optfeature]="nls" #810802
 )
 IUSE="${QT6_IUSE[*]}"
@@ -235,7 +237,14 @@ src_configure() {
 	)
 
 	if use amd64 || use x86; then
-		# see bug #913400 for explanations
+		# see bug #922498, let detection do its thing if set
+		use cpu_flags_x86_rdrand ||
+			mycmakeargs+=(
+				-DQT_FEATURE_rdrnd=OFF
+				-DQT_FEATURE_rdseed=OFF
+			)
+
+		# see bug #913400 for explanations, mostly to handle -mno-*
 		local cpufeats=(
 			# list of checked cpu features in configure.cmake
 			avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 10afd1ff2ad0..558e1b6b1caf 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -24,6 +24,8 @@ declare -A QT6_IUSE=(
 	[sql]="mysql oci8 odbc postgres +sqlite"
 	[widgets]="cups gtk"
 
+	[cpuflags]="cpu_flags_x86_rdrand"
+
 	[optfeature]="nls" #810802
 )
 IUSE="${QT6_IUSE[*]}"
@@ -235,7 +237,14 @@ src_configure() {
 	)
 
 	if use amd64 || use x86; then
-		# see bug #913400 for explanations
+		# see bug #922498, let detection do its thing if set
+		use cpu_flags_x86_rdrand ||
+			mycmakeargs+=(
+				-DQT_FEATURE_rdrnd=OFF
+				-DQT_FEATURE_rdseed=OFF
+			)
+
+		# see bug #913400 for explanations, mostly to handle -mno-*
 		local cpufeats=(
 			# list of checked cpu features in configure.cmake
 			avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}