gentoo auto-resync : 21:01:2023 - 11:40:40

5 files changed, 18 insertions, 17 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index e80141d19fc2..754e5191e246 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 1cabc90d227d..d425802e0b0b 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -403,7 +403,7 @@ DIST firefox-109.0-zh-CN.xpi 597581 BLAKE2B cc006bbcc32c6835ab0f0522c1e32999fccd
 DIST firefox-109.0-zh-TW.xpi 598878 BLAKE2B db537db23377f15978bd53ebe0a13d6e64df476af7a5d5ccdb7cb419d5fda66632d3dd734582586a72e926b4e555848263410252a822332b03b7b33cfc6a7106 SHA512 01a6e7f8c41d7a7fc4fbf868d97be4cf37c225b0167ae9df2843728713355dcc7e2e4bbf67f663d69df8ae867bec822478228e97912620419879f65ba25352f9
 DIST firefox-109.0.source.tar.xz 493231972 BLAKE2B 56ec8c49f0dd1cb4ba29afb5d68fd724614b993b2a1a59b9c03bf6349bae980d558ef18dbe2170af59f3e690308b753a88619e2abe48db58af5b7fcbecfa03f5 SHA512 9e2b6e20353e414da3d2eb9dcd3d77757664a98a4438a8e84f19a1c7c203e40136b08bf96a458fac05ddc627347217d32f1f6337980c5ca918874993657a58e7
 EBUILD firefox-102.6.0.ebuild 36637 BLAKE2B b390983bf08385b01f66d76a1f08c97342991312bc76d24f11cf4cb94736d6749d5f75f5b9081069fc4b17ccbdfc58b9bbe8c2caf03563d4676a82150c692b8d SHA512 214f554cc976202bfe9cae0bf79c16e4017b9b08f4342ed9f62145d237602c8ffa7204f51d8b3838214481088ca333da34a1ca8e779f0a48503377ef95f9fbcf
-EBUILD firefox-102.7.0.ebuild 36565 BLAKE2B a6149194637056ef2ea9c0e64b61ca72d420b54c78f4da0cbf3428606f1a2fb55464bf56f13e65c56c70c596ec1b99681117290853b4709b1168c795ee3cd761 SHA512 48270552b164feb067be76da99f074d598c6873e8f2c1849ab800a5ebc88149fb98091e1e332b612ab011e190690e882079d7d284134e837bdf1f23e73fc3acf
+EBUILD firefox-102.7.0.ebuild 36564 BLAKE2B 0890f800154cb95683ec3a4d14fee8e716bb77b8d8a47a3cf244b5cf074fe19e512032dc949ff816bdd4a2d6054c4f02c210ffc33ffb72265d1269af89ed0dfd SHA512 41b506e8e7c29421152cc61555f86f520f97b9ef207386a4a3a07451629abef6426b0283d355f177cad296d260a79bb6854f38e8a574ace80be52c6ec698062d
 EBUILD firefox-108.0.2.ebuild 38414 BLAKE2B 002d5abf568068610b4fe03ab8a63bffa8fb803d921dfba84bb952cef6fb1a591ceecc1ab6adabcb176deee3d24deb797930a3fec0841bb1f6e729e662351fae SHA512 aa0001426a0d8e9d969d14085da57c3cb54ea35218eae7ec2d69918d5ff61099a1c5fcc82214b25e9dfbfe04b408afe4db9b54624f401cfe8cb4a49ea6a33d3d
 EBUILD firefox-109.0.ebuild 38532 BLAKE2B 37f0c422113ef60b7e349a04756a975b951b17f067fea2d62415090d79887b89b9f8c6ee346d17e06984f3a7da074a2c57ebe6231c06cd277c298241b28b06e4 SHA512 b939ddfc8d93c54f8084b7bebdadb85e474fead7f39989d67b2cb2bf66a72cba554daa79a6f2cb7d15cc59296ec3959d70edc68c57aa0a1786b5d21804286b52
 MISC metadata.xml 2219 BLAKE2B 064f486eecd2a66ef4c9cccef46803f877039bf16bc40b699a48e28e04e816d0ad434ce65ae2e056e1a4126a67a7dd7eff16040276159c1f5aa8966b1c0d7b6c SHA512 522b09ffc2857553e240b1e7c82c11ccc281dd87c720c6292ec9314b91319e0a55ca2838f17e878f5c1e58e4f22caa1b0c3b90506b65b350beff06f3f397d897
diff --git a/www-client/firefox/firefox-102.7.0.ebuild b/www-client/firefox/firefox-102.7.0.ebuild
index cba50a455800..637c41fc7fe7 100644
--- a/www-client/firefox/firefox-102.7.0.ebuild
+++ b/www-client/firefox/firefox-102.7.0.ebuild
@@ -57,7 +57,7 @@ SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="https://www.mozilla.com/firefox"
 
-KEYWORDS="amd64 arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 
 SLOT="esr"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 058eba36740e..90151ab23023 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,6 +1,6 @@
 AUX qutebrowser-2.5.2-dictcli.patch 589 BLAKE2B 1ad904d36935acc28dc9c6f871d0dab260bf8db24e2dec67b60cd09a7234faac719f0836f73e17c6673b99c7253164e18a6ec47827796daf6af5b4babe91e3ac SHA512 00c6907241fc3ccd0266c0433e18580594b0c8a2151f8e393f1d1dc1a04c6c68619a7ca20f1219ec2cca7e302a39ba14542af03faac7b85c68c7fc47a9fc45fe
 DIST qutebrowser-2.5.2.tar.gz 6114611 BLAKE2B 5f56e1e2c390bb2f36c95e25a2dae9e5203020ff6b2cf1e13092cf493efa950b24b8ff8f23af6eed93ca8b316e30f86715ecd2f2eb28c341210de0b25c9f67ad SHA512 4751ea1a5b1776f085fcd1f9ab5ff805155fca34d0272ba8eb6574f9074257929c3fb5b50c9053a522bfb346aee1a2551b58cf933c6ff7c5c84fd10559ec36fc
 EBUILD qutebrowser-2.5.2-r1.ebuild 4441 BLAKE2B c86a459181c039d78ace97598690d6ea373bc33c6964f187bc98de45a12e807d909e17ecc4506258400f155b230d0f225d6519fe79cc524f74d810a8280e0e96 SHA512 2eec0e64b15604e11f1193fa0af5ce576a1f620db6d916f401fd3257993545c436aa4194ca5184027d84515bf02de29c557ade250e69d13b7c13bef9057a5d4d
-EBUILD qutebrowser-3.0.0_pre9999.ebuild 6232 BLAKE2B 98d148cdfc23892b7407bff19133777a2f3c65f5ab9f26d0ee6a9f1977a678b62397daeaf0c10d58570bff52c7639bfffe7aed7fc1c29cc8d66f73ae23d46f00 SHA512 f43880c9fb9ebcf6ef168102cfd6a9928020dc3d8f45da4efebc7c5bcf1002eee2c811bfdf5b0d7f94280b0361ac2c4ee6a069bd42bba4b16a569f6201ac8010
+EBUILD qutebrowser-3.0.0_pre9999.ebuild 6323 BLAKE2B 6ac49153ddac06b3ac4c7aba5ea9072ddb3fc6e811bbe9d3768530dd218468452e252f7673a81221981daec4fdb30dbf5fde75ae73e8c3791988f46100613507 SHA512 c3f652976c906d8bef52eebee56a4728ee3282ac5a9b99e36025e4ac1d2aa5ba15593f427d796d485a43e6b4708281e08e0d9888fa0659e7de8419be9028651d
 EBUILD qutebrowser-9999.ebuild 4558 BLAKE2B 37ddbc18e82e789779feaf37019c2724f24a2a10388c903c035672d2c3e350e695c7b7b6dd58412478de2ba26a3121d74f6aec9462e544c8e18b6445104561f4 SHA512 8fedd7eb240219b96e32f0f2cc5a9f14bf7a167bfe087deef63f87e02b7d937ea28704fb60b391fa7dde7455f327451b5719135c464baa15278eeaccd40585cf
 MISC metadata.xml 1018 BLAKE2B 9d0c406995b2036671113b6513c3ed2fdb5021eae9d1dde5c186efeccdde6dae127857e3e5898f7809edcc27eca4b47f37965155ac0ff21bedb78e242421fd54 SHA512 2af79f18d31f9efe8df852f4bca132caf1d79fc06f6388959deb367470d4975af541a75c70831b549d944112bcd0bc7e11510a81bce4ef1391fbf1354425b769
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild b/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild
index 5fa6c903ac8c..cffa4849cc2e 100644
--- a/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="qt6-v2"
 else
 	SRC_URI="https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 DESCRIPTION="Keyboard-driven, vim-like browser based on Python and Qt"
@@ -74,33 +74,33 @@ src_prepare() {
 	distutils-r1_src_prepare
 
 	if use pdf; then
-		sed '/^content.pdfjs:/,+1s/false/true/' \
+		sed -e '/^content.pdfjs:/,+1s/false/true/' \
 			-i ${PN}/config/configdata.yml || die
 	fi
 
 	if use widevine; then
-		# Qt6 knows Gentoo's, but pass to ensure libdir, EPREFIX, and for Qt5
+		# Qt6 knows Gentoo's, but pass for libdir, EPREFIX, and Qt5(bug #888783)
 		local widevine=${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so
-		sed "/yield from _qtwebengine_settings_args/a\    yield '--widevine-path=${widevine}'" \
+		sed -e "/yield from _qtwebengine_settings_args/a\    yield '--widevine-path=${widevine}'" \
 			-i ${PN}/config/qtargs.py || die
 	fi
 
 	# ensure run the requested Qt backend
-	sed -i '/^_WRAPPERS = /,/^]/c\_WRAPPERS = [ "PyQt'$(usex qt6 6 5)'" ]' \
-		${PN}/qt/machinery.py || die
+	sed -e '/^_WRAPPERS = /,/^]/c\_WRAPPERS = [ "PyQt'$(usex qt6 6 5)'" ]' \
+		-i ${PN}/qt/machinery.py || die
 
 	# let eclass handle python
 	sed -i '/setup.py/d' misc/Makefile || die
 
 	if [[ ${PV} == *9999 ]]; then
 		# call asciidoc(1) rather than the single target python module
-		sed '/cmdline = /s/= .*/= ["asciidoc"]/' \
+		sed -e '/cmdline = /s/= .*/= ["asciidoc"]/' \
 			-i scripts/asciidoc2html.py || die
 
 		"${EPYTHON}" scripts/asciidoc2html.py || die
 	fi
 
-	# disable unnecessary tests/plugins that need extras (_ignore not enough)
+	# disable unnecessary tests/plugins that need extras
 	sed -e '/pytest-benchmark/d' -e 's/--benchmark[^ ]*//' \
 		-e '/pytest-instafail/d' -e 's/--instafail//' \
 		-i pytest.ini || die
@@ -175,10 +175,11 @@ pkg_postinst() {
 		fi
 	fi
 
-	# TODO: left-out given be confusing while IUSE is masked anywhere
-#	if 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."
-#	fi
+	# only show qt6 warning on arches where USE=qt6 is unmasked
+	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
 }