Merge branch 'edge' into next

4 files changed, 22 insertions, 110 deletions

diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index d7fb97b47169..11e85440ba2e 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,6 +1,4 @@
-DIST qutebrowser-1.10.1.tar.gz 3096307 BLAKE2B d574660451563c16b82f968aafa6443e90e9b341628f508afc957e8ce263037ee564d236a2656e47b59e9d4d4d9347b21b41b752bf429e72df1a0961b491e411 SHA512 cc0a4743d3902f4263a844f810e6a7519a96a500306aabf75f54ed2389fa69fca05d634ab00ef49d091fa7986f9cabe61331a62a7f061a92f2a24eaf73d6e22c
-DIST qutebrowser-1.8.3.tar.gz 3634523 BLAKE2B c36abcbd99767e3dbc7113d6432c5b7b2e4062e8b2892dbc15c4ffcde1d7b8f2d918674e3f5f0acf6b5e45eef794019f0cda1d9462da614ece8d1582952a0a95 SHA512 9a3dc3040d1236c81933263e031db4d44c86be206c54f0787a73b2dd7d32d6e742f9ac80626163515e917fbc9fa1588f76afcb21f4b3d31f47ba386d06c3c6e7
-EBUILD qutebrowser-1.10.1.ebuild 2278 BLAKE2B 2fc864ef50847997f5d34fd998626aa5dc70f7c7d5b71c4e9fa67f983e8ba4ddf0384dac141127261c17bf335d2531e69a8017ca09a426e19fdf0499731e2c7c SHA512 3bbc36cfbc98e3a5c5804abc52b899e7599d0108616b5501fef6ff796e3c9f2405759e4ad7bf956fff0116eed686c3d6f897441a9c802e8e9c2a3b39d4cfedea
-EBUILD qutebrowser-1.8.3.ebuild 2234 BLAKE2B de6f00ea75a05364de008b217604c1de044f452f156556c72b65d39a95c502a98840face1d7eec79d614c3fb30e15eb0d72d1d5432ffa9fdf844dbc48e144ad0 SHA512 91e134fc094ec11921abf993acf3c9f45b732e290e8a6ceb0279e60c7095ddffdc5d26d6f1df07fba91f427d2acc1e02e16b390c37cd8ff08b4014447353bf6a
-EBUILD qutebrowser-9999.ebuild 2463 BLAKE2B 19b7e456cb5c66a5d2dfd5d3c554cf810a4774e94e03562881aabe9f73bf31919de36318a58c0153881cb7dc55676b1111b5d79731e69b6bd6cd44f81d24e94c SHA512 988000329752a588e6c98453d27b2de14acedaa1672f228174257964f60c8471666fc6211f8ea4bdebf6b248a7f49108e804784e592eef38f5ca548d715dd2d0
+DIST qutebrowser-1.11.1.tar.gz 6789139 BLAKE2B 0f13c30a629a7ce6339a8506f1a16bbe6123fd28de9ada2f8105a2434d8493549aa79e5d42e7b871dc25e23866b36ecbb712ddfdfc4db139b2a6ee712f8aeb4a SHA512 56f18bc4d9a64e37f73a6ea69953c1a6a06d88c033c2484528b19475616c3229c2aa75f4fbf27668aef7a08358491eb27b3d8e16049021478ba8b4be7433f61f
+EBUILD qutebrowser-1.11.1.ebuild 2198 BLAKE2B 8e24b987ad9f82d76b7c28e31249e2b816394a86d65ecb9cc7559f9ac1322054a1625576dd8d47fe036e68516ee145176d402a5e22d8512d3d5172aa8d748028 SHA512 6b9f463433cd6641a5810c3c1db85aa2c9e72077594c3445336ceaeeea25d09e00adfb83fa6fdfbf1aa9e0e92f7b7405fb73bce6215e55ed246bddaa3da75441
+EBUILD qutebrowser-9999.ebuild 2309 BLAKE2B 8ad5278826aca46bf3a087775c28978ef0d645acddf16c524c1555477dd626388ca5ebd1543a7516e0aa864b9ab8d2c56bce908312b7371e93c47f5c09e4d5c6 SHA512 40b5f53be2a741267ccf00903634b499ff3263aa85e5611fa113a312aa87856c08e38d954705c53eb74a7c1794367f5a42ae01cd9e2cc2cafedc50995e447da9
 MISC metadata.xml 604 BLAKE2B c597b4466b3954d0c328b376636a8dca286c212c3e857692ee5f039d94cb89c42cbb10e764c5323948cdb7a3d1fd11648bb057f65b7ee7b2e899529d294f7972 SHA512 92eeea88dbe246d8211a84d616772600aaeee95d9e135eb9b5ea38e488f844440ba97373fa302ee52f8486d7d1dae4c5008ce3e1ceaf3062e9d406b1ff0cb565
diff --git a/www-client/qutebrowser/qutebrowser-1.10.1.ebuild b/www-client/qutebrowser/qutebrowser-1.11.1.ebuild
index 456e8dc250d3..aa75aa620455 100644
--- a/www-client/qutebrowser/qutebrowser-1.10.1.ebuild
+++ b/www-client/qutebrowser/qutebrowser-1.11.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 inherit desktop distutils-r1 eutils xdg-utils
@@ -17,22 +17,23 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="scripts test"
 
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="
-	app-text/asciidoc
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+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.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.5.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[${PYTHON_USEDEP},libyaml]
+	>=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"
@@ -41,10 +42,6 @@ python_compile_all() {
 	a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
 }
 
-python_test() {
-	py.test tests || die "Tests failed with ${EPYTHON}"
-}
-
 python_install_all() {
 	doman doc/${PN}.1
 	domenu misc/org.${PN}.${PN}.desktop
diff --git a/www-client/qutebrowser/qutebrowser-1.8.3.ebuild b/www-client/qutebrowser/qutebrowser-1.8.3.ebuild
deleted file mode 100644
index b7fa15c6a63e..000000000000
--- a/www-client/qutebrowser/qutebrowser-1.8.3.ebuild
+++ /dev/null
@@ -1,77 +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} )
-
-inherit desktop distutils-r1 eutils 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="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="
-	app-text/asciidoc
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-RDEPEND="
-	>=dev-python/attrs-19.1.0[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/cssutils-1.0.2[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.4.2[${PYTHON_USEDEP}]
-	>=dev-python/pypeg2-2.15.2[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.12[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
-	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1.2[${PYTHON_USEDEP},libyaml]
-"
-
-# 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_test() {
-	py.test tests || die "Tests failed with ${EPYTHON}"
-}
-
-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-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild
index 759f00f43867..d5b853c5def0 100644
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 inherit desktop distutils-r1 eutils xdg-utils
 
@@ -22,38 +23,31 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE="scripts test"
 
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="
-	app-text/asciidoc
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+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.1[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.5.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[${PYTHON_USEDEP},libyaml]
+	>=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() {
-	if [[ ${PV} == "9999" ]]; then
-		"${EPYTHON}" scripts/asciidoc2html.py || die "Failed generating docs"
-	fi
-
 	a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
 }
 
-python_test() {
-	py.test tests || die "Tests failed with ${EPYTHON}"
-}
-
 python_install_all() {
 	doman doc/${PN}.1
 	domenu misc/org.${PN}.${PN}.desktop