gentoo resync : 28.04.2021

4 files changed, 104 insertions, 5 deletions

diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 068f77c49978..0c4f2330a769 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,4 +1,6 @@
-DIST qutebrowser-2.1.0.tar.gz 6246732 BLAKE2B 8765112265a3b0852ef4f55aae2e69e0d6d623d218ed40c54e0a5d7a76ac9ed83885fa83a3112419f1b01316c3ae06934e89f316d280c2ecfabf70966bde0ddb SHA512 eec5ebc8cd4ba530cccd8296320768a3824c4f0828c806523acd95762a3dc9a40019b22b9e9219b27d1078648b78f861c6f3792ccfe991c0bdd4b3b95a009c2e
-EBUILD qutebrowser-2.1.0.ebuild 2749 BLAKE2B 4b8edf2b84f94236c092a1636ef92c7107222cecab1df4b56ebe521280263bdd78cef52db1c47a523a3c88c90804400780877ac1c548a074c0e2d4af7826bb94 SHA512 f1be68c4ceca42c51f24c2c9a6b9b712ba72c822b063e010d3385d83305f2bd5da11361ce5d35af8bc1416239b0f3e23a6a40c33fc64edb5aa7c36d1b4dbcc0a
-EBUILD qutebrowser-9999.ebuild 2941 BLAKE2B dee8c19bf858809a1e5cde8afa8d4398c5c37bae0b55874b479d6724f08a931e952e98240e4d46db883029dd3f8cfb4a70f934f14aa38413ad0b6d436f1c0578 SHA512 63804c31cb48ce5d857d7833d15277fad73fe95b294a2de7379294380980707a56ddcbe92c1841383cb97b6d94451406c7955a87459d52d1d3dad8c056ed04d4
+DIST qutebrowser-2.1.1.tar.gz 6249239 BLAKE2B 941742728f305539b07f2c97198cb3154a2c9d60da3a25175c34875d647fae8f802deaf906ce688a3f81327560f8d9a740314cfdd8dc3aac767bd3aaec30f14d SHA512 85c81454406e25a347866984059923500a23dfe9d2427324d6998a9738962155442b69e3b6318c2683fb7790ba908e8486ea0d42073c38d7a5a1f249577c2b5d
+DIST qutebrowser-2.2.0.tar.gz 6297885 BLAKE2B c43d5fdefe4fdabf479b7575ffc1582340aa6ca3add7f717a4d46ebe24fd086c26e57bee0932262e997abf5a2ce9c636732c83d8659617b16f9a040c196fad68 SHA512 79cc35d47a48d4eef8abb95082aa047a63356f53ac94027b48fbd679621f172e5fa4863af21e2398c6ec37b554871ca96e7338381aee2e0b01f6e1d661823fbc
+EBUILD qutebrowser-2.1.1.ebuild 2791 BLAKE2B 90a2a6018c6cd28e57dcd0b5fe650b49f370f7384bfb6b69a49cd92c61db14fb2fedcc59fdd7a8ff6a7d0599c37049e6e6fb1676f5dd899b50de1753c51244cf SHA512 7c28e82135f002a852f8960078531d8eecf4bbe02ec504e2a70d6fdc26f492436b76d59756a3061ce5c292e9a625f2be1b6974ee3ef7b7f824d0705f33f52f43
+EBUILD qutebrowser-2.2.0-r1.ebuild 2879 BLAKE2B 37e7737aded4f27ec3964e9ccdf7d3bd037a4352c53b68b1fbe7e6744c0296f00c56f4f0b6513967d90f4b18a4a433966c4879582b74bd869a17ccec3e82b304 SHA512 38f1269b86a9bf2ca9f27f0be6e164c4952fda9117a716110bb0b1703d502fad8eb658427bef7104033f82444fe601c6f3ea0473001d4ff0d5e655d71252ca25
+EBUILD qutebrowser-9999.ebuild 3071 BLAKE2B 32ba24464d629b3c41b44fe154e6ba2329e58839e499afe0cb5266e0cb9369ba189587e993b4dec3597af7d64d95daffe5e0837a0d3d479ab3563cea087700d5 SHA512 5a655d6d23a18f5bc9c101861d426195513984e3a454c4031963d8dc1d59f0cd5139f7b4459a515a22b31ddd774a3a51be0a65481d8f6fe78602ed94469ec46e
 MISC metadata.xml 742 BLAKE2B 3410b02e22887bb80f47c72888bbbe12505686aef9a83e7fa8c66fa01dcd16f0b60511c9cb9953aa087c89e62eac5845ea7db155014b978fed66c35ecefe8780 SHA512 22873bfafc2654f695eb90182c922ebd9465b3f7b3bbfca4199ef6684b65c3a28a8164a2045c823017cd6beab1ed65d00fc56904f6686bc98acca6145e80abe0
diff --git a/www-client/qutebrowser/qutebrowser-2.1.0.ebuild b/www-client/qutebrowser/qutebrowser-2.1.1.ebuild
index defe2baa7c46..1260f00c148c 100644
--- a/www-client/qutebrowser/qutebrowser-2.1.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.1.1.ebuild
@@ -62,6 +62,7 @@ python_install_all() {
 		      misc/userscripts/qute-bitwarden \
 		      misc/userscripts/qutedmenu \
 		      misc/userscripts/qute-keepass \
+		      misc/userscripts/qute-keepassxc \
 		      misc/userscripts/qute-lastpass \
 		      misc/userscripts/qute-pass \
 		      misc/userscripts/readability \
diff --git a/www-client/qutebrowser/qutebrowser-2.2.0-r1.ebuild b/www-client/qutebrowser/qutebrowser-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..be33807c24d0
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-2.2.0-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+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 ~arm64 ~x86"
+IUSE="scripts test"
+
+BDEPEND="
+	app-text/asciidoc"
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_{7,8})
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
+	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+
+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
+		insinto /usr/share/qutebrowser/userscripts/
+		doins misc/userscripts/README.md
+		exeinto /usr/share/qutebrowser/userscripts/
+		doexe misc/userscripts/add-nextcloud-bookmarks \
+		      misc/userscripts/add-nextcloud-cookbook \
+		      misc/userscripts/cast \
+		      misc/userscripts/dmenu_qutebrowser \
+		      misc/userscripts/format_json \
+		      misc/userscripts/getbib \
+		      misc/userscripts/kodi \
+		      misc/userscripts/open_download \
+		      misc/userscripts/openfeeds \
+		      misc/userscripts/password_fill \
+		      misc/userscripts/qr \
+		      misc/userscripts/qute-bitwarden \
+		      misc/userscripts/qutedmenu \
+		      misc/userscripts/qute-keepass \
+		      misc/userscripts/qute-keepassxc \
+		      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
+}
+
+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 255fa35da86c..8ed082ba920b 100644
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild
@@ -27,9 +27,11 @@ RDEPEND="
 	dev-python/markupsafe[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/pypeg2[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
+	dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets]
 	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP},libyaml]
+	>=dev-python/pyyaml-5.4.1[${PYTHON_USEDEP},libyaml]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests setup.py
@@ -70,6 +72,7 @@ python_install_all() {
 		      misc/userscripts/qute-bitwarden \
 		      misc/userscripts/qutedmenu \
 		      misc/userscripts/qute-keepass \
+		      misc/userscripts/qute-keepassxc \
 		      misc/userscripts/qute-lastpass \
 		      misc/userscripts/qute-pass \
 		      misc/userscripts/readability \