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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BD26D15800A for ; Wed, 30 Aug 2023 08:52:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 157DD2BC017; Wed, 30 Aug 2023 08:52:37 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 F10912BC017 for ; Wed, 30 Aug 2023 08:52:36 +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 2D8DE340C53 for ; Wed, 30 Aug 2023 08:52:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7FB62BDC for ; Wed, 30 Aug 2023 08:52:34 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1693385542.a0f7fa79d4df333865c7c90b93935e88fbf591cc.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/QtPy/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/QtPy/QtPy-2.4.0.ebuild X-VCS-Directories: dev-python/QtPy/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: a0f7fa79d4df333865c7c90b93935e88fbf591cc X-VCS-Branch: master Date: Wed, 30 Aug 2023 08:52:34 +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: 82723d4f-5975-4952-b6fe-c4bf75acf946 X-Archives-Hash: d6309a2a8b705951ad9fcc7bdb508089 commit: a0f7fa79d4df333865c7c90b93935e88fbf591cc Author: Andrew Ammerlaan gentoo org> AuthorDate: Wed Aug 30 08:50:49 2023 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Wed Aug 30 08:52:22 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0f7fa79 dev-python/QtPy: fix disabling of pyqt5 or pyqt6 The import statement now spans three lines which broke our sed Signed-off-by: Andrew Ammerlaan gentoo.org> dev-python/QtPy/QtPy-2.4.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-python/QtPy/QtPy-2.4.0.ebuild b/dev-python/QtPy/QtPy-2.4.0.ebuild index 677fc3b3bda7..e87365436358 100644 --- a/dev-python/QtPy/QtPy-2.4.0.ebuild +++ b/dev-python/QtPy/QtPy-2.4.0.ebuild @@ -159,10 +159,10 @@ src_prepare() { sed -i -e 's:--cov=qtpy --cov-report=term-missing::' pytest.ini || die # Disable Qt for Python implementations that are not selected if ! use pyqt5; then - sed -i -e "s/from PyQt5.QtCore import/raise ImportError #/" qtpy/__init__.py || die + sed -i -e '/from PyQt5.QtCore import/,/)/c\ \ \ \ \ \ \ \ raise ImportError #/' qtpy/__init__.py || die fi if ! use pyqt6; then - sed -i -e "s/from PyQt6.QtCore import/raise ImportError #/" qtpy/__init__.py || die + sed -i -e '/from PyQt6.QtCore import/,/)/c\ \ \ \ \ \ \ \ raise ImportError #/' qtpy/__init__.py || die fi if ! use pyside2; then sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die