gentoo auto-resync : 27:03:2024 - 13:01:55

3 files changed, 11 insertions, 59 deletions

diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 2692ab1259da..b6a3f6c6c388 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,6 +1,6 @@
 AUX qutebrowser-3.1.0-qt663-tests.patch 622 BLAKE2B 6829a8c915f21d5cd28a2b867ad64f188837e915d64ddc3446421bc7a3b23657fee1ccd1758d242e9264eda0dc068f8e0473269c1e02c74adced530acf613a6c SHA512 8dc10dbb95e859861c06e57802e52dce634364d80b521aa398597161442388cef3f01b0fbeb96157f8189ce3b669132f4ef3e1dad23cd35c6abd72865e018e40
 DIST qutebrowser-3.1.0.tar.gz 6045747 BLAKE2B d0cca696dd85bb99b8514331a392e1cb54fcbeff32fcf13e058739ef5a20ef1725980fbabef187a226f1cc29be9943784ba1f93275047586827922c3e98d0a64 SHA512 79dff3cf4ff93c75150e5cb9ada835ed5faf0343f03854266c6138fb8e6cceb921c868e1e408432da61b85ebe37e7e1657f634771ff73f1395d1b6e169138d98
 DIST qutebrowser-3.1.0.tar.gz.asc 659 BLAKE2B 023916e83cf2ac084f013ad750acf1ddb02a146197e92f703a96c54bceafcabf9d09a398c43e1679d0e425d54f13726c576c1b2e13707888e097952abef9797b SHA512 f89369b0c61852c0ee22a476fcce0c8fc236920a2c6fbcfb945e010275650bdd133b6714ec2b64c1156789eb3f6f897cbf9a31441e913afcf9f19ea3113611f7
-EBUILD qutebrowser-3.1.0.ebuild 7243 BLAKE2B 04dad1720c599e4d91c93928cae456723d7213d3a1080d548e8b7bc61445e5308be2b1a446e1e0589cf46653a3ee83303468514279e038cbdffa8601b6a695c4 SHA512 208fdc9ee2fda8489b8a2f913d19972ad17a1ab192947c5d710d8ab20203c8ff29ac0d8bffb37f78ffa1c0bee22786c16b5d36dca1992150c7490283978c62e6
-EBUILD qutebrowser-9999.ebuild 7193 BLAKE2B 883f47f2869bf33b4ff8014025c13a4880de0d0c5448817c3d61ff05a752a554af3526af867947257270d9ac20c1a99e5be3c5df1a9c2580e71d13495df2d317 SHA512 6c6d7a6d77e6cef30d37564205b674808a8a4f89717e6bd8c6d66f2094a96e3f0f851bd1d3396a480adcecc21f763cc59927c49c0efc6d1a33ce0b5586c73a54
+EBUILD qutebrowser-3.1.0.ebuild 7169 BLAKE2B 9a7fa3bc0ef916c082dbe055ad8b3d335998b4a7edecb047eb90d45728222054c3a647f6b4211a0ea055b48bdc71f34f8e2811785ca93491416966225dbb0bd7 SHA512 9e100d9eef285a2edf3bd4fee87f0fc6e7d26955b40d3eadf1c08c2d01f956a5f7b2399608ae3d994460595b88c10df2ab1cc3b2989386a8ee7df845666512d5
+EBUILD qutebrowser-9999.ebuild 5314 BLAKE2B 6b586f4821f8618ad8541bb95f7a988bcf9e58d1e8eb9958677934de842368324415064a37d14210f303afa422d134a1e447daf769a4a884a5d1be09bcd80743 SHA512 a2d623b24f7b8d631f6e30192ec384caf831a7565d398b951ca3de366997c35d3c4b2c8d46db6ea011017179d56a27f128d3187b5b1a35f2c33a28471b4d75ed
 MISC metadata.xml 1018 BLAKE2B 9d0c406995b2036671113b6513c3ed2fdb5021eae9d1dde5c186efeccdde6dae127857e3e5898f7809edcc27eca4b47f37965155ac0ff21bedb78e242421fd54 SHA512 2af79f18d31f9efe8df852f4bca132caf1d79fc06f6388959deb367470d4975af541a75c70831b549d944112bcd0bc7e11510a81bce4ef1391fbf1354425b769
diff --git a/www-client/qutebrowser/qutebrowser-3.1.0.ebuild b/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
index b71080584826..a8f02d769926 100644
--- a/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
@@ -200,8 +200,7 @@ pkg_postinst() {
 		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
-	if use amd64 && use !qt6; then
+	if 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"
diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild
index 0ee9fb6c0be8..63c251546529 100644
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild
@@ -26,37 +26,28 @@ HOMEPAGE="https://qutebrowser.org/"
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="+adblock pdf +qt6 widevine"
+IUSE="+adblock pdf widevine"
 
 RDEPEND="
 	$(python_gen_cond_dep '
+		dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets]
+		dev-python/PyQt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets]
 		dev-python/colorama[${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}]
+		dev-qt/qtbase:6[icu,sqlite]
 		adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )
-		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]
-			dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,gui,network,opengl,printsupport,sql,widgets]
-			dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-			pdf? ( <www-plugins/pdfjs-3 )
-		)
+		pdf? ( www-plugins/pdfjs )
 		widevine? ( www-plugins/chrome-binary-plugins )
 	')
 "
 BDEPEND="
 	$(python_gen_cond_dep '
 		test? (
+			dev-python/PyQt6[testlib]
 			dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 			dev-python/cheroot[${PYTHON_USEDEP}]
 			dev-python/flask[${PYTHON_USEDEP}]
@@ -67,8 +58,6 @@ BDEPEND="
 			dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
 			dev-python/pytest-xvfb[${PYTHON_USEDEP}]
 			dev-python/tldextract[${PYTHON_USEDEP}]
-			qt6? ( dev-python/PyQt6[testlib] )
-			!qt6? ( dev-python/PyQt5[testlib] )
 		)
 	')
 "
@@ -90,10 +79,6 @@ src_prepare() {
 			-i ${PN}/config/configdata.yml || die
 	fi
 
-	# ensure the requested backend is used in case multiple are available
-	sed -e "/^_WRAPPER_OVERRIDE =/s/None/\"PyQt$(usex qt6 6 5)\"/" \
-		-i qutebrowser/qt/machinery.py || die
-
 	# let eclass handle python
 	sed -i '/setup.py/d' misc/Makefile || die
 
@@ -122,7 +107,7 @@ src_prepare() {
 }
 
 python_test() {
-	local -x PYTEST_QT_API=pyqt$(usex qt6 6 5)
+	local -x PYTEST_QT_API=pyqt6
 
 	local EPYTEST_DESELECT=(
 		# end2end/IPC tests are broken with "Name error" if socket path is over
@@ -139,19 +124,10 @@ 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\]
-		# 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
 	)
 
-	# 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
-	)
-
 	local epytestargs=(
 		# prefer pytest-xvfb over virtx given same upstream and is expected
 		-p xvfb
@@ -174,12 +150,6 @@ python_install_all() {
 	einstalldocs
 }
 
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	has_version "${CATEGORY}/${PN}[qt6]" && QUTEBROWSER_HAD_QT6=
-}
-
 pkg_postinst() {
 	xdg_pkg_postinst
 
@@ -189,24 +159,7 @@ pkg_postinst() {
 		elog "view_in_mpv needs media-video/mpv[lua] and net-misc/yt-dlp."
 	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
-	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."
-	fi
-
-	if { use qt6 && has_version 'dev-qt/qtwebengine:6[bindist]'; } ||
-		{ use !qt6 && has_version 'dev-qt/qtwebengine:5[bindist]'; }
-	then
+	if has_version 'dev-qt/qtwebengine:6[bindist]'; then
 		ewarn
 		ewarn "USE=bindist is set on dev-qt/qtwebengine, be warned that this"
 		ewarn "will prevent playback of proprietary media formats (e.g. h264)."