commit: b8a399ce9af99c64552948177956db3d82bdc3d7
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 7 10:16:52 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Nov 7 10:18:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8a399ce
dev-python/pyside6: further restrict dependencies on qt packages
6.3.2 for example fails to build with qt 6.4.0
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
...yside6-6.3.2.ebuild => pyside6-6.3.2-r1.ebuild} | 36 +++++++++----------
dev-python/pyside6/pyside6-6.4.0.ebuild | 40 +++++++++++-----------
2 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/dev-python/pyside6/pyside6-6.3.2.ebuild
b/dev-python/pyside6/pyside6-6.3.2-r1.ebuild
similarity index 89%
rename from dev-python/pyside6/pyside6-6.3.2.ebuild
rename to dev-python/pyside6/pyside6-6.3.2-r1.ebuild
index 6f0f4f03a176..50a3f9039937 100644
--- a/dev-python/pyside6/pyside6-6.3.2.ebuild
+++ b/dev-python/pyside6/pyside6-6.3.2-r1.ebuild
@@ -71,28 +71,28 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
RESTRICT="test"
# Minimal supported version of Qt.
-QT_PV="$(ver_cut 1-2):6"
+QT_PV="$(ver_cut 1-2)*:6"
RDEPEND="${PYTHON_DEPS}
- >=dev-python/shiboken6-${PV}[${PYTHON_USEDEP}]
-
>=dev-qt/qtbase-${QT_PV}[dbus?,opengl?,gles2-only=,sql?,network?,concurrent?,widgets?,xml(+)?]
- designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
- gui? ( >=dev-qt/qtbase-${QT_PV}[gui,jpeg] )
- help? ( >=dev-qt/qttools-${QT_PV}[assistant] )
- multimedia? (
>=dev-qt/qtmultimedia-${QT_PV}[qml(+)?,gles2-only(-)=,widgets(+)?] )
- positioning? ( >=dev-qt/qtpositioning-${QT_PV}[qml(+)?] )
- printsupport? ( >=dev-qt/qtbase-${QT_PV}[gui,widgets] )
- qml? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
- quick3d? ( >=dev-qt/qtquick3d-${QT_PV} )
- serialport? ( >=dev-qt/qtserialport-${QT_PV} )
- svg? ( >=dev-qt/qtsvg-${QT_PV} )
- testlib? ( >=dev-qt/qtbase-${QT_PV}[gui] )
- webchannel? ( >=dev-qt/qtwebchannel-${QT_PV}[qml(+)?] )
- webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets?] )
- websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
+ ~dev-python/shiboken6-${PV}[${PYTHON_USEDEP}]
+
=dev-qt/qtbase-${QT_PV}[dbus?,opengl?,gles2-only=,sql?,network?,concurrent?,widgets?,xml(+)?]
+ designer? ( =dev-qt/qttools-${QT_PV}[designer] )
+ gui? ( =dev-qt/qtbase-${QT_PV}[gui,jpeg] )
+ help? ( =dev-qt/qttools-${QT_PV}[assistant] )
+ multimedia? (
=dev-qt/qtmultimedia-${QT_PV}[qml(+)?,gles2-only(-)=,widgets(+)?] )
+ positioning? ( =dev-qt/qtpositioning-${QT_PV}[qml(+)?] )
+ printsupport? ( =dev-qt/qtbase-${QT_PV}[gui,widgets] )
+ qml? ( =dev-qt/qtdeclarative-${QT_PV}[widgets?] )
+ quick3d? ( =dev-qt/qtquick3d-${QT_PV} )
+ serialport? ( =dev-qt/qtserialport-${QT_PV} )
+ svg? ( =dev-qt/qtsvg-${QT_PV} )
+ testlib? ( =dev-qt/qtbase-${QT_PV}[gui] )
+ webchannel? ( =dev-qt/qtwebchannel-${QT_PV}[qml(+)?] )
+ webengine? ( =dev-qt/qtwebengine-${QT_PV}[widgets?] )
+ websockets? ( =dev-qt/qtwebsockets-${QT_PV} )
"
DEPEND="${RDEPEND}
- test? ( >=dev-qt/qtbase-${QT_PV}[gui] )
+ test? ( =dev-qt/qtbase-${QT_PV}[gui] )
"
# testlib is toggled by the gui flag on qtbase
diff --git a/dev-python/pyside6/pyside6-6.4.0.ebuild
b/dev-python/pyside6/pyside6-6.4.0.ebuild
index d1d803dcf7e3..c388bbd9a358 100644
--- a/dev-python/pyside6/pyside6-6.4.0.ebuild
+++ b/dev-python/pyside6/pyside6-6.4.0.ebuild
@@ -75,33 +75,33 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
RESTRICT="test"
# Minimal supported version of Qt.
-QT_PV="$(ver_cut 1-2):6"
+QT_PV="$(ver_cut 1-2)*:6"
RDEPEND="${PYTHON_DEPS}
- >=dev-python/shiboken6-${PV}[${PYTHON_USEDEP}]
-
>=dev-qt/qtbase-${QT_PV}[concurrent?,dbus?,gles2-only=,network?,opengl?,sql?,widgets?,xml?]
- charts? ( >=dev-qt/qtcharts-${QT_PV} )
- designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
+ ~dev-python/shiboken6-${PV}[${PYTHON_USEDEP}]
+
=dev-qt/qtbase-${QT_PV}[concurrent?,dbus?,gles2-only=,network?,opengl?,sql?,widgets?,xml?]
+ charts? ( =dev-qt/qtcharts-${QT_PV} )
+ designer? ( =dev-qt/qttools-${QT_PV}[designer] )
gui? (
- >=dev-qt/qtbase-${QT_PV}[gui,jpeg]
+ =dev-qt/qtbase-${QT_PV}[gui,jpeg]
x11-libs/libxkbcommon
)
- help? ( >=dev-qt/qttools-${QT_PV}[assistant] )
- multimedia? (
>=dev-qt/qtmultimedia-${QT_PV}[qml(+)?,gles2-only(-)=,widgets(+)?] )
- network-auth? ( >=dev-qt/qtnetworkauth-${QT_PV} )
- positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
- printsupport? ( >=dev-qt/qtbase-${QT_PV}[gui,widgets] )
- qml? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
- quick3d? ( >=dev-qt/qtquick3d-${QT_PV} )
- serialport? ( >=dev-qt/qtserialport-${QT_PV} )
- svg? ( >=dev-qt/qtsvg-${QT_PV} )
- testlib? ( >=dev-qt/qtbase-${QT_PV}[gui] )
- webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
- webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets?] )
- websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
+ help? ( =dev-qt/qttools-${QT_PV}[assistant] )
+ multimedia? (
=dev-qt/qtmultimedia-${QT_PV}[qml(+)?,gles2-only(-)=,widgets(+)?] )
+ network-auth? ( =dev-qt/qtnetworkauth-${QT_PV} )
+ positioning? ( =dev-qt/qtpositioning-${QT_PV} )
+ printsupport? ( =dev-qt/qtbase-${QT_PV}[gui,widgets] )
+ qml? ( =dev-qt/qtdeclarative-${QT_PV}[widgets?] )
+ quick3d? ( =dev-qt/qtquick3d-${QT_PV} )
+ serialport? ( =dev-qt/qtserialport-${QT_PV} )
+ svg? ( =dev-qt/qtsvg-${QT_PV} )
+ testlib? ( =dev-qt/qtbase-${QT_PV}[gui] )
+ webchannel? ( =dev-qt/qtwebchannel-${QT_PV} )
+ webengine? ( =dev-qt/qtwebengine-${QT_PV}[widgets?] )
+ websockets? ( =dev-qt/qtwebsockets-${QT_PV} )
"
DEPEND="${RDEPEND}
- test? ( >=dev-qt/qtbase-${QT_PV}[gui] )
+ test? ( =dev-qt/qtbase-${QT_PV}[gui] )
"
# testlib is toggled by the gui flag on qtbase
