From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1715111-garchives=archives.gentoo.org@lists.gentoo.org>
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 finch.gentoo.org (Postfix) with ESMTPS id B8E5C158B20
for <garchives@archives.gentoo.org>; Wed, 05 Feb 2025 19:14:46 +0000 (UTC)
Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
(Authenticated sender: relay-lists.gentoo.org@gentoo.org)
by smtp.gentoo.org (Postfix) with ESMTPSA id 9FC65343007
for <garchives@archives.gentoo.org>; Wed, 05 Feb 2025 19:14:46 +0000 (UTC)
Received: from bobolink.gentoo.org (localhost [127.0.0.1])
by bobolink.gentoo.org (Postfix) with ESMTP id 942A51103CB;
Wed, 05 Feb 2025 19:14:45 +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 bobolink.gentoo.org (Postfix) with ESMTPS id 8C6F71103CB
for <gentoo-commits@lists.gentoo.org>; Wed, 05 Feb 2025 19:14:45 +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 4323C342F9D
for <gentoo-commits@lists.gentoo.org>; Wed, 05 Feb 2025 19:14:45 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id A02EC2195
for <gentoo-commits@lists.gentoo.org>; Wed, 05 Feb 2025 19:14:43 +0000 (UTC)
From: "Nowa Ammerlaan" <nowa@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Nowa Ammerlaan" <nowa@gentoo.org>
Message-ID: <1738782834.df5f2c6709c1e9bc56091a419ce62caa7b7d9ec1.nowa@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.2.ebuild
X-VCS-Directories: dev-python/qtpy/
X-VCS-Committer: nowa
X-VCS-Committer-Name: Nowa Ammerlaan
X-VCS-Revision: df5f2c6709c1e9bc56091a419ce62caa7b7d9ec1
X-VCS-Branch: master
Date: Wed, 05 Feb 2025 19:14:43 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 34cc2a5c-f1ba-49c1-9901-e1c8eb90f509
X-Archives-Hash: 98b9712f4b743db8aa0e47fb815fcae3
commit: df5f2c6709c1e9bc56091a419ce62caa7b7d9ec1
Author: Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 5 19:13:54 2025 +0000
Commit: Nowa Ammerlaan <nowa <AT> gentoo <DOT> org>
CommitDate: Wed Feb 5 19:13:54 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df5f2c67
dev-python/qtpy: drop use pyside2 properly
Closes: https://bugs.gentoo.org/949348
Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org>
dev-python/qtpy/qtpy-2.4.2.ebuild | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/dev-python/qtpy/qtpy-2.4.2.ebuild b/dev-python/qtpy/qtpy-2.4.2.ebuild
index 7ea469098454..c1a656c804e4 100644
--- a/dev-python/qtpy/qtpy-2.4.2.ebuild
+++ b/dev-python/qtpy/qtpy-2.4.2.ebuild
@@ -144,18 +144,16 @@ src_prepare() {
# We need to ensure the first option is an 'if' not 'elif'
sed -e 's/elif "PySide2" in sys.modules:/if "PySide2" in sys.modules:/g' -i qtpy/__init__.py || die
fi
- if ! use pyside2; then
+ sed \
+ -e "s/from PySide2 import/raise ImportError #/" \
+ -e "s/from PySide2.QtCore import/raise ImportError #/" \
+ -e '/if "PySide2" in sys.modules:/,/"pyside2"/c\' \
+ -i qtpy/__init__.py || die
+
+ if ! use pyqt5; then
sed \
- -e "s/from PySide2 import/raise ImportError #/" \
- -e "s/from PySide2.QtCore import/raise ImportError #/" \
- -e '/if "PySide2" in sys.modules:/,/"pyside2"/c\' \
+ -e 's/elif "PyQt6" in sys.modules:/if "PyQt6" in sys.modules:/g' \
-i qtpy/__init__.py || die
-
- if ! use pyqt5; then
- sed \
- -e 's/elif "PyQt6" in sys.modules:/if "PyQt6" in sys.modules:/g' \
- -i qtpy/__init__.py || die
- fi
fi
if ! use pyqt6; then
sed \
@@ -163,7 +161,7 @@ src_prepare() {
-e '/if "PyQt6" in sys.modules:/,/"pyqt6"/c\' \
-i qtpy/__init__.py || die
- if ! use pyqt5 && ! use pyside2; then
+ if ! use pyqt5; then
sed \
-e 's/elif "PySide6" in sys.modules:/if "PySide6" in sys.modules:/g' \
-i qtpy/__init__.py || die