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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 68DFB158020 for ; Sat, 17 Dec 2022 11:45:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7B1B5E0843; Sat, 17 Dec 2022 11:45:38 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5DF09E0843 for ; Sat, 17 Dec 2022 11:45:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2628033BE33 for ; Sat, 17 Dec 2022 11:45:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5BA1D72B for ; Sat, 17 Dec 2022 11:45:35 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1671277467.8e552d249c84b94f57ef6891fa9c88e3a5073a2a.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild www-client/qutebrowser/qutebrowser-9999.ebuild X-VCS-Directories: www-client/qutebrowser/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 8e552d249c84b94f57ef6891fa9c88e3a5073a2a X-VCS-Branch: master Date: Sat, 17 Dec 2022 11:45:35 +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: 90b23705-3f3a-4ddd-9e71-19b58577fa1d X-Archives-Hash: dd20a91b037f923d2430d0481653b6c7 commit: 8e552d249c84b94f57ef6891fa9c88e3a5073a2a Author: Ionen Wolkens gentoo org> AuthorDate: Sat Dec 17 11:25:45 2022 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Sat Dec 17 11:44:27 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e552d24 www-client/qutebrowser: adjust asciidoc call for live Upstream now calls `python3 -m asciidoc` to simplify some venv/pip handling but, given asciidoc is single target, matching pythons over this would be inconvenient (aka fails if asciidoc is 3.10 and qutebrowser is 3.11). Alternatively could make asciidoc multi-target but this works just fine if just swap it out for ["asciidoc"]. May review this solution eventually but won't worry too much if it's for live-only. Signed-off-by: Ionen Wolkens gentoo.org> www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild | 9 +++++++-- www-client/qutebrowser/qutebrowser-9999.ebuild | 8 +++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild b/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild index 19f356ecb5d7..08fc978ae6f4 100644 --- a/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild +++ b/www-client/qutebrowser/qutebrowser-3.0.0_pre9999.ebuild @@ -94,8 +94,13 @@ src_prepare() { # let eclass handle python sed -i '/setup.py/d' misc/Makefile || die - # live version lacks pre-generated docs - [[ ${PV} != *9999 ]] || ${EPYTHON} scripts/asciidoc2html.py || die + if [[ ${PV} == *9999 ]]; then + # call asciidoc(1) rather than the single target python module + sed '/cmdline = /s/= .*/= ["asciidoc"]/' \ + -i scripts/asciidoc2html.py || die + + "${EPYTHON}" scripts/asciidoc2html.py || die + fi # disable unnecessary tests/plugins that need extras (_ignore not enough) sed -e '/pytest-benchmark/d' -e 's/--benchmark[^ ]*//' \ diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild index 0521c244a164..c4bb985b2edc 100644 --- a/www-client/qutebrowser/qutebrowser-9999.ebuild +++ b/www-client/qutebrowser/qutebrowser-9999.ebuild @@ -74,7 +74,13 @@ src_prepare() { # let eclass handle python sed -i '/setup.py/d' misc/Makefile || die - [[ ${PV} != 9999 ]] || ${EPYTHON} scripts/asciidoc2html.py || die + if [[ ${PV} == 9999 ]]; then + # call asciidoc(1) rather than the single target python module + sed '/cmdline = /s/= .*/= ["asciidoc"]/' \ + -i scripts/asciidoc2html.py || die + + "${EPYTHON}" scripts/asciidoc2html.py || die + fi # these plugins/tests are unnecessary here and have extra dependencies sed -e '/pytest-benchmark/d;s/--benchmark[^ ]*//' \