gentoo resync : 25.09.2021

5 files changed, 94 insertions, 204 deletions

diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 18b027d3b807..34039ec51d4f 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,10 +1,8 @@
-DIST qutebrowser-2.1.1.tar.gz 6249239 BLAKE2B 941742728f305539b07f2c97198cb3154a2c9d60da3a25175c34875d647fae8f802deaf906ce688a3f81327560f8d9a740314cfdd8dc3aac767bd3aaec30f14d SHA512 85c81454406e25a347866984059923500a23dfe9d2427324d6998a9738962155442b69e3b6318c2683fb7790ba908e8486ea0d42073c38d7a5a1f249577c2b5d
-DIST qutebrowser-2.2.2.tar.gz 6314896 BLAKE2B e4396332b16ea71bc7dfa2d54a275b6058576f029406fd1164803447119474ac39c105e80ad45b4bdd3a217e2cf26e7b8efe76306e8f1ddcef23ebfd8bdf16f4 SHA512 ccb785374c083dbd8c6dd99d5427bbba2391c7e18a3d4453750a2a65cb4e82fdaa3065a29eef20f7a2766d9c672177ac3a0c8e6bf13b8e6dd090187986fb04c6
 DIST qutebrowser-2.2.3.tar.gz 6234298 BLAKE2B 7401241b5032bc2c98214930772a1228b9ef1cd9bdabba64295b10c7f0f8c0f336f321baeb4a25ffc7576328e9b838d6629b83c93a5c76defd4000743c4a859c SHA512 608a588ba670b60d6278bfcae324ca5c5454c4f932f7493189ae8666293a0077a2f2a0066211d080b649d180c687c14adbe075c6c92a411b88fee18446930c4e
 DIST qutebrowser-2.3.0.tar.gz 6244786 BLAKE2B 6722074efd854e70aeb40c5992277d0dad59045795c464ecea2b53fcd648b900054e9ad7d19cf2879d814624304a3827c166f495e721344ecc334aa0f49a0d39 SHA512 1f0afc642fe68d4524fa0263f8f196429710f1ae0a27edb43748a688f1eadd3dc42af82da96715b78cbe19e6d0e6c1e9604a55d6c5deb7ebc5eba97b9bfa118f
-EBUILD qutebrowser-2.1.1.ebuild 2791 BLAKE2B 90a2a6018c6cd28e57dcd0b5fe650b49f370f7384bfb6b69a49cd92c61db14fb2fedcc59fdd7a8ff6a7d0599c37049e6e6fb1676f5dd899b50de1753c51244cf SHA512 7c28e82135f002a852f8960078531d8eecf4bbe02ec504e2a70d6fdc26f492436b76d59756a3061ce5c292e9a625f2be1b6974ee3ef7b7f824d0705f33f52f43
-EBUILD qutebrowser-2.2.2.ebuild 2879 BLAKE2B 37e7737aded4f27ec3964e9ccdf7d3bd037a4352c53b68b1fbe7e6744c0296f00c56f4f0b6513967d90f4b18a4a433966c4879582b74bd869a17ccec3e82b304 SHA512 38f1269b86a9bf2ca9f27f0be6e164c4952fda9117a716110bb0b1703d502fad8eb658427bef7104033f82444fe601c6f3ea0473001d4ff0d5e655d71252ca25
+DIST qutebrowser-2.3.1.tar.gz 6244845 BLAKE2B 55dff9141e65f3e65701027e81106bc7b5ebe98d982111055d3b18ae91470603848107139845b1af248bb98074e39a2e7ceb9ab3e1bf523a52c81aaddda4f211 SHA512 1798e4659a8e53f53df6fe0307d6cfaf4641fda1b68facec90d825c0fa04ffa32867d51e45c92cd57ebbb4240085592dc8cd9fc120abea9803b2c1aab7205239
 EBUILD qutebrowser-2.2.3-r1.ebuild 2677 BLAKE2B aebb54126e50c2fae543e956e307999d76acbf06d5d085646c032e15251bc8c490a6d0a041464fe8612535c2efce6cfbc251e87befc7778bf3c7ee131483de16 SHA512 aa0048e53dfc4f7bb8ede59d23e32fb0b7e7061389e92e78a7f75d6ecfbd8ca4b093b6dd52ceffb7af67dd0fcf07f6ef3b9ab01ae89d7c319fd6978e64fcb87c
 EBUILD qutebrowser-2.3.0.ebuild 2652 BLAKE2B 484d6584fe5bc5f50d64bcd6bb95ce4bfd2aa1bd17f918b1b4a0896240ab7f6950a4e30ee916dc2bd3b9199206aaf1608a7fd515f6f8177529338524c218752e SHA512 e5462b578c441d5388b5e77c75bffb733bb061a46efef642f6a72d155187613a17e86f120dbecea5a6e4bceaa6036fafaf2f2dff8d792a0d905cdff646d44d2d
-EBUILD qutebrowser-9999.ebuild 3071 BLAKE2B 32ba24464d629b3c41b44fe154e6ba2329e58839e499afe0cb5266e0cb9369ba189587e993b4dec3597af7d64d95daffe5e0837a0d3d479ab3563cea087700d5 SHA512 5a655d6d23a18f5bc9c101861d426195513984e3a454c4031963d8dc1d59f0cd5139f7b4459a515a22b31ddd774a3a51be0a65481d8f6fe78602ed94469ec46e
+EBUILD qutebrowser-2.3.1.ebuild 2433 BLAKE2B 0d69b0eded34afbfac9e7593091ab07b75d3fb6b344bdc0b89292cddf759c25af0b4e99e110b5851cf8b42920aca27d11baa1e89d6b0bc56ae54a71b62b6fd67 SHA512 699a37119199e4da22deb74f9c6355f1576336ec397d181c77a4dfb01a31fc6d13cbe97c95fb45118429ae59abe1900d1f1a112a7efa6f646bdbc61f74ed4613
+EBUILD qutebrowser-9999.ebuild 2896 BLAKE2B 549f0bd0591b8424322dce3084b17972219c67f27413b65616c9e025b4820795e419b19103e253218c133419330c7931ed41ff2481cd101055ff7a25475b6ee4 SHA512 b6403374bd85e8ee99420cafac107c81f845ce72302ac4c891db5a46e396d01cff99e8f50964ae0dc6250075c231bd34414546952ff3e387d0f1e0bf2a06a500
 MISC metadata.xml 843 BLAKE2B 0eee30dbf7d7668960cdd6224102d16205d188b8d88a32619ddb6cd3142ca7c7d3d31537a7554d213ccb3b915bcdc4ddd2963aec223bc36a35d32ac330dd13b6 SHA512 5bd6354dc4bd676730e7e31bd96298a3c68d3ff3e22b456c5bbb6fb6ff741a5969c55d1b72f1c185f77ba9c1c0eb78f60ba6cad6eb341764dd55068a9be4e6de
diff --git a/www-client/qutebrowser/qutebrowser-2.1.1.ebuild b/www-client/qutebrowser/qutebrowser-2.1.1.ebuild
deleted file mode 100644
index 1260f00c148c..000000000000
--- a/www-client/qutebrowser/qutebrowser-2.1.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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},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
-		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-2.2.2.ebuild b/www-client/qutebrowser/qutebrowser-2.2.2.ebuild
deleted file mode 100644
index be33807c24d0..000000000000
--- a/www-client/qutebrowser/qutebrowser-2.2.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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-2.3.1.ebuild b/www-client/qutebrowser/qutebrowser-2.3.1.ebuild
new file mode 100644
index 000000000000..e11338abf31f
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-2.3.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit desktop distutils-r1 optfeature xdg
+
+DESCRIPTION="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="+adblock test"
+
+BDEPEND="app-text/asciidoc"
+RDEPEND=">=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_8)
+	>=dev-python/jinja-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-2.0.1[${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}]
+	adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests setup.py
+
+# Tests depend (misc/requirements/requirements-tests.txt) on plugins
+# we don't have packages for.
+RESTRICT="test"
+
+python_compile_all() {
+	a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
+}
+
+python_install_all() {
+	insinto /usr/share/metainfo
+	doins misc/org.qutebrowser.qutebrowser.appdata.xml
+	doman doc/${PN}.1
+	domenu misc/org.${PN}.${PN}.desktop
+	for s in 16 24 32 48 64 128 256 512; do
+		doicon -s ${s} icons/qutebrowser-${s}x${s}.png
+	done
+	doicon -s scalable icons/${PN}.svg
+
+	insinto /usr/share/qutebrowser/userscripts
+	doins misc/userscripts/README.md
+	exeinto /usr/share/qutebrowser/userscripts
+	for f in misc/userscripts/*; do
+		if [[ ${f} == __pycache__ ]]; then
+			continue
+		fi
+		doexe "${f}"
+	done
+
+	exeinto /usr/share/qutebrowser/scripts
+	for f in scripts/*; do
+		if [[ ${f} == scripts/__init__.py ||
+		      ${f} == scripts/__pycache__ ||
+		      ${f} == scripts/dev ||
+		      ${f} == scripts/testbrowser ||
+		      ${f} == scripts/asciidoc2html.py ||
+		      ${f} == scripts/setupcommon.py ||
+		      ${f} == scripts/link_pyqt.py ]]; then
+			continue
+		fi
+		doexe "${f}"
+	done
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "PDF display support" www-plugins/pdfjs
+}
diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild
index 8ed082ba920b..b9c6a309b372 100644
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..9} )
 DISTUTILS_USE_SETUPTOOLS="rdepend"
 
-inherit desktop distutils-r1 git-r3 optfeature xdg-utils
+inherit desktop distutils-r1 git-r3 optfeature xdg
 
-DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
+DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
 HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
 EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 IUSE="scripts test"
 
@@ -22,7 +22,7 @@ RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
 	dev-python/colorama[${PYTHON_USEDEP}]
 	dev-python/cssutils[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_{7,8})
+	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_8)
 	dev-python/jinja[${PYTHON_USEDEP}]
 	dev-python/markupsafe[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
@@ -88,14 +88,7 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	optfeature "PDF display support" www-plugins/pdfjs
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
+	xdg_pkg_postinst
 
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
+	optfeature "PDF display support" www-plugins/pdfjs
 }