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
