gentoo resync : 25.11.2020

3 files changed, 33 insertions, 96 deletions

diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 1096918b58f9..67e5bce38d7a 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,8 +1,6 @@
-DIST qutebrowser-1.12.0.tar.gz 3979851 BLAKE2B 1a55c8b10aea5b618c0aa730828a123b127f1185d4e3f57b48f5c741c1bd5600e92b5e1bd48a1d3df94449eec650bb6f0d8b84a0c1f6f5ece045a6a0bce5583f SHA512 a8d979310f7c00a64b8cf976529def09b9a42542c80dd7055e2a38a174d9ef51834de6e816739911454a73ad9cc79a7d3e1fcda7d76bade463bc253aeb9ef608
-DIST qutebrowser-1.13.0.tar.gz 4015550 BLAKE2B cc2f2779ca994da48e85156d5bba0a70f6f5380bc6c362e05944a2454e22ee99acf15875def448675ea86af8a919290dfaca5abf97ee5603e6c2b0d2ed41fabb SHA512 ee598db9416e4efcf5d8bc6aaa3d373637ed67f181e67e56c04fd7f2c12ebaf185f67a9463fff195d74ff7a239ce0a88c24bf35d3ad627116e2fa5ebed973d3d
 DIST qutebrowser-1.13.1.tar.gz 4027485 BLAKE2B cb19fa2baa447776e0d03128446619eeacd1049b30fcca26008e0cccb10594d1d32037643b3834297adef637328444aad33d84383bdc49307528321cfa2b846d SHA512 a3eb3845a896a88f755e4e7d336d86a8740be66ae94a8e19fb4739148ce1e66aa9fddec04df9308a51c8ef922fa28e3683bb911dd3ba7c91816c26ea92665cfd
-EBUILD qutebrowser-1.12.0.ebuild 2202 BLAKE2B b968f9fd07f5f6e7f045d64cb6c58eb803fe9fe86271bc2715c369fd31cd9b7fc150f60eed8384ec87bdb4fd2f1ef95607ece20bf881bdd6f87a9dacb8822642 SHA512 99d3bd12b01890cd3786384afeb0c994b600ed4414556d72d2344243f61ea26b276bccd32e13e86627c10bf6cb28b702b331ba3e8523e2972a4e8deec30c9b58
-EBUILD qutebrowser-1.13.0.ebuild 2202 BLAKE2B b968f9fd07f5f6e7f045d64cb6c58eb803fe9fe86271bc2715c369fd31cd9b7fc150f60eed8384ec87bdb4fd2f1ef95607ece20bf881bdd6f87a9dacb8822642 SHA512 99d3bd12b01890cd3786384afeb0c994b600ed4414556d72d2344243f61ea26b276bccd32e13e86627c10bf6cb28b702b331ba3e8523e2972a4e8deec30c9b58
+DIST qutebrowser-1.14.0.tar.gz 4144761 BLAKE2B cc220990c119904c18932b7f240e428fd36baaf42a592f8fe15e9a1b1e5506cf82291ac0365fd43c75ffa78b403cbe35616f8bd5b362a686db389f5ab7a02345 SHA512 7330b685b5852c7700738bf1063121c6cb19b190143e4b98680563ae1a6ce7affaf9691db8c3a4e3686172be7da26ce841709dbc5d31a941326d7432c857cb25
 EBUILD qutebrowser-1.13.1.ebuild 2140 BLAKE2B 518be42090995d3cd5a53f264fd1353b0785db1bdda30d14329ce2a8a30e53036625f3052b7d1d85314c3702cae750f00dcafb7a856cf64ad02da8dc8cf8a8d5 SHA512 5b4c289f695bdd1e00b5fb40deb1a9cc4df2e346c44609b6c35824f3a9b77d756382f9ac59eb67698533a1493341816ab7d0357efaf0ccf101a5499a3997fcc0
+EBUILD qutebrowser-1.14.0.ebuild 2656 BLAKE2B 2d6f001242e06437e6cdb3001c4c30091e3adc07bebee2b729e063e5332629298d51d3646cccde0e3b89f1d908e976d1ef94bc59441dc4952e55085da091440f SHA512 81a4f618a7363656ee3ed85dc5316cee186021b9dbbaaf2c760cf08d037bda50bec2908ba7973ad69a3e61fe6018f35c606b182abf4aed929795f4059dc3a295
 EBUILD qutebrowser-9999.ebuild 2244 BLAKE2B 38963dd9a4e547e53158da94d53ad56dc15b97234a532bc9bba46ae9775f21b8d8375c834b392b7d1a82f9764deaa521cce79b06554397a589ea9d5df28899d1 SHA512 d21fa64d00ec358918c1d17e6e06bf88b08c986895d2c10dac1e97bce11bdd4aa041ed0f435d058824df86a6bb05d29302cb37d765332df5e9ffa5f5fb884c61
 MISC metadata.xml 712 BLAKE2B 1ecb84f337927d3b9fa2f827a2296457322823c647ee033d803ae044f6d7bc6045d8e811e3c28024c45130ef3273f223605b8d604fe3da4e47751d9e0a9b2bcc SHA512 4e0ce844dd53b7beb6da2baab54adedaddf2bd075eac4904da20d9aeef0f75007a4e53cf3fe2954462c5f7e717cf7008fc6b878402fa787549766e9175e2d056
diff --git a/www-client/qutebrowser/qutebrowser-1.13.0.ebuild b/www-client/qutebrowser/qutebrowser-1.13.0.ebuild
deleted file mode 100644
index 173787fedaed..000000000000
--- a/www-client/qutebrowser/qutebrowser-1.13.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit desktop distutils-r1 optfeature xdg-utils
-
-DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
-HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="scripts test"
-
-BDEPEND="
-	app-text/asciidoc"
-RDEPEND="
-	>=dev-python/attrs-19.3.0[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/cssutils-1.0.2[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.11.2[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.6.1[${PYTHON_USEDEP}]
-	>=dev-python/pypeg2-2.15.2[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.14.1[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
-	>=dev-python/PyQtWebEngine-5.14.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP},libyaml]
-"
-
-distutils_enable_tests setup.py
-
-# Tests restricted as the deplist (misc/requirements/requirements-tests.txt)
-# isn't complete and X11 is required in order to start up qutebrowser.
-RESTRICT="test"
-
-python_compile_all() {
-	a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
-}
-
-python_install_all() {
-	doman doc/${PN}.1
-	domenu misc/org.${PN}.${PN}.desktop
-	doicon -s scalable icons/${PN}.svg
-
-	if use scripts; then
-		# Install only those userscripts that have an explicit license header
-		exeinto /usr/share/qutebrowser/userscripts/
-		doexe misc/userscripts/dmenu_qutebrowser
-		doexe misc/userscripts/openfeeds
-		doexe misc/userscripts/qute-keepass
-		doexe misc/userscripts/qute-pass
-		doexe misc/userscripts/rss
-		doexe misc/userscripts/tor_identity
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "PDF display support" www-plugins/pdfjs
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/www-client/qutebrowser/qutebrowser-1.12.0.ebuild b/www-client/qutebrowser/qutebrowser-1.14.0.ebuild
index 173787fedaed..9053e559b508 100644
--- a/www-client/qutebrowser/qutebrowser-1.12.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-1.14.0.ebuild
@@ -14,21 +14,21 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="scripts test"
 
 BDEPEND="
 	app-text/asciidoc"
 RDEPEND="
-	>=dev-python/attrs-19.3.0[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
-	>=dev-python/cssutils-1.0.2[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.11.2[${PYTHON_USEDEP}]
-	>=dev-python/markupsafe-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.6.1[${PYTHON_USEDEP}]
-	>=dev-python/pypeg2-2.15.2[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.14.1[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
-	>=dev-python/PyQtWebEngine-5.14.0[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/cssutils[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.7.1[${PYTHON_USEDEP}]
+	dev-python/pypeg2[${PYTHON_USEDEP}]
+	dev-python/PyQt5[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
+	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP},libyaml]
 "
 
@@ -48,14 +48,28 @@ python_install_all() {
 	doicon -s scalable icons/${PN}.svg
 
 	if use scripts; then
-		# Install only those userscripts that have an explicit license header
+		insinto /usr/share/qutebrowser/userscripts/
+		doins misc/userscripts/README.md
 		exeinto /usr/share/qutebrowser/userscripts/
-		doexe misc/userscripts/dmenu_qutebrowser
-		doexe misc/userscripts/openfeeds
-		doexe misc/userscripts/qute-keepass
-		doexe misc/userscripts/qute-pass
-		doexe misc/userscripts/rss
-		doexe misc/userscripts/tor_identity
+		doexe misc/userscripts/cast \
+		      misc/userscripts/dmenu_qutebrowser \
+		      misc/userscripts/format_json \
+		      misc/userscripts/getbib \
+		      misc/userscripts/open_download \
+		      misc/userscripts/openfeeds \
+		      misc/userscripts/password_fill \
+		      misc/userscripts/qute-bitwarden \
+		      misc/userscripts/qutedmenu \
+		      misc/userscripts/qute-keepass \
+		      misc/userscripts/qute-lastpass \
+		      misc/userscripts/qute-pass \
+		      misc/userscripts/readability \
+		      misc/userscripts/readability-js \
+		      misc/userscripts/ripbang \
+		      misc/userscripts/rss \
+		      misc/userscripts/taskadd \
+		      misc/userscripts/tor_identity \
+		      misc/userscripts/view_in_mpv
 	fi
 
 	distutils-r1_python_install_all