gentoo auto-resync : 03:06:2024 - 00:07:25

5 files changed, 9 insertions, 133 deletions

diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest
index cada8023ff41..7572e5ae972d 100644
--- a/dev-qt/qtbase/Manifest
+++ b/dev-qt/qtbase/Manifest
@@ -8,8 +8,8 @@ AUX qtbase-6.7.0-qspan-ifdef.patch 1027 BLAKE2B 3ab8bb2b3ec7017ae8e6ef884e1acc67
 AUX qtbase-6.7.1-qeventlooplocker.patch 7083 BLAKE2B c2413fda052de5d5695050a5bfcd7dea3ff10f0ffb904e5368ef60a25f31b4599313ebfc36d546ca1d9ebff3df38a63ba0725dabf999d919b67509af26a2c815 SHA512 1fd2115fedb413459d961c6047a78713c6393e87325e8adf74d50730586438e5bb7c7ce8b26528a6721c98421275a0f842537a19399fd9818cc5b57123f44438
 DIST qtbase-everywhere-src-6.7.0.tar.xz 49314276 BLAKE2B f4ec35fd3c15d56a28e1608dec927eaf34d84c2250405d921adadc16d90ec148f4983024dcf9be1832de91381d18e33fd7578d60d8654469e23530a210618e11 SHA512 72896cc5a677361779f49d60dbdfc33a21d77bd479e0586b0beb03eee2016d613aee56e798143a489431a07a5e7a7db4c7c046105a11b63dd178768f3a7f195a
 DIST qtbase-everywhere-src-6.7.1.tar.xz 49324536 BLAKE2B 5e5a5801c29c1ac541812931cd56709a934a500ce4d5a38e7d3776620cb46db0d25408c22cbf33a7bcc657098c571e501fde14f523a77acba1827edd977d2bc5 SHA512 864bebfc3659907e52b8dc3f62a65d431573ef2bf406a9f71c688229083a2128c5474f75823275d11948be3d031de1d6427acf373f977df9ee9e73a27ef56efb
-EBUILD qtbase-6.7.0-r2.ebuild 10606 BLAKE2B b19d06f0dd3cc1ff22c52f5819817fe7dab5e0c0f5eda3b0db39525b68c7085daf2aa2e73190808e28021a50a372712f0b55f8116ab674c88cb9005d2f814de9 SHA512 1e646ba04eb9b31936c542a4e25c8100d4c5ce45d904114896819e40441869bd5e0d8093328396ced4f4b8c67c03ed1a4d3d67ff1e2afdff50e8adcab2b41bb7
-EBUILD qtbase-6.7.1.ebuild 10562 BLAKE2B b9ac54cbec47a697b25385dbf817efac4483594991d4ce16101b369d652a2cc13e2235a0f16cec93427b6285361cd9537b656e4141116e47aaab927841d1217c SHA512 a4868b88c5906aa413ddfaca7e4749236fcb175c2f70a1ec212a96fab8413618d39dd4052e99d37744f80be92c7d0d852839aa8da03c4582754e98583389c9f0
-EBUILD qtbase-6.7.9999.ebuild 10469 BLAKE2B 0bb3dd926ef658a36feb141ac462fb7b116c8d491db1887671b862cab1e9814ebe7bd2cac5688447c6e21b26a3701ce4f21eb576f1992bd8e174d46f58220b1a SHA512 0e3c0535a25cddfc93dbe2274164fe0559df45adbb4c32a49c12fb2e542fdddd643d88349835fcf90b1a20ec4790a53518c35ccaf51019ffb58ff86e0dd2b860
-EBUILD qtbase-6.9999.ebuild 10469 BLAKE2B 0bb3dd926ef658a36feb141ac462fb7b116c8d491db1887671b862cab1e9814ebe7bd2cac5688447c6e21b26a3701ce4f21eb576f1992bd8e174d46f58220b1a SHA512 0e3c0535a25cddfc93dbe2274164fe0559df45adbb4c32a49c12fb2e542fdddd643d88349835fcf90b1a20ec4790a53518c35ccaf51019ffb58ff86e0dd2b860
+EBUILD qtbase-6.7.0-r2.ebuild 9629 BLAKE2B 1589aad34a672aff2a8927b220c23281347180bfbdc07ff1979d1b1a19fa69c80fae913d08110a7923c9fc05c38de157e160cf44fe1ed71de5ce043be4bfeb32 SHA512 c08a929907e734992a8f9ba831f3227f27079a8fa1585b6723ec87ee88cda50a11ed7794a660231a3201bca58045a6f848170e35076665ad27a42f8a346f2065
+EBUILD qtbase-6.7.1.ebuild 9584 BLAKE2B 71de7b273d458ead2d3497efb1a5598119934e3ed6e7dac4cd905f3d4954f7c9766a53fdcf11d82cb5f17959500df9df8fd105421b7f6a710501745cfb71cd3e SHA512 87586e636ae7ba29e68b524fe3a670da661b7ca8f3bca6b41b1a6089934b28d2e6fd8ccf2ae4ffd101822ce84329ec49b6576a0107a786dccc32c3f1c304f256
+EBUILD qtbase-6.7.9999.ebuild 9492 BLAKE2B a5c489ccf944d52d6d69b4bea9493236669644d5c7349f99b7e13efb69f53a300db5c5a455e2e3b6d32669cf554faafd8118d0deba25394ad039dad020a39fe5 SHA512 5963f23bf57f0da8fac249e6fb3da120889e3a9072faca3e6443a8e2fd19d5397838c598be1bc436219a6ac73a763d1e106e209219a022cbc1c87801a5adb037
+EBUILD qtbase-6.9999.ebuild 9492 BLAKE2B a5c489ccf944d52d6d69b4bea9493236669644d5c7349f99b7e13efb69f53a300db5c5a455e2e3b6d32669cf554faafd8118d0deba25394ad039dad020a39fe5 SHA512 5963f23bf57f0da8fac249e6fb3da120889e3a9072faca3e6443a8e2fd19d5397838c598be1bc436219a6ac73a763d1e106e209219a022cbc1c87801a5adb037
 MISC metadata.xml 1655 BLAKE2B 1f3bdbe5f14716d1825ff0ce6d3a9439a87c0c18abd0bb6a2286c9709e815205f2f6911ef5d053b57598aa54471d4316f87c9a4d36004be15f499447785f14bd SHA512 d1479bae177f75991241eacaa1300f43d644730fa3d6d7e6e039b8a212f1289b920b6e1aad7c56576857049f133492f5cf648c7931228c6c4ee272d93437e351
diff --git a/dev-qt/qtbase/qtbase-6.7.0-r2.ebuild b/dev-qt/qtbase/qtbase-6.7.0-r2.ebuild
index 203bcb3c6d6f..b3b3f80bb86a 100644
--- a/dev-qt/qtbase/qtbase-6.7.0-r2.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit flag-o-matic qt6-build toolchain-funcs
+inherit qt6-build toolchain-funcs
 
 DESCRIPTION="Cross-platform application development framework"
 
@@ -248,37 +248,6 @@ src_configure() {
 		$(qt_feature sqlite system_sqlite)
 	)
 
-	if use amd64 || use x86; then
-		# see bug #913400 for explanations
-		local cpufeats=(
-			# list of checked cpu features in configure.cmake
-			avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}
-			f16c rdrnd rdseed sse2 sse3 sse4_1 sse4_2 ssse3 vaes
-		)
-		# handle odd ones out not matching -m* and macros (keep same order)
-		local cpuflags=( "${cpufeats[@]}" aes sha )
-		local cpufeats+=( aesni shani )
-
-		local -a intrins
-		IFS=' ' read -ra intrins < <(
-			: "$(test-flags-CXX "${cpuflags[@]/#/-m}")"
-			$(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1
-				$(printf '__%s__ ' "${cpuflags[@]^^}")
-			EOF
-			assert
-		)
-
-		# do nothing and leave to qtbase if no macros expanded (test failed?)
-		if [[ \ ${intrins[*]} == *\ [^_\ ]* ]]; then
-			local -i i
-			for ((i=0; i<${#cpufeats[@]}; i++)); do
-				[[ ${intrins[i]} == __* ]] &&
-					mycmakeargs+=( -DQT_FEATURE_${cpufeats[i]}=OFF )
-			done
-			mycmakeargs+=( -DTEST_x86intrin=ON )
-		fi
-	fi
-
 	qt6-build_src_configure
 }
 
diff --git a/dev-qt/qtbase/qtbase-6.7.1.ebuild b/dev-qt/qtbase/qtbase-6.7.1.ebuild
index c3bbd67f3fa5..8fcaa6b8b960 100644
--- a/dev-qt/qtbase/qtbase-6.7.1.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.1.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=8
 
-inherit flag-o-matic qt6-build toolchain-funcs
+inherit qt6-build toolchain-funcs
 
 DESCRIPTION="Cross-platform application development framework"
 
 if [[ ${QT6_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="amd64 arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86"
 fi
 
 declare -A QT6_IUSE=(
@@ -247,37 +247,6 @@ src_configure() {
 		$(qt_feature sqlite system_sqlite)
 	)
 
-	if use amd64 || use x86; then
-		# see bug #913400 for explanations
-		local cpufeats=(
-			# list of checked cpu features in configure.cmake
-			avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}
-			f16c rdrnd rdseed sse2 sse3 sse4_1 sse4_2 ssse3 vaes
-		)
-		# handle odd ones out not matching -m* and macros (keep same order)
-		local cpuflags=( "${cpufeats[@]}" aes sha )
-		local cpufeats+=( aesni shani )
-
-		local -a intrins
-		IFS=' ' read -ra intrins < <(
-			: "$(test-flags-CXX "${cpuflags[@]/#/-m}")"
-			$(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1
-				$(printf '__%s__ ' "${cpuflags[@]^^}")
-			EOF
-			assert
-		)
-
-		# do nothing and leave to qtbase if no macros expanded (test failed?)
-		if [[ \ ${intrins[*]} == *\ [^_\ ]* ]]; then
-			local -i i
-			for ((i=0; i<${#cpufeats[@]}; i++)); do
-				[[ ${intrins[i]} == __* ]] &&
-					mycmakeargs+=( -DQT_FEATURE_${cpufeats[i]}=OFF )
-			done
-			mycmakeargs+=( -DTEST_x86intrin=ON )
-		fi
-	fi
-
 	qt6-build_src_configure
 }
 
diff --git a/dev-qt/qtbase/qtbase-6.7.9999.ebuild b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
index 016279f8fec5..fbe1ce6c1da1 100644
--- a/dev-qt/qtbase/qtbase-6.7.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.7.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit flag-o-matic qt6-build toolchain-funcs
+inherit qt6-build toolchain-funcs
 
 DESCRIPTION="Cross-platform application development framework"
 
@@ -245,37 +245,6 @@ src_configure() {
 		$(qt_feature sqlite system_sqlite)
 	)
 
-	if use amd64 || use x86; then
-		# see bug #913400 for explanations
-		local cpufeats=(
-			# list of checked cpu features in configure.cmake
-			avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}
-			f16c rdrnd rdseed sse2 sse3 sse4_1 sse4_2 ssse3 vaes
-		)
-		# handle odd ones out not matching -m* and macros (keep same order)
-		local cpuflags=( "${cpufeats[@]}" aes sha )
-		local cpufeats+=( aesni shani )
-
-		local -a intrins
-		IFS=' ' read -ra intrins < <(
-			: "$(test-flags-CXX "${cpuflags[@]/#/-m}")"
-			$(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1
-				$(printf '__%s__ ' "${cpuflags[@]^^}")
-			EOF
-			assert
-		)
-
-		# do nothing and leave to qtbase if no macros expanded (test failed?)
-		if [[ \ ${intrins[*]} == *\ [^_\ ]* ]]; then
-			local -i i
-			for ((i=0; i<${#cpufeats[@]}; i++)); do
-				[[ ${intrins[i]} == __* ]] &&
-					mycmakeargs+=( -DQT_FEATURE_${cpufeats[i]}=OFF )
-			done
-			mycmakeargs+=( -DTEST_x86intrin=ON )
-		fi
-	fi
-
 	qt6-build_src_configure
 }
 
diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild
index 016279f8fec5..fbe1ce6c1da1 100644
--- a/dev-qt/qtbase/qtbase-6.9999.ebuild
+++ b/dev-qt/qtbase/qtbase-6.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit flag-o-matic qt6-build toolchain-funcs
+inherit qt6-build toolchain-funcs
 
 DESCRIPTION="Cross-platform application development framework"
 
@@ -245,37 +245,6 @@ src_configure() {
 		$(qt_feature sqlite system_sqlite)
 	)
 
-	if use amd64 || use x86; then
-		# see bug #913400 for explanations
-		local cpufeats=(
-			# list of checked cpu features in configure.cmake
-			avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl}
-			f16c rdrnd rdseed sse2 sse3 sse4_1 sse4_2 ssse3 vaes
-		)
-		# handle odd ones out not matching -m* and macros (keep same order)
-		local cpuflags=( "${cpufeats[@]}" aes sha )
-		local cpufeats+=( aesni shani )
-
-		local -a intrins
-		IFS=' ' read -ra intrins < <(
-			: "$(test-flags-CXX "${cpuflags[@]/#/-m}")"
-			$(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1
-				$(printf '__%s__ ' "${cpuflags[@]^^}")
-			EOF
-			assert
-		)
-
-		# do nothing and leave to qtbase if no macros expanded (test failed?)
-		if [[ \ ${intrins[*]} == *\ [^_\ ]* ]]; then
-			local -i i
-			for ((i=0; i<${#cpufeats[@]}; i++)); do
-				[[ ${intrins[i]} == __* ]] &&
-					mycmakeargs+=( -DQT_FEATURE_${cpufeats[i]}=OFF )
-			done
-			mycmakeargs+=( -DTEST_x86intrin=ON )
-		fi
-	fi
-
 	qt6-build_src_configure
 }