gentoo auto-resync : 17:08:2023 - 03:31:10

2 files changed, 45 insertions, 39 deletions

diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 432b80beae5e..3dc4f16968a0 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,5 +1,5 @@
 AUX qutebrowser-2.5.4-tests-python-3.11.4.patch 4324 BLAKE2B 0d55af4677d6822f03f23404a5f4df5c2189343e2765a5d08c08bdb75749f07594091d2c66ab5a646d0f0e1719cdc7b9aaa593076d2f263911f0881724fcb1b6 SHA512 9c0dc96b1d8e26fa22fdf07878e7fe60b7112e41b5b90955b96b0a95fe815334e2b8c4e48009e2e70ab5bd7e6bdb9f2097bf9333c38e003486a2be4bb4867b3b
 DIST qutebrowser-2.5.4.tar.gz 6117674 BLAKE2B d8dedf57ac064ce1a3d2e4e854a0064dfe567260cadfcdf129c2a2bcdbd26aaa21a569e3f69300c75e5dfb363b62173ac6e5f11e4bcd4a5c8dd72697b4caa5c3 SHA512 1c500cda921a273dee14b1e0808786bbfd2ce53ea9b4d5114be9abdacbefa5d3c7580d2995ad0100f597b9bf54addf4c98dbd4b924d9e8d3d08fe30309e44c3e
 EBUILD qutebrowser-2.5.4-r1.ebuild 5229 BLAKE2B 02b2d82dc544051e1afbb0c22362745c39d4befd9443b1a873cb5979de492987cac707b2dedae594924f9402b3c362be5951e637df0f7471335c9b02d22c8fb9 SHA512 5a264abffe9861d288dd2a35765bf8f956e1af970880922cc7c1cf83e7a92f8b8f9e0afe190d196b78d777707aee57cc06eb538b5042aa7342fbe98fefc89731
-EBUILD qutebrowser-9999.ebuild 6694 BLAKE2B e9b962cbd69dd38b7bbc6f29ce8c5ad6b6694e5162552951528d88a7f1d3e93390d0bac5b001254bfc12beb64f3f119e48c941c203b5e87d2d33cd36366c1fce SHA512 f37ee8f80307730977655706ef24ee6693edd6497bab96a5149d29c124ab276fdbb1a4557ff4ae27b6e4de5761c22d72a7140f558f5d1eaf637ae1a3c7dac054
+EBUILD qutebrowser-9999.ebuild 6883 BLAKE2B d2455eeff05b339247cd7c6330745e915dff325e5add9547f72ebf61b92ab0aa225ba893abf684533cab06dd158d5ce1b35cad6e87235be2840ca0a96d778713 SHA512 159d7321c52ec74a98af4dd8893f835b6d4a204e5e4ab46d3680bf0ad6af5e89cecf99d25317f843dc645a2bcdcba6d4b6fcdeb94563edd7ba19831394d68718
 MISC metadata.xml 1018 BLAKE2B 9d0c406995b2036671113b6513c3ed2fdb5021eae9d1dde5c186efeccdde6dae127857e3e5898f7809edcc27eca4b47f37965155ac0ff21bedb78e242421fd54 SHA512 2af79f18d31f9efe8df852f4bca132caf1d79fc06f6388959deb367470d4975af541a75c70831b549d944112bcd0bc7e11510a81bce4ef1391fbf1354425b769
diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild
index 5df6b9fbacf4..8319d7eaab10 100644
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild
@@ -29,32 +29,29 @@ IUSE="+adblock pdf +qt6 widevine"
 RDEPEND="
 	$(python_gen_cond_dep '
 		dev-python/colorama[${PYTHON_USEDEP}]
-		>=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
-		>=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/markupsafe[${PYTHON_USEDEP}]
 		dev-python/pygments[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
 		dev-python/zipp[${PYTHON_USEDEP}]
 		adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )
-	')
-	qt6? (
-		dev-qt/qtbase:6[icu,sqlite]
-		$(python_gen_cond_dep '
+		qt6? (
+			dev-qt/qtbase:6[icu,sqlite]
 			dev-python/PyQt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets]
 			dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets]
-		')
-		pdf? ( www-plugins/pdfjs )
-	)
-	!qt6? (
-		dev-qt/qtcore:5[icu]
-		dev-qt/qtgui:5[png]
-		dev-qt/qtsql:5[sqlite]
-		$(python_gen_cond_dep '
+			pdf? ( www-plugins/pdfjs )
+		)
+		!qt6? (
+			dev-qt/qtcore:5[icu]
+			dev-qt/qtgui:5[png]
+			dev-qt/qtsql:5[sqlite]
 			dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,gui,network,opengl,printsupport,sql,widgets]
 			dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-		')
-		pdf? ( <www-plugins/pdfjs-3 )
-	)
-	widevine? ( www-plugins/chrome-binary-plugins )"
+			pdf? ( <www-plugins/pdfjs-3 )
+		)
+		widevine? ( www-plugins/chrome-binary-plugins )
+	')
+"
 BDEPEND="
 	$(python_gen_cond_dep '
 		test? (
@@ -71,7 +68,8 @@ BDEPEND="
 			qt6? ( dev-python/PyQt6[testlib] )
 			!qt6? ( dev-python/PyQt5[testlib] )
 		)
-	')"
+	')
+"
 [[ ${PV} == 9999 ]] && BDEPEND+=" app-text/asciidoc"
 
 distutils_enable_tests pytest
@@ -80,7 +78,7 @@ src_prepare() {
 	distutils-r1_src_prepare
 
 	if use pdf; then
-		# doesn't hurt to enable by default if was explicitly requested
+		# does not hurt to enable by default if it was explicitly requested
 		sed -e '/^content.pdfjs:/,+1s/false/true/' \
 			-i ${PN}/config/configdata.yml || die
 	fi
@@ -122,25 +120,33 @@ python_test() {
 	local -x PYTEST_QT_API=pyqt$(usex qt6 6 5)
 
 	local EPYTEST_DESELECT=(
-		# end2end and other IPC tests are broken with "Name error" if
-		# socket path is over ~104 characters (=124 in /var/tmp/portage)
-		# https://github.com/qutebrowser/qutebrowser/issues/888 (not just OSX)
+		# end2end/IPC tests are broken with "Name error" if socket path is over
+		# ~108 characters (>124 in /var/tmp/portage) due to Linux limitations,
+		# skip rather than bother using /tmp+cleanup over ${T}
 		tests/end2end
 		tests/unit/misc/test_ipc.py
-		# calls eclass' python2 "failure" wrapper
+		# python eclasses provide a fake "failing" python2 and trips this test
 		tests/unit/misc/test_checkpyver.py::test_old_python
 		# not worth running dbus over
 		tests/unit/browser/test_notification.py::TestDBus
-		# bug 819393
-		tests/unit/commands/test_userscripts.py::test_custom_env\[_POSIXUserscriptRunner\]
-		# test does not know about our newer fixed qtwebengine:5
+		# fails in ebuild, seems due to saving fake downloads in wrong location
 		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\]
 		# 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}
 	)
-	# qtargs are mangled with widevine+prefix
-	use widevine && use prefix && EPYTEST_DESELECT+=( tests/unit/config/test_qtargs.py )
+
+	# we mangle qtargs with widevine+prefix leading to unexpected results
+	use widevine && use prefix &&
+		EPYTEST_DESELECT+=( tests/unit/config/test_qtargs.py )
+
+	# tests known failing with Qt5 which is considered a 2nd class citizen
+	# and, unless completely broken, new tests issues may not be pursued
+	use qt6 || EPYTEST_DESELECT+=(
+		tests/unit/mainwindow/test_tabwidget.py::TestTabWidget::test_tab_text_not_edlided_for_wide_tabs
+	)
 
 	# skip benchmarks (incl. _tree), and warning tests broken by -Wdefault
 	epytest -p xvfb -k 'not _bench and not _matches_tree and not _warning'
@@ -172,18 +178,18 @@ pkg_postinst() {
 	fi
 
 	if [[ ! -v QUTEBROWSER_HAD_QT6 && ${REPLACING_VERSIONS} ]] && use qt6; then
+		ewarn
 		ewarn "Be warned that starting the Qt6 version of ${PN} performs a one-way"
 		ewarn "conversion of ~/.local/share/${PN}/webengine to Qt6. There will also"
 		ewarn "be a warning on startup, and may optionally want to backup first."
 	fi
 
-	# only show qt6 warning on arches where USE=qt6 is unmasked
-	# TODO: uncomment after https://github.com/gentoo/gentoo/pull/29181 albeit
-	# may need to comment it out again when stabling if don't stable Qt6 (yet).
-#	if use amd64 && use !qt6; then
-#		ewarn "USE=qt6 is disabled, be warned that Qt5's WebEngine uses an older"
-#		ewarn "chromium version. While it is relatively maintained for security, it may"
-#		ewarn "cause issues for sites/features designed with a newer version in mind."
-#		ewarn "When Qt6 support is stable enough, ebuild's Qt5 support may get removed."
-#	fi
+	# only show Qt6 warning on arches where USE=qt6 is unmasked
+	if use amd64 && use !qt6; then
+		ewarn
+		ewarn "USE=qt6 is disabled, be warned that Qt5's WebEngine uses an older"
+		ewarn "chromium version. While it is relatively maintained for security, it will"
+		ewarn "cause issues for sites/features designed with a newer version in mind."
+		ewarn "When Qt6 support is stable enough, ebuild's Qt5 support may get removed."
+	fi
 }