From b7ebc951da8800f711142f69d9d958bde67a112d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 28 Apr 2019 09:54:45 +0100 Subject: gentoo resync : 28.04.2019 --- www-client/qutebrowser/Manifest | 4 +- www-client/qutebrowser/qutebrowser-1.6.1-r1.ebuild | 87 ++++++++++++++++++++++ www-client/qutebrowser/qutebrowser-1.6.1.ebuild | 83 --------------------- www-client/qutebrowser/qutebrowser-9999.ebuild | 6 +- 4 files changed, 94 insertions(+), 86 deletions(-) create mode 100644 www-client/qutebrowser/qutebrowser-1.6.1-r1.ebuild delete mode 100644 www-client/qutebrowser/qutebrowser-1.6.1.ebuild (limited to 'www-client/qutebrowser') diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest index fd248d4145a9..0c23cba052c0 100644 --- a/www-client/qutebrowser/Manifest +++ b/www-client/qutebrowser/Manifest @@ -1,6 +1,6 @@ DIST qutebrowser-1.6.0.tar.gz 3638739 BLAKE2B 8ca5995b9126fa7e017e3f2924c07c01b2d90540e0521d74cdba4ce8f2f83d1c7e8f0dc412ff41936c3a36c17d53060c331ed069d8088ac11b772979a48c7b0d SHA512 54b275f0d00ef48fa88a0bc83f31efd0d1fe708d7223adcf83c9d1a5db60de8e9c77033b8bf4b2b9a526d11ce39941d5d9da8afe9f49f3ed06e6f6f7ef124c20 DIST qutebrowser-1.6.1.tar.gz 3657215 BLAKE2B da8f4e725a6547b45993bf59b1128aa475656afa4b543a0edc2233bbcb1067a3159f791fd90028008f68cbd7389ae33deeecc158408e27f57b2ae35ca334ea20 SHA512 ff8c50dd8524f6f8623f0d5ae205355a2b86f70eff1320c3b47dad9cb2a481c372d82f698497c0d2745291962999ff111fade14141a8390e337343fb01145998 EBUILD qutebrowser-1.6.0.ebuild 2351 BLAKE2B fd82c398f2b73f5e2bf8de90b64246bff82d95fd99c7e3d64baffd96f993f8d8e396bdc4f4b83aa3af07092e36500f4656d49907d36b99e5300423b46a6d31c8 SHA512 f974bea576fd4cec11e32767156e0a7607eefbf059b2bea6940396ff5b992a30f1bd3dc09ae1fb8c93101a5185e72981b53a9c978da54b9991c266514d291859 -EBUILD qutebrowser-1.6.1.ebuild 2351 BLAKE2B fd82c398f2b73f5e2bf8de90b64246bff82d95fd99c7e3d64baffd96f993f8d8e396bdc4f4b83aa3af07092e36500f4656d49907d36b99e5300423b46a6d31c8 SHA512 f974bea576fd4cec11e32767156e0a7607eefbf059b2bea6940396ff5b992a30f1bd3dc09ae1fb8c93101a5185e72981b53a9c978da54b9991c266514d291859 -EBUILD qutebrowser-9999.ebuild 2361 BLAKE2B f0c23ba8f6b6de7b4e334d6d10340a2827ebe3838954cf9a8ef57eb0347d9b884f7699b0786396499fa5b6bc9e0c71e54315bf8eb63fa1ed76a5953c03486e3c SHA512 53fcc1c90cb6225c271f6d03bf1ab2c0d4f1e83e4b63dd00b86f9a98cdc35e836c35fb06f2f7f06a6aa4c582dd5883a3ec3f6203ef8be8bce689471272ed1998 +EBUILD qutebrowser-1.6.1-r1.ebuild 2522 BLAKE2B 0eef6585e93cccfb2c7afdc4528ece62578d12fd2eb731d8794b3f582592dee71242da36beeab4d62b89d4ee58807f05f3fcd0e7955aea8ca58d994b4c8801d0 SHA512 2755a791ed5633894ed76bd337dde0712cd7f24c9b7f53bf7935e9959c972f5340c56339149c90f71b1b07578fb25a5c3fe60308f208608600c1bf98c8debfa4 +EBUILD qutebrowser-9999.ebuild 2532 BLAKE2B cb3f420100e7071c43f859c210883f566aec699ce34d5e1183c958d50d1eb35ad9ab0e48431f73ec94ce0cc285d856bbb83f8022f5900e416f47d6301522e97b SHA512 0f4b818ca22ce1c01509469dbddb86c2d4bae94cb2d0fd82c5a470ba7eb28306f71604e2502057192e7c7d5146b3422819a2b0132d8f10c1dee9ffccf1fefba4 MISC metadata.xml 589 BLAKE2B 40485aca150508671b8b7fd65567c25abb73617b1f9d0d981c6ec9579b563904fefe5828e819276bb2c6e2c19883574334ffce0be7b047ad182bf3cdcadb70ea SHA512 e042cd2ad99080de919fce9f26a09cd6b1dd779cf2d2c8c26f8b214845635efc90e96e41acc025875ad7f8473ef750638ce4bf2f1ac3eeca6f7f762a44062ec0 diff --git a/www-client/qutebrowser/qutebrowser-1.6.1-r1.ebuild b/www-client/qutebrowser/qutebrowser-1.6.1-r1.ebuild new file mode 100644 index 000000000000..6cc99d532db9 --- /dev/null +++ b/www-client/qutebrowser/qutebrowser-1.6.1-r1.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2019 Gentoo Authors +# 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="scripts 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.12[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] + dev-python/PyQtWebEngine[${PYTHON_USEDEP}] ) + =dev-python/pyyaml-3.12[${PYTHON_USEDEP},libyaml] +" + +# 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 + + 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_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.6.1.ebuild b/www-client/qutebrowser/qutebrowser-1.6.1.ebuild deleted file mode 100644 index a464d065fdc3..000000000000 --- a/www-client/qutebrowser/qutebrowser-1.6.1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# 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="scripts 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,multimedia,gui,network,opengl,printsupport,sql,webengine,widgets] - >=dev-python/pyyaml-3.12[${PYTHON_USEDEP},libyaml] -" - -# 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 - - 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_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-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild index 67471c02f629..9808d790b8a3 100644 --- a/www-client/qutebrowser/qutebrowser-9999.ebuild +++ b/www-client/qutebrowser/qutebrowser-9999.ebuild @@ -30,7 +30,11 @@ RDEPEND="${COMMON_DEPEND} >=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,multimedia,gui,network,opengl,printsupport,sql,webengine,widgets] + || ( ( + >=dev-python/PyQt5-5.12[${PYTHON_USEDEP},declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] + dev-python/PyQtWebEngine[${PYTHON_USEDEP}] ) + =dev-python/pyyaml-3.12[${PYTHON_USEDEP},libyaml] " -- cgit v1.2.3