gentoo resync : 16.01.2018

3 files changed, 4 insertions, 91 deletions

diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index ccf78de62d4f..844e41a89972 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,8 +1,6 @@
-DIST qutebrowser-1.0.2.tar.gz 3272237 BLAKE2B 24a1e81678e99a1bf4d3c444e4da91898caa5b1bce7176ae59a34583bf476a24446f9d34d83e4c939697405454bf866071d18756d32d6cafad255fc175dd333b SHA512 a2b548dd7577064000845e696b87d65e0d7452053741832036c6a89f5f3d1cf03a241e4c8c202c57bf87ecc843a7003dd3d5eb32169a32420345ff46e9cf3186
-DIST qutebrowser-1.0.3-1.tar.gz 3289802 BLAKE2B 80b9f3e2f7cf9fc96ccaab752cc311135788c69f6ba3ca750570c919846aab46b92e8742c6400c01283e6d33fdccda2d94c3b136890cb0cb0dfbab03686e4324 SHA512 66bd486ddeee7e1a81a30175d7703d47947d9cbfea62e229f6886665039d68ef34cffd78a3ae9535fe77fcbc298d5a0cab5357d37705f25b40f91d3fc05dbf4c
 DIST qutebrowser-1.0.4.tar.gz 3354132 BLAKE2B 272372eee5e59f4f53ab53b535bdc504176e9ae91181ea96063bac3be827bf681539bab52af0be5bc55da4663c4f5b83edc7aa99d54dccd848c3c7bd38b48759 SHA512 197188e1145dcd59089efe4162e471c4d947e84aff2b0dd30582e19d0045a442e81d388e154335e5cce62dd132d379353db932825dbd2cd041372cca795f3e77
-EBUILD qutebrowser-1.0.2.ebuild 2262 BLAKE2B 0a6ee485987e402eb1cc32ccc0cef6c9a52da9389dc6378e47ac74fe17d57550b0073fbff101fd5581716b85369327605c77bc0b1d047b82867ff18f6ff36876 SHA512 df7effaa910eb1c98e40dd5f55436ec76d3c6a1e153c860e77af69b38d2fc79e1e6308edbd410bd5d0560327397a9f030da3e41cff7cae80b1f7b5de21e56569
-EBUILD qutebrowser-1.0.3.ebuild 2007 BLAKE2B a64dbf0fe8234a91caf78c059dc88bb15c8dc655f143b52c06c13d3fbcf2a9b8f75c34a547bd67961d5192560b383dab63be8ab3c325160a8467f082700a847a SHA512 461efe93b386dec158e1b2d2db45e153f563993bbdaf4ed2d148d631bd1cf813843cceb76184493694c042a75a8c8a4636b5b33aab5a732e7e39c88e67b62c77
+DIST qutebrowser-1.1.0.tar.gz 3468120 BLAKE2B fbde2b6ae685c8d9f2ac9e15a6454f6015351d96bd0886dddfa3e58a1d54a6cedead58cea8dc0a7e95cc504771ad62c74145f547a0a778a4194c2d6b1650862b SHA512 6f14869c787c6140716c0686f9e3abfb44303dd3b04d9d0443c672065c1585c108d87f088ca7254926c077a916e891242ae53c36a2bb6028921462955d083571
 EBUILD qutebrowser-1.0.4.ebuild 2005 BLAKE2B 03a01c10c1d39b85b98fd500a52ebdc62367f046bfafbae315827711f09501ccb9125f68124949844518ff3c1e8127a46742f70d4b02fc1e1f4ae4c6e4e248bd SHA512 51821081bdfc9a4650343c99fea14fdb7599f1691cd22014933a04303e92947aa73d9016531b21ca8a601374cd7a7b2a46c9bb18ca0841c9ac0915aef698d247
+EBUILD qutebrowser-1.1.0.ebuild 2005 BLAKE2B 330559c2ca17ccba51df27f172f9b304186cf895d5eae00b7e0b0876057377fd4aff859f7e72ae7b7fae1a81c00485be8511ff501973915bc1962914b3d60793 SHA512 b7de83ed4059748b04d6f65bdc1456f9c2211f1ba8e1a81f998b5bcf659ad7d790a1584c88ab811768b2862d257714f81164b9f10b5952855c818662475c0e36
 EBUILD qutebrowser-9999.ebuild 2005 BLAKE2B 03a01c10c1d39b85b98fd500a52ebdc62367f046bfafbae315827711f09501ccb9125f68124949844518ff3c1e8127a46742f70d4b02fc1e1f4ae4c6e4e248bd SHA512 51821081bdfc9a4650343c99fea14fdb7599f1691cd22014933a04303e92947aa73d9016531b21ca8a601374cd7a7b2a46c9bb18ca0841c9ac0915aef698d247
 MISC metadata.xml 445 BLAKE2B 11eed2c826838fbdf314c3c1a070bf152fd440891896e5adf6614c29685a4a4c4f5bf46e767de31ef7fbe3ee057ae752f12cfa078c5dda41860cf41708844d2e SHA512 441a63c005894a6527b1521de85b2a26ba107c79fd0663521250808381fe2264972049d14585f153ba3a81d026d715f604382c40489da72398d9eb0fbfd5a6ed
diff --git a/www-client/qutebrowser/qutebrowser-1.0.2.ebuild b/www-client/qutebrowser/qutebrowser-1.0.2.ebuild
deleted file mode 100644
index 68396ff73a44..000000000000
--- a/www-client/qutebrowser/qutebrowser-1.0.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6} )
-
-inherit distutils-r1 eutils gnome2-utils xdg-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit git-r3
-else
-	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 QtWebEngine"
-HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
-
-LICENSE="GPL-3"
-SLOT="0"
-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/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-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() {
-	if [[ ${PV} == "9999" ]]; then
-		"${PYTHON}" 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/${PN}.desktop
-	doicon -s scalable icons/${PN}.svg
-
-	distutils-r1_python_install_all
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	optfeature "PDF display support" www-plugins/pdfjs
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/www-client/qutebrowser/qutebrowser-1.0.3.ebuild b/www-client/qutebrowser/qutebrowser-1.1.0.ebuild
index 389a61a8d828..e7535337c44e 100644
--- a/www-client/qutebrowser/qutebrowser-1.0.3.ebuild
+++ b/www-client/qutebrowser/qutebrowser-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}-1.tar.gz"
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi