gentoo resync : 25.08.2020

6 files changed, 93 insertions, 60 deletions

diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 937fcab8ddd9..20912ad53d7e 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,7 +1,8 @@
-AUX qutebrowser-1.11.1-session-restore.patch 2163 BLAKE2B bd71cebb3f7f19cfe5360cdfc945ac4676b78d15dcc34b6919c2a020a7bb5a4d1548847484469326790b44d05bfaf14b0d505b0e877da63158d2b0b4f9ed8a88 SHA512 bf648f72fd739fc14350b7bfbcdb2b5a24c8ab4dee6b98fc023be2698a2b57005e16bb04c0c64fe5fd2e640a9ca63c26ee6a245ea9ab7345436179c9145d4c31
-DIST qutebrowser-1.11.1.tar.gz 6789139 BLAKE2B 0f13c30a629a7ce6339a8506f1a16bbe6123fd28de9ada2f8105a2434d8493549aa79e5d42e7b871dc25e23866b36ecbb712ddfdfc4db139b2a6ee712f8aeb4a SHA512 56f18bc4d9a64e37f73a6ea69953c1a6a06d88c033c2484528b19475616c3229c2aa75f4fbf27668aef7a08358491eb27b3d8e16049021478ba8b4be7433f61f
 DIST qutebrowser-1.12.0.tar.gz 3979851 BLAKE2B 1a55c8b10aea5b618c0aa730828a123b127f1185d4e3f57b48f5c741c1bd5600e92b5e1bd48a1d3df94449eec650bb6f0d8b84a0c1f6f5ece045a6a0bce5583f SHA512 a8d979310f7c00a64b8cf976529def09b9a42542c80dd7055e2a38a174d9ef51834de6e816739911454a73ad9cc79a7d3e1fcda7d76bade463bc253aeb9ef608
-EBUILD qutebrowser-1.11.1-r1.ebuild 2252 BLAKE2B 84bf1336ed704d766a6aec05bd21310ba37595530020ca0f9a38742783ed8109b3d2bfe1225d790a5641f12c5d20378951ff87fb03e444e4e63cf67ed5ce60c9 SHA512 fcfc34a06c7441529b951ff52e37060976551837139a8c3f1986da196563025a8198a1948a07edbd70d7a1326b6185beed93eb745d38b71a3af1ae5526511216
+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 2198 BLAKE2B 8e24b987ad9f82d76b7c28e31249e2b816394a86d65ecb9cc7559f9ac1322054a1625576dd8d47fe036e68516ee145176d402a5e22d8512d3d5172aa8d748028 SHA512 6b9f463433cd6641a5810c3c1db85aa2c9e72077594c3445336ceaeeea25d09e00adfb83fa6fdfbf1aa9e0e92f7b7405fb73bce6215e55ed246bddaa3da75441
-EBUILD qutebrowser-9999.ebuild 2309 BLAKE2B 8ad5278826aca46bf3a087775c28978ef0d645acddf16c524c1555477dd626388ca5ebd1543a7516e0aa864b9ab8d2c56bce908312b7371e93c47f5c09e4d5c6 SHA512 40b5f53be2a741267ccf00903634b499ff3263aa85e5611fa113a312aa87856c08e38d954705c53eb74a7c1794367f5a42ae01cd9e2cc2cafedc50995e447da9
-MISC metadata.xml 604 BLAKE2B c597b4466b3954d0c328b376636a8dca286c212c3e857692ee5f039d94cb89c42cbb10e764c5323948cdb7a3d1fd11648bb057f65b7ee7b2e899529d294f7972 SHA512 92eeea88dbe246d8211a84d616772600aaeee95d9e135eb9b5ea38e488f844440ba97373fa302ee52f8486d7d1dae4c5008ce3e1ceaf3062e9d406b1ff0cb565
+EBUILD qutebrowser-1.13.0.ebuild 2198 BLAKE2B 8e24b987ad9f82d76b7c28e31249e2b816394a86d65ecb9cc7559f9ac1322054a1625576dd8d47fe036e68516ee145176d402a5e22d8512d3d5172aa8d748028 SHA512 6b9f463433cd6641a5810c3c1db85aa2c9e72077594c3445336ceaeeea25d09e00adfb83fa6fdfbf1aa9e0e92f7b7405fb73bce6215e55ed246bddaa3da75441
+EBUILD qutebrowser-1.13.1.ebuild 2129 BLAKE2B cea7571185f312afd81444771a89020e985a723207adca2bed0f3593755b8ccbbd8d1fd1ede17be5385c3b0ec40b95234cad6056e17fc2664f32e13aaa56b1c5 SHA512 e259bb70a559dfad2265fa8612100a4a8596eb29e33396fa98ae938fbf03ad7c0f1daabbbade0aa5ecbf3e658b8c87db54c05d65dc2538707ee11caf476f9e75
+EBUILD qutebrowser-9999.ebuild 2240 BLAKE2B 3761b84021b1c97d3c83402a8086ec66e0762c5d216f968360f816ba2ff8542fb36494514c865ad7db9394ccf225e1463580d8f77b9cc3ba4ec19fb838130cf1 SHA512 090530ca4c7e0d0239a06525e31b622867e504be5f60eb3d4211b0b8970c718ed9354dd8019d346dfcfa8681274cdc49a20fc325e83e88498d491e500e172410
+MISC metadata.xml 712 BLAKE2B 1ecb84f337927d3b9fa2f827a2296457322823c647ee033d803ae044f6d7bc6045d8e811e3c28024c45130ef3273f223605b8d604fe3da4e47751d9e0a9b2bcc SHA512 4e0ce844dd53b7beb6da2baab54adedaddf2bd075eac4904da20d9aeef0f75007a4e53cf3fe2954462c5f7e717cf7008fc6b878402fa787549766e9175e2d056
diff --git a/www-client/qutebrowser/files/qutebrowser-1.11.1-session-restore.patch b/www-client/qutebrowser/files/qutebrowser-1.11.1-session-restore.patch
deleted file mode 100644
index 060c94eee6b4..000000000000
--- a/www-client/qutebrowser/files/qutebrowser-1.11.1-session-restore.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 22e15acc1e617174a9fde3e53100a1b71ca7f462 Mon Sep 17 00:00:00 2001
-From: Florian Bruhin <me@the-compiler.org>
-Date: Tue, 26 May 2020 16:48:00 +0200
-Subject: [PATCH] Update Qt 5.15 session workaround for lazy_restore
-
-See #5359
-
-(cherry picked from commit 093a454bf4e386eda8715bc3ea2b217760d5f070)
-Upstream-Status: Accepted
-[https://github.com/qutebrowser/qutebrowser/commit/093a454bf4e386eda8715bc3ea2b217760d5f070
-expected in v1.12.0]
----
- qutebrowser/browser/webengine/webenginetab.py | 6 +++++-
- qutebrowser/html/warning-sessions.html        | 1 +
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
-index 647fa60abc..f61404f4ea 100644
---- a/qutebrowser/browser/webengine/webenginetab.py
-+++ b/qutebrowser/browser/webengine/webenginetab.py
-@@ -648,7 +648,11 @@ def load_items(self, items):
-         if qtutils.version_check('5.15', compiled=False):
-             # WORKAROUND for https://github.com/qutebrowser/qutebrowser/issues/5359
-             if items:
--                self._tab.load_url(items[-1].url)
-+                url = items[-1].url
-+                if ((url.scheme(), url.host()) == ('qute', 'back') and
-+                        len(items) >= 2):
-+                    url = items[-2].url
-+                self._tab.load_url(url)
-             return
- 
-         if items:
-diff --git a/qutebrowser/html/warning-sessions.html b/qutebrowser/html/warning-sessions.html
-index f93971c6ab..dd0c4127b6 100644
---- a/qutebrowser/html/warning-sessions.html
-+++ b/qutebrowser/html/warning-sessions.html
-@@ -15,6 +15,7 @@ <h1>{{ title }}</h1>
- 
- <ul>
-     <li>Loading a session with this release will <b>only load the most recently opened page</b> for every tab. As a result, the back/forward-history of every tab <b>will be lost</b> as soon as the session is saved again.</li>
-+    <li>Due to that, the <span class="mono">session.lazy_restore</span> setting does not have any effect.</li>
-     <li>A one-time backup of the session folder has been created at <span class="mono">{{ datadir }}{{ sep }}sessions{{ sep }}before-qt-515</span>.</li>
- </ul>
- 
diff --git a/www-client/qutebrowser/metadata.xml b/www-client/qutebrowser/metadata.xml
index c859c4f503cd..0e64656b39a6 100644
--- a/www-client/qutebrowser/metadata.xml
+++ b/www-client/qutebrowser/metadata.xml
@@ -9,6 +9,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>steils@gentoo.org</email>
+		<name>Stefan Strogin</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">qutebrowser/qutebrowser</remote-id>
 	</upstream>
diff --git a/www-client/qutebrowser/qutebrowser-1.11.1-r1.ebuild b/www-client/qutebrowser/qutebrowser-1.13.0.ebuild
index 2cfc68ac7db0..aa75aa620455 100644
--- a/www-client/qutebrowser/qutebrowser-1.11.1-r1.ebuild
+++ b/www-client/qutebrowser/qutebrowser-1.13.0.ebuild
@@ -38,8 +38,6 @@ distutils_enable_tests setup.py
 # isn't complete and X11 is required in order to start up qutebrowser.
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}"/${P}-session-restore.patch )
-
 python_compile_all() {
 	a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
 }
diff --git a/www-client/qutebrowser/qutebrowser-1.13.1.ebuild b/www-client/qutebrowser/qutebrowser-1.13.1.ebuild
new file mode 100644
index 000000000000..012258877ecc
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-1.13.1.ebuild
@@ -0,0 +1,75 @@
+# 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 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="
+	app-text/asciidoc"
+RDEPEND="
+	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.6.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]
+"
+
+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-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild
index d5b853c5def0..cbd3094d32d7 100644
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild
@@ -26,15 +26,15 @@ 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/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.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/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]
 "