gentoo auto-resync : 19:06:2024 - 00:09:54

5 files changed, 18 insertions, 12 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index dd424d2323dd..a6df584ef090 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 73bbc64df08a..b0551078c7ec 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -4,7 +4,7 @@ DIST qutebrowser-3.1.0.tar.gz 6045747 BLAKE2B d0cca696dd85bb99b8514331a392e1cb54
 DIST qutebrowser-3.1.0.tar.gz.asc 659 BLAKE2B 023916e83cf2ac084f013ad750acf1ddb02a146197e92f703a96c54bceafcabf9d09a398c43e1679d0e425d54f13726c576c1b2e13707888e097952abef9797b SHA512 f89369b0c61852c0ee22a476fcce0c8fc236920a2c6fbcfb945e010275650bdd133b6714ec2b64c1156789eb3f6f897cbf9a31441e913afcf9f19ea3113611f7
 DIST qutebrowser-3.2.0.tar.gz 6054386 BLAKE2B 3f0589dbbc2dc34c4138bc7ea33ea090a6aff4abe087e7b80f0294789a252924fb90b2b0229e1513c96e863a612bf26579b6e895bc0b9b553c1b7439361ee589 SHA512 85980ccbb1982ecfb142a4e3fc0a66b8ac88f73c394a6c936b8f1a541ea30a65ee576abd7e202ac50fd943c85457d75b5ccac7d51ea34ff1b0f7eb8a647aa18d
 DIST qutebrowser-3.2.0.tar.gz.asc 659 BLAKE2B 33d88c2d4020535616ee5d8ed8e517aabf24433ab9d712f12aa1f138398a60807a14383d300245ee7873ed027445034ced9c61ce52a54518a2cc240a01f2649f SHA512 895e6d585f4d1d7373544d763663412136ef4b397565ddac24c1bcf16c75e96c8110cc8dea6fa8457799b893a2e3d2fca8979875b8e8423f270a70100d6e57db
-EBUILD qutebrowser-3.1.0-r1.ebuild 7214 BLAKE2B b45fec16f998fe12592868e4dee0a3a276b22f142e41856aa202779b255bd4afb9318d1ee999685ecb5aeb5515841210502bbb977a61e07b323f6443b5d360cb SHA512 cda34aef681d9e4390a6cd2eface82bdc6454d51383357c47083fa5f984999b6d039f4e5140ed1459b4fc9aabc40b6d264f6f16caa9616895fe85e50e1d76243
-EBUILD qutebrowser-3.2.0.ebuild 5317 BLAKE2B 037f5ed31688ba86e34a1330cdaa15abfebc1e3964b5bde0d1dc711f2ebc545cefc297049908a0305c830b221ea46a1ea9c056423c1968d383d79a13cc4869a9 SHA512 f6eda910394fce51425632d0a566ddbbe6dd4c1deb3e6e07b3c46baa74bf72297199420f9e74e56c6784c1ed7276b695bc80f6b3d6155178fd7097fbb244f26c
-EBUILD qutebrowser-9999.ebuild 5317 BLAKE2B 037f5ed31688ba86e34a1330cdaa15abfebc1e3964b5bde0d1dc711f2ebc545cefc297049908a0305c830b221ea46a1ea9c056423c1968d383d79a13cc4869a9 SHA512 f6eda910394fce51425632d0a566ddbbe6dd4c1deb3e6e07b3c46baa74bf72297199420f9e74e56c6784c1ed7276b695bc80f6b3d6155178fd7097fbb244f26c
+EBUILD qutebrowser-3.1.0-r1.ebuild 7283 BLAKE2B 8200c77d2eeca4a68c64269f12ba0a72b93b871ad66add6184f1016f2d770089e09265e330055c3758d43e6956b9984f65fb6c373341e96985198f24d9fb3a1b SHA512 da06f09b583595f21db34a5960680e3ef6c04a60413f465a48fb7130bd825465b37a11c29905d7fa8020c6806db4c521b84c53af7342ca946fa1c49477e1121f
+EBUILD qutebrowser-3.2.0.ebuild 5386 BLAKE2B 7e0a23f5a5fd92d6d23d443eb995f26b7ad1d4ddc70b24ad2c1f377806b0eb2dc6f1cfef6d0f690166ad3cf8fcc7e7bde3cc96b0b906308d6d05625af96f8185 SHA512 76bc31fabd7634d575b5259cba6a3381719b5c71f47a8a4805bc00e0a70f0a80538f786d9922dd9c11ab388df59e4522634ee22e75dea7059830fb1d4ab3d45e
+EBUILD qutebrowser-9999.ebuild 5386 BLAKE2B 7e0a23f5a5fd92d6d23d443eb995f26b7ad1d4ddc70b24ad2c1f377806b0eb2dc6f1cfef6d0f690166ad3cf8fcc7e7bde3cc96b0b906308d6d05625af96f8185 SHA512 76bc31fabd7634d575b5259cba6a3381719b5c71f47a8a4805bc00e0a70f0a80538f786d9922dd9c11ab388df59e4522634ee22e75dea7059830fb1d4ab3d45e
 MISC metadata.xml 1018 BLAKE2B 9d0c406995b2036671113b6513c3ed2fdb5021eae9d1dde5c186efeccdde6dae127857e3e5898f7809edcc27eca4b47f37965155ac0ff21bedb78e242421fd54 SHA512 2af79f18d31f9efe8df852f4bca132caf1d79fc06f6388959deb367470d4975af541a75c70831b549d944112bcd0bc7e11510a81bce4ef1391fbf1354425b769
diff --git a/www-client/qutebrowser/qutebrowser-3.1.0-r1.ebuild b/www-client/qutebrowser/qutebrowser-3.1.0-r1.ebuild
index 3eb916073966..9fd58604459f 100644
--- a/www-client/qutebrowser/qutebrowser-3.1.0-r1.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.1.0-r1.ebuild
@@ -111,9 +111,11 @@ src_prepare() {
 	fi
 
 	if use test; then
-		# unnecessary here, and would require extra deps
+		# skip unnecessary (for us) pytest plugins, and ignore Qt's
+		# warnings that tend to newly appear with new versions
 		sed -e '/pytest-benchmark/d' -e 's/--benchmark[^ ]*//' \
 			-e '/pytest-instafail/d' -e 's/--instafail//' \
+			-e '/qt_log_level_fail/s/WARNING/CRITICAL/' \
 			-i pytest.ini || die
 
 		if [[ ${PV} == 9999 ]]; then
@@ -147,8 +149,8 @@ python_test() {
 		# needs _WRAPPER_OVERRIDE = None, but we have changed it
 		tests/unit/test_qt_machinery.py::TestSelectWrapper::test_autoselect_by_default
 		tests/unit/test_qt_machinery.py::TestInit::test_none_available_{implicit,explicit}
-		# fails if chromium version is unrecognized (aka newer qtwebengine)
-		tests/unit/utils/test_version.py::TestWebEngineVersions::test_real_chromium_version
+		# may fail if chromium version is unrecognized (aka newer qtwebengine)
+		tests/unit/utils/test_version.py
 	)
 
 	# tests known failing with Qt5 which is considered a 2nd class citizen
diff --git a/www-client/qutebrowser/qutebrowser-3.2.0.ebuild b/www-client/qutebrowser/qutebrowser-3.2.0.ebuild
index e0f7bb2a94cd..5525cd7811df 100644
--- a/www-client/qutebrowser/qutebrowser-3.2.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.2.0.ebuild
@@ -91,9 +91,11 @@ src_prepare() {
 	fi
 
 	if use test; then
-		# unnecessary here, and would require extra deps
+		# skip unnecessary (for us) pytest plugins, and ignore Qt's
+		# warnings that tend to newly appear with new versions
 		sed -e '/pytest-benchmark/d' -e 's/--benchmark[^ ]*//' \
 			-e '/pytest-instafail/d' -e 's/--instafail//' \
+			-e '/qt_log_level_fail/s/WARNING/CRITICAL/' \
 			-i pytest.ini || die
 
 		if [[ ${PV} == 9999 ]]; then
@@ -124,8 +126,8 @@ python_test() {
 		tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround
 		# may fail if environment is very large (bug #819393)
 		tests/unit/commands/test_userscripts.py::test_custom_env\[_POSIXUserscriptRunner\]
-		# fails if chromium version is unrecognized (aka newer qtwebengine)
-		tests/unit/utils/test_version.py::TestWebEngineVersions::test_real_chromium_version
+		# may fail if chromium version is unrecognized (aka newer qtwebengine)
+		tests/unit/utils/test_version.py
 	)
 
 	local epytestargs=(
diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild
index e0f7bb2a94cd..5525cd7811df 100644
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild
@@ -91,9 +91,11 @@ src_prepare() {
 	fi
 
 	if use test; then
-		# unnecessary here, and would require extra deps
+		# skip unnecessary (for us) pytest plugins, and ignore Qt's
+		# warnings that tend to newly appear with new versions
 		sed -e '/pytest-benchmark/d' -e 's/--benchmark[^ ]*//' \
 			-e '/pytest-instafail/d' -e 's/--instafail//' \
+			-e '/qt_log_level_fail/s/WARNING/CRITICAL/' \
 			-i pytest.ini || die
 
 		if [[ ${PV} == 9999 ]]; then
@@ -124,8 +126,8 @@ python_test() {
 		tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround
 		# may fail if environment is very large (bug #819393)
 		tests/unit/commands/test_userscripts.py::test_custom_env\[_POSIXUserscriptRunner\]
-		# fails if chromium version is unrecognized (aka newer qtwebengine)
-		tests/unit/utils/test_version.py::TestWebEngineVersions::test_real_chromium_version
+		# may fail if chromium version is unrecognized (aka newer qtwebengine)
+		tests/unit/utils/test_version.py
 	)
 
 	local epytestargs=(