From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A78A71382C5 for ; Wed, 6 Jan 2021 09:41:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D8A6BE085A; Wed, 6 Jan 2021 09:41:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BA3BBE085A for ; Wed, 6 Jan 2021 09:41:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C0699340EE0 for ; Wed, 6 Jan 2021 09:41:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2267F53 for ; Wed, 6 Jan 2021 09:41:45 +0000 (UTC) From: "Stefan Strogin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Stefan Strogin" Message-ID: <1609925936.dabe69bc128b5d8625736e4b9c679824ac893d3e.steils@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/qutebrowser/qutebrowser-9999.ebuild X-VCS-Directories: www-client/qutebrowser/ X-VCS-Committer: steils X-VCS-Committer-Name: Stefan Strogin X-VCS-Revision: dabe69bc128b5d8625736e4b9c679824ac893d3e X-VCS-Branch: master Date: Wed, 6 Jan 2021 09:41:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 69080f37-2682-4cf1-83c9-1ea227cd2360 X-Archives-Hash: 563cab41aae9eb0ce7cbbc33f3b60f9e commit: dabe69bc128b5d8625736e4b9c679824ac893d3e Author: Stefan Strogin gentoo org> AuthorDate: Wed Jan 6 09:18:02 2021 +0000 Commit: Stefan Strogin gentoo org> CommitDate: Wed Jan 6 09:38:56 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dabe69bc www-client/qutebrowser: update 9999 - Add missing dependencies. - Add new userscripts. - Drop python3_6. - Fix html docs. Closes: https://bugs.gentoo.org/760132 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Stefan Strogin gentoo.org> www-client/qutebrowser/qutebrowser-9999.ebuild | 55 +++++++++++++++++--------- 1 file changed, 36 insertions(+), 19 deletions(-) diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild index a1932f04f05..52116890c4c 100644 --- a/www-client/qutebrowser/qutebrowser-9999.ebuild +++ b/www-client/qutebrowser/qutebrowser-9999.ebuild @@ -1,23 +1,16 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8,9} ) +PYTHON_COMPAT=( python3_{7,8,9} ) DISTUTILS_USE_SETUPTOOLS="rdepend" -inherit desktop distutils-r1 optfeature 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 +inherit desktop distutils-r1 git-r3 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" +EGIT_REPO_URI="https://github.com/${PN}/${PN}.git" LICENSE="GPL-3" SLOT="0" @@ -29,9 +22,10 @@ RDEPEND=" dev-python/attrs[${PYTHON_USEDEP}] dev-python/colorama[${PYTHON_USEDEP}] dev-python/cssutils[${PYTHON_USEDEP}] + dev-python/importlib_resources[${PYTHON_USEDEP}] dev-python/jinja[${PYTHON_USEDEP}] dev-python/markupsafe[${PYTHON_USEDEP}] - >=dev-python/pygments-2.6.1[${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/PyQtWebEngine[${PYTHON_USEDEP}] @@ -44,6 +38,11 @@ distutils_enable_tests setup.py # isn't complete and X11 is required in order to start up qutebrowser. RESTRICT="test" +python_compile() { + ${EPYTHON} scripts/asciidoc2html.py || die + distutils-r1_python_compile +} + python_compile_all() { a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page" } @@ -54,14 +53,32 @@ python_install_all() { doicon -s scalable icons/${PN}.svg if use scripts; then - # Install only those userscripts that have an explicit license header + insinto /usr/share/qutebrowser/userscripts/ + doins misc/userscripts/README.md 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 + 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-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