gentoo auto-resync : 04:11:2022 - 09:13:50

5 files changed, 28 insertions, 15 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 0aa703de8988..a58c49743f36 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 09b3fbe136f8..a5fe94b96855 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,5 +1,5 @@
 DIST qutebrowser-2.5.2.tar.gz 6114611 BLAKE2B 5f56e1e2c390bb2f36c95e25a2dae9e5203020ff6b2cf1e13092cf493efa950b24b8ff8f23af6eed93ca8b316e30f86715ecd2f2eb28c341210de0b25c9f67ad SHA512 4751ea1a5b1776f085fcd1f9ab5ff805155fca34d0272ba8eb6574f9074257929c3fb5b50c9053a522bfb346aee1a2551b58cf933c6ff7c5c84fd10559ec36fc
-EBUILD qutebrowser-2.5.2.ebuild 4394 BLAKE2B 9b4067e5b27e4829fcbc43cac1b169f57d2d48b2d0df17078f860c7af4f2d86b20e97c61f97ec07c0e60a1becb6f781ad569e4e21be88bfb7b8ce6a0d6996d36 SHA512 910178261dfc105b66bc022ff8d57f1d4ea2fcbfb43a68de1063bfcc2f16de00af134893a678a2433d5b2168af898aaa35e1f451e6ad65b130d8a6757ba4c712
-EBUILD qutebrowser-3.0.0_pre9999.ebuild 6083 BLAKE2B dfe4eebae0143d8a5f0cb312e6350176e65d41d896079795310cec698e798a18287bdc832f788d2515bef2c1a2cc3b332e1a79e492ec270aca6276adf59e1f07 SHA512 35536b970722ce57c8c302df4a04edebe823e8a2fef950a819a7fa2fd65357d3b32d4ad673fd184a71241caaab099ec2f7d8ac1df4ba029a65568ae8f6e2f3f0
-EBUILD qutebrowser-9999.ebuild 4395 BLAKE2B 37a65f3536dcb35976669004fcdb43130891518603316171bc4289f6389dd7619d7d79ab1f21b87449052d9bb8e7b724a394152bc8ab8062701a0191c102ce67 SHA512 9d43d1a8b04194f9d5120bf15c5e4c0572a0d157b9392eeb9f4e29ef844f56811077730adda540d2bade54922a25c988a9fbc1bed1febdf74871e5dfa97819ac
+EBUILD qutebrowser-2.5.2.ebuild 4473 BLAKE2B 7a4cbac998feb87739829bff747dea40a3eb1e77a932b8805ab6b3c5352055304df8fce8d56d4303d295e95db75264803137b214a1592801f9a6661b48954729 SHA512 d2ec602142662483895adf2d0852b0d804c50652af3a3a5ca8f350261685a827a5b85dc1541b26dc85f960bf00bd04cdd217b3c91c58893e2393a40454f162f0
+EBUILD qutebrowser-3.0.0_pre9999.ebuild 6192 BLAKE2B ed41317cd7bf1d417078b947e27db97433474933970c75da8b5e5a7e3c2da028ac506dcd6c13898f20d213035a887dfbf730dc6b701f525a8ac65658794cc926 SHA512 f71e025301089f579ca54dc34996282fef7b6ec5c1736cae8ef8830bbfff4cb23205ac68f5e3bae65bb04810b649e516e5bfd12afc9188cd1c2aca24ec541d97
+EBUILD qutebrowser-9999.ebuild 4474 BLAKE2B 58bd61b320fff4dfe9c2fb99d64a5c6585120490269c43b8041c393a7ed003b16795884b00d2e6f24aef385813e35e7f2e28f19931ec2accf9fe4877641baf4a SHA512 a3796d16fca4dc236305b7878277f77b86bc023fea507ce9fff7e1c43eab1904cc3fa0725c91cd86a4c5f8ec2900f75cb18ca18ad197e180dc7c48986f801deb
 MISC metadata.xml 1018 BLAKE2B 9d0c406995b2036671113b6513c3ed2fdb5021eae9d1dde5c186efeccdde6dae127857e3e5898f7809edcc27eca4b47f37965155ac0ff21bedb78e242421fd54 SHA512 2af79f18d31f9efe8df852f4bca132caf1d79fc06f6388959deb367470d4975af541a75c70831b549d944112bcd0bc7e11510a81bce4ef1391fbf1354425b769
diff --git a/www-client/qutebrowser/qutebrowser-2.5.2.ebuild b/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
index b531a2983052..d3151e4cf8de 100644
--- a/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..11} )
-inherit distutils-r1 optfeature xdg
+inherit distutils-r1 xdg
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -21,7 +21,7 @@ HOMEPAGE="https://www.qutebrowser.org/"
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="+adblock widevine"
+IUSE="+adblock pdf widevine"
 
 RDEPEND="
 	dev-qt/qtcore:5[icu]
@@ -37,6 +37,7 @@ RDEPEND="
 		dev-python/pyyaml[${PYTHON_USEDEP},libyaml(+)]
 		dev-python/zipp[${PYTHON_USEDEP}]
 		adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )')
+	pdf? ( <www-plugins/pdfjs-3 )
 	widevine? ( www-plugins/chrome-binary-plugins )"
 BDEPEND="
 	$(python_gen_cond_dep '
@@ -59,6 +60,11 @@ distutils_enable_tests pytest
 src_prepare() {
 	distutils-r1_src_prepare
 
+	if use pdf; then
+		sed '/^content.pdfjs:/,+1s/false/true/' \
+			-i ${PN}/config/configdata.yml || die
+	fi
+
 	if use widevine; then
 		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}'" \
@@ -116,8 +122,6 @@ python_install_all() {
 pkg_postinst() {
 	xdg_pkg_postinst
 
-	optfeature "PDF display support" www-plugins/pdfjs
-
 	if [[ ! ${REPLACING_VERSIONS} ]]; then
 		elog "Note that optional scripts in ${EROOT}/usr/share/${PN}/{user,}scripts"
 		elog "have additional dependencies not covered by this ebuild, for example"
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild b/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild
index 28af4e718008..19f356ecb5d7 100644
--- a/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..11} )
-inherit distutils-r1 multiprocessing optfeature xdg
+inherit distutils-r1 multiprocessing xdg
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -22,7 +22,7 @@ HOMEPAGE="https://www.qutebrowser.org/"
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="+adblock +qt6 widevine"
+IUSE="+adblock pdf +qt6 widevine"
 
 RDEPEND="
 	$(python_gen_cond_dep '
@@ -40,6 +40,7 @@ RDEPEND="
 		$(python_gen_cond_dep '
 			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]
@@ -47,6 +48,7 @@ RDEPEND="
 		$(python_gen_cond_dep '
 			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 )"
 BDEPEND="
@@ -73,6 +75,11 @@ distutils_enable_tests pytest
 src_prepare() {
 	distutils-r1_src_prepare
 
+	if use pdf; then
+		sed '/^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
 		local widevine=${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so
@@ -146,8 +153,6 @@ pkg_preinst() {
 pkg_postinst() {
 	xdg_pkg_postinst
 
-	optfeature "PDF display support" www-plugins/pdfjs
-
 	if [[ ! ${REPLACING_VERSIONS} ]]; then
 		elog "Note that optional scripts in ${EROOT}/usr/share/${PN}/{user,}scripts"
 		elog "have additional dependencies not covered by this ebuild, for example"
diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild
index 9721e0227ee9..0521c244a164 100644
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..11} )
-inherit distutils-r1 optfeature xdg
+inherit distutils-r1 xdg
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -21,7 +21,7 @@ HOMEPAGE="https://www.qutebrowser.org/"
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="+adblock widevine"
+IUSE="+adblock pdf widevine"
 
 RDEPEND="
 	dev-qt/qtcore:5[icu]
@@ -37,6 +37,7 @@ RDEPEND="
 		dev-python/pyyaml[${PYTHON_USEDEP},libyaml(+)]
 		dev-python/zipp[${PYTHON_USEDEP}]
 		adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )')
+	pdf? ( <www-plugins/pdfjs-3 )
 	widevine? ( www-plugins/chrome-binary-plugins )"
 BDEPEND="
 	$(python_gen_cond_dep '
@@ -59,6 +60,11 @@ distutils_enable_tests pytest
 src_prepare() {
 	distutils-r1_src_prepare
 
+	if use pdf; then
+		sed '/^content.pdfjs:/,+1s/false/true/' \
+			-i ${PN}/config/configdata.yml || die
+	fi
+
 	if use widevine; then
 		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}'" \
@@ -116,8 +122,6 @@ python_install_all() {
 pkg_postinst() {
 	xdg_pkg_postinst
 
-	optfeature "PDF display support" www-plugins/pdfjs
-
 	if [[ ! ${REPLACING_VERSIONS} ]]; then
 		elog "Note that optional scripts in ${EROOT}/usr/share/${PN}/{user,}scripts"
 		elog "have additional dependencies not covered by this ebuild, for example"