gentoo resync : 29.10.2017

4 files changed, 46 insertions, 43 deletions

diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 50825baa6519..ab8768ee1b4e 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,8 +1,8 @@
-DIST qutebrowser-0.8.4.tar.gz 3040566 SHA256 f5ce98c5bc57ae29dc31f8896fad6911feab91277a9554761126219e0f8e8671 SHA512 0dc5c83f875a207cecb351b07895b48c3ad014f0ed7c45fce8023aa77f27f81f7ee2da2c376d0081760fb66fffcc811e3231d0aa50d19a7339b4cf5101eff9ad WHIRLPOOL 9bb957be49b9ca5b044fe582a7e77f7bed705f34c8329a8aaf907d93e9bb4e74103668abf2ac9e01403801099d3372e358652b758b2f01bee8fb881c8bcae683
 DIST qutebrowser-0.9.1.tar.gz 3091676 SHA256 5aabfd6824ece72a2ca2dd02f4ee47f5b3c48a289c9f3e1854d3b30e980dc95d SHA512 521bb306964865a17326701f8d4e46369583e8d81d4807ea2ee7252cbb734133ec06902780d191f8e8a95cb3ee4f9590d7bda223aa43bc25c986c343d6b17017 WHIRLPOOL 0f96d66033b53c0009db3dfa87b4fc5b53cc56ea4caf2f6388cdcd9f1721986cee6c6d04d3c376a9ee719483a6d6a9dea8e1501c612e46fdc9396b80ff2f7e5e
-EBUILD qutebrowser-0.8.4.ebuild 1936 SHA256 ff53a6e9d56a3d7dd45e320659c21f21aaddaeb73900b87a4066ccece09b08c1 SHA512 1bd81ca4b9e24eec59be7b5522502e54fe52c52490cb10f064be458d933d5b74dd4e7da18f623826f39c199667dd62b113dabdc1e45f660a9dd29d349b4d6277 WHIRLPOOL d1a3ab09b0d36c1b104d1b38753c4155f950087d9d08aea360c40efe2dc0cb656487e8a101c26dd15143687725c786e0f7b4e5596d02f040027c5c0572032897
+DIST qutebrowser-1.0.2.tar.gz 3272237 SHA256 f33281bd6d23bdfad7fbf8b85a01ae9cbc6bd343a957bbebcdd38f9ee8ae7624 SHA512 a2b548dd7577064000845e696b87d65e0d7452053741832036c6a89f5f3d1cf03a241e4c8c202c57bf87ecc843a7003dd3d5eb32169a32420345ff46e9cf3186 WHIRLPOOL e14c811c070e5a71adc9537115bd2a9e6c50fb8cdc4f285330c6d5e62721c8e21a5139a71cbcd72e372556fb09be1f3e52380829ed5ea74d71f87bf4158ee8b6
 EBUILD qutebrowser-0.9.1.ebuild 1952 SHA256 1c84f3a84a0ef84f13c12781284916adb8edd4e0413e92824449f41e23ebab43 SHA512 03c90528d5480ad59d9f0a157bee37b20d203ba08095709b5125b1edf17647afe96e8ca38e8f92a06904843c3da99527cfaa17cd6ceef63aed1c95e15d65dce2 WHIRLPOOL b6074455fbaf9fd22c41215d6176ad9838878c83e5205d86bb1a9ed61ed93aade4a1780ce11ea3ee78684b2047d689185ff0eaabdf79f008aa3e043cd74dbd1d
-EBUILD qutebrowser-9999.ebuild 2111 SHA256 cb047390f12878300aa90c1d4fb2294d707388718e50d63e271e6c517cefd2b1 SHA512 fa21fec5d4982bfc3ce2f61ef2dcb9d9e8339200e463689826e0340efb48e5ca05419224ecff98a69e8fbe56b8ab733ce3b31e53a4ef7e5d7c7aa40e42dec105 WHIRLPOOL fe5e15215749e8e60eadbfa77b8ea69b1b60fa3a734cda549af37a5816837a566fa33b05081fbc3ede6b31c6a5ae55769cdf413696a16842597f7047da4e256f
+EBUILD qutebrowser-1.0.2.ebuild 2237 SHA256 9dd81a65ebeb55a6773999d628441fcf1fb41b08d4f3f5ac30d9a1d8fe1e546f SHA512 37450af6a1636d9e9310a412470fa7c94c66eea3f0d2549374b6447fcfd8cc6a7dc7030833a4230b5d4f16a849c9cc5481d3bf26fb6fd890d70aee720bb8eaf6 WHIRLPOOL 2d07ad237e425e0fcd4cc88717a6bcea6d24e8e4ff3b9020a8120820bd77bca1268dc8833c6f9c19c372394c8bb8e439237e049ed2888c2b525ab9317e14bcb9
+EBUILD qutebrowser-9999.ebuild 1981 SHA256 e8c1a616adce0178467e8bb5aa97a6376c41632d20f2e90b1a296bc7c78d9acd SHA512 7e84a074b489c8abd6226ffba4e3169926b1f5c6e7362892968fcce562a87f4f3b93fdc2900a51a926c4e40e895a2487ea39cf86b41b49c60f87d30d1a668fd4 WHIRLPOOL c7947e58e81bc520c95d282a6d1930fa04ad81579065b4daed553c7c9e19170259d7710fca542b845960c1f36c4ef77d2a1c566411da5a008a72684de766aca4
 MISC ChangeLog 5368 SHA256 7238059888b60b1ad6390b40f17a8c419bec536b56d8ba8ed9ea74494b7dda4f SHA512 d2a7eac903dcecdef506d8dcd696747491264dbb077a8fa6e68032b4ca304f911426d15313fcf815da08ac159c5f9ba10adb4f0bba7f63ab3ef6ed99113ca6f5 WHIRLPOOL 618e3b2b36d9b34a620902895cf4340d6ce4f636814c6f38d9f63de12fb3f8c004204496f9799ba1556c8f5b3827e4835ad8935e5d397be0b0453146e65fdb24
 MISC ChangeLog-2015 601 SHA256 f8207f1b2aa1ed32d252028e2987aa863ae07ed28a1c240c21243eadf371dd48 SHA512 333f553b42617acacc46035e37e603f8c6926059dff52b872da807057d59bb4e12132b3d291068250241bb367ddd94c0b992fcd4ea381ccce532ba12f3cbac39 WHIRLPOOL 890c6b6a390c0ba358f320c2dae693c0c39c94c6188a3d9d3467968d5e10d5c5b6f77ef1b9c079d8cb63cdeb9d6553739f6c0cfa04ba2ed50c4bca22f5c69121
-MISC metadata.xml 460 SHA256 998c63853be5cbdb1fa4abe5f6cfe0f1f78d92cea687d540d3871cf04fd69829 SHA512 db701396e7cbd7c44ef3cf758daa2e1e6af00df5e5a65df7b138b34995c35ffc26d3af2cded41df1983a6d4ca5de8636e73915331c239613bc3e905569867768 WHIRLPOOL 502096d4e4530f8965b506cbe120228a335d5fe4393a1e0046cd777c6d664b53896270be2e5d5c5088c034eca7b8f59077a1668df0550fd0cc870b1625ead993
+MISC metadata.xml 445 SHA256 77a59f5e4a11966f20f68c6919c6b515fc38c73248a1593a62436c225a15110d SHA512 441a63c005894a6527b1521de85b2a26ba107c79fd0663521250808381fe2264972049d14585f153ba3a81d026d715f604382c40489da72398d9eb0fbfd5a6ed WHIRLPOOL 91a928502bd11865d1922878316dd018e6a67a8e9992117517a389bb67fde9f5ce196d85d0123954e010e19b48609ddfa50fb28ff8dc383904b0fc4d4808f68d
diff --git a/www-client/qutebrowser/metadata.xml b/www-client/qutebrowser/metadata.xml
index 0b5baae9f956..7623d04971cf 100644
--- a/www-client/qutebrowser/metadata.xml
+++ b/www-client/qutebrowser/metadata.xml
@@ -5,10 +5,10 @@
 		<email>radhermit@gentoo.org</email>
 		<name>Tim Harder</name>
 	</maintainer>
-	<use>
-		<flag name="webengine">Install packages required for
-		experimental rendering support with webengine.</flag>
-	</use>
+	<maintainer type="person">
+		<email>jsbronder@gentoo.org</email>
+		<name>Justin Bronder</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">qutebrowser/qutebrowser</remote-id>
 	</upstream>
diff --git a/www-client/qutebrowser/qutebrowser-0.8.4.ebuild b/www-client/qutebrowser/qutebrowser-1.0.2.ebuild
index 82042ee94095..aa893e7d04e9 100644
--- a/www-client/qutebrowser/qutebrowser-0.8.4.ebuild
+++ b/www-client/qutebrowser/qutebrowser-1.0.2.ebuild
@@ -1,41 +1,49 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 
-inherit gnome2-utils distutils-r1 eutils fdo-mime
+inherit distutils-r1 eutils gnome2-utils xdg-utils
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/The-Compiler/qutebrowser.git"
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/The-Compiler/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
-DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebKit"
-HOMEPAGE="http://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
+DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
+HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="gstreamer test"
+IUSE="test"
 
 COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${COMMON_DEPEND}
 	app-text/asciidoc
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 RDEPEND="${COMMON_DEPEND}
-	>=dev-python/cssutils-1.0.1[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
 	>=dev-python/pypeg2-2.15.2[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},gui,network,printsupport,webkit,widgets]
-	dev-python/sip[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
-	gstreamer? ( dev-qt/qtwebkit:5[gstreamer] )
+	>=dev-python/PyQt5-5.7.1[${PYTHON_USEDEP},declarative,gui,network,opengl,printsupport,sql,webengine,widgets]
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
 "
 
+if [[ ${PV} == "9999" ]] ; then
+	# Highlighting needed to create help files.  Alternatively,
+	# scripts/asciidoc2html.py could be patched to optionally set
+	# '--attribute pygments' when calling asciidoc
+	DEPEND="${DEPEND}
+		dev-util/source-highlight"
+fi
+
+# 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() {
@@ -52,9 +60,8 @@ python_test() {
 
 python_install_all() {
 	doman doc/${PN}.1
-	dodoc {CHANGELOG,CONTRIBUTING,FAQ,README}.asciidoc
 
-	domenu ${PN}.desktop
+	domenu misc/${PN}.desktop
 	doicon -s scalable icons/${PN}.svg
 
 	distutils-r1_python_install_all
@@ -66,7 +73,8 @@ pkg_preinst() {
 
 pkg_postinst() {
 	optfeature "PDF display support" www-plugins/pdfjs
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }
 
diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild
index 2688b7223b3c..0b25416e3db8 100644
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild
@@ -1,46 +1,41 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 
-inherit gnome2-utils distutils-r1 eutils fdo-mime
+inherit distutils-r1 eutils gnome2-utils xdg-utils
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/The-Compiler/qutebrowser.git"
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/The-Compiler/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
-DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebKit / QtWebEngine"
+DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
 HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="gstreamer test webengine +webkit"
-REQUIRED_USE="|| ( webengine webkit )"
+IUSE="test"
 
 COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${COMMON_DEPEND}
 	app-text/asciidoc
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 RDEPEND="${COMMON_DEPEND}
-	>=dev-python/cssutils-1.0.1[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
 	>=dev-python/pypeg2-2.15.2[${PYTHON_USEDEP}]
-	dev-python/PyQt5[${PYTHON_USEDEP},declarative,gui,network,printsupport,webengine?,webkit?,widgets]
-	dev-python/sip[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-5.7.1[${PYTHON_USEDEP},declarative,gui,network,opengl,printsupport,sql,webengine,widgets]
 	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-	gstreamer? ( dev-qt/qtwebkit:5[gstreamer] )
-	webengine? (
-		>=dev-python/PyQt5-5.7.1
-		>=dev-qt/qtwebengine-5.7.1:5
-	)
 "
 
+# 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() {
@@ -57,9 +52,8 @@ python_test() {
 
 python_install_all() {
 	doman doc/${PN}.1
-	dodoc {CHANGELOG,CONTRIBUTING,FAQ,README}.asciidoc
 
-	domenu ${PN}.desktop
+	domenu misc/${PN}.desktop
 	doicon -s scalable icons/${PN}.svg
 
 	distutils-r1_python_install_all
@@ -71,7 +65,8 @@ pkg_preinst() {
 
 pkg_postinst() {
 	optfeature "PDF display support" www-plugins/pdfjs
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 }