commit: d4aa619a5ba48922ed5807dcae3dbbabb99f6d9c
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 3 07:06:35 2025 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Aug 3 07:41:46 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4aa619a
dev-python/pyqt6: drop 6.8.1
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-python/pyqt6/Manifest | 1 -
dev-python/pyqt6/files/pyqt6-6.8.1-qt690.patch | 43 ------
dev-python/pyqt6/pyqt6-6.8.1.ebuild | 194 -------------------------
3 files changed, 238 deletions(-)
diff --git a/dev-python/pyqt6/Manifest b/dev-python/pyqt6/Manifest
index cd1a1e095a3a..8b4c3483f93f 100644
--- a/dev-python/pyqt6/Manifest
+++ b/dev-python/pyqt6/Manifest
@@ -1,2 +1 @@
-DIST pyqt6-6.8.1.tar.gz 1064723 BLAKE2B
99ac44fe250b6ff7a1762df5d668b69ad424dc1b563147be7ba94ce7f00729c29ce17be4cd7c39b276549199b66d877dec69e9eeb6b394ed42f944f9155825fa
SHA512
87727369168fde6e3edc488f96dd13d537f026e207e4b4ab1c95d09bf85859512a117dfc801249e0891425a6b5579830724e4145f370e2ef9909788f56eb4df6
DIST pyqt6-6.9.1.tar.gz 1067230 BLAKE2B
93b301fca3a7d97f872ca96f00eb27d434378f49dd19da6ffd5c26dbce378a7ea01786c0e7de34ce24620a14fa036b2187c5f7b0a4efa5a908ceaf557f748e9d
SHA512
e2f10d6dc1ea9f420857abe248bfd488f8945e9c6c84887745f072815875ce7e806788a9048a57215266fa561b1489c3b092c276816062323262e6911271c552
diff --git a/dev-python/pyqt6/files/pyqt6-6.8.1-qt690.patch
b/dev-python/pyqt6/files/pyqt6-6.8.1-qt690.patch
deleted file mode 100644
index 898bda7810a5..000000000000
--- a/dev-python/pyqt6/files/pyqt6-6.8.1-qt690.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Quick fix to build against (still unreleased) Qt 6.9.
---- a/qpy/QtCore/qpycore_enums_flags_metatype.cpp
-+++ b/qpy/QtCore/qpycore_enums_flags_metatype.cpp
-@@ -46,5 +46,9 @@
- mti->alignment = alignof(unsigned);
- mti->size = sizeof(unsigned);
-+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
-+ mti->flags = QtPrivate::QMetaTypeForType<unsigned>::flags() |
QMetaType::IsEnumeration | QMetaType::IsUnsignedEnumeration;
-+#else
- mti->flags = QtPrivate::QMetaTypeForType<unsigned>::Flags |
QMetaType::IsEnumeration | QMetaType::IsUnsignedEnumeration;
-+#endif
- mti->defaultCtr =
QtPrivate::QMetaTypeForType<unsigned>::getDefaultCtr();
- mti->copyCtr = QtPrivate::QMetaTypeForType<unsigned>::getCopyCtr();
-@@ -62,5 +66,9 @@
- mti->alignment = alignof(int);
- mti->size = sizeof(int);
-+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
-+ mti->flags = QtPrivate::QMetaTypeForType<int>::flags() |
QMetaType::IsEnumeration;
-+#else
- mti->flags = QtPrivate::QMetaTypeForType<int>::Flags |
QMetaType::IsEnumeration;
-+#endif
- mti->defaultCtr = QtPrivate::QMetaTypeForType<int>::getDefaultCtr();
- mti->copyCtr = QtPrivate::QMetaTypeForType<int>::getCopyCtr();
---- a/sip/QtCore/QtCoremod.sip
-+++ b/sip/QtCore/QtCoremod.sip
-@@ -23,5 +23,5 @@
- %Module(name=PyQt6.QtCore, call_super_init=True,
default_VirtualErrorHandler=PyQt6, keyword_arguments="Optional",
use_limited_api=True, py_ssize_t_clean=True)
-
--%Timeline {Qt_6_0_0 Qt_6_1_0 Qt_6_2_0 Qt_6_3_0 Qt_6_4_0 Qt_6_5_0 Qt_6_6_0
Qt_6_7_0 Qt_6_8_0}
-+%Timeline {Qt_6_0_0 Qt_6_1_0 Qt_6_2_0 Qt_6_3_0 Qt_6_4_0 Qt_6_5_0 Qt_6_6_0
Qt_6_7_0 Qt_6_8_0 Qt_6_9_0}
-
- %Platforms {Android iOS Linux macOS WebAssembly Windows}
---- a/sip/QtXml/qdom.sip
-+++ b/sip/QtXml/qdom.sip
-@@ -159,6 +159,8 @@
- QDomNodeList(const QDomNodeList &);
- ~QDomNodeList();
-+%If (- Qt_6_9_0)
- bool operator==(const QDomNodeList &) const;
- bool operator!=(const QDomNodeList &) const;
-+%End
- QDomNode item(int index) const;
- QDomNode at(int index) const;
diff --git a/dev-python/pyqt6/pyqt6-6.8.1.ebuild
b/dev-python/pyqt6/pyqt6-6.8.1.ebuild
deleted file mode 100644
index 3a6ea3e3b905..000000000000
--- a/dev-python/pyqt6/pyqt6-6.8.1.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 2022-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=sip
-PYTHON_COMPAT=( python3_{10..13} )
-inherit distutils-r1 flag-o-matic multiprocessing pypi qmake-utils
-
-# 'can' work with older Qt depending on features, but keeping it simple
-QT_PV=$(ver_cut 1-2):6
-
-DESCRIPTION="Python bindings for the Qt framework"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt/";
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
-# defaults match what is provided with qtbase by default (except testlib),
-# reduces the need to set flags but does increase build time a fair amount
-IUSE="
- bluetooth +dbus debug designer examples gles2-only +gui help
- multimedia +network nfc opengl pdfium positioning +printsupport
- qml quick quick3d remoteobjects scxml serialport sensors
- spatialaudio speech +sql +ssl svg testlib webchannel websockets
- vulkan +widgets +xml
-"
-# see `grep -r "%Import " sip` and `grep qmake_QT project.py`
-REQUIRED_USE="
- designer? ( gui widgets )
- help? ( gui widgets )
- multimedia? ( gui network )
- opengl? ( gui )
- pdfium? ( gui )
- printsupport? ( gui widgets )
- qml? ( network )
- quick3d? ( gui qml )
- quick? ( gui qml )
- remoteobjects? ( network )
- scxml? ( gui )
- spatialaudio? ( multimedia )
- sql? ( widgets )
- svg? ( gui )
- testlib? ( gui widgets )
- vulkan? ( gui )
- webchannel? ( network )
- websockets? ( network )
- widgets? ( gui )
-"
-
-# may use qt private symbols wrt qtbase's :=
-# non-trivially broken with Qt6.8 wrt upper bound, waiting for PyQt6-6.8.0
-COMMON_DEPEND="
-
>=dev-qt/qtbase-${QT_PV}=[dbus?,gles2-only=,gui?,network?,opengl?,sql?,ssl=,vulkan?,widgets?,xml?]
- bluetooth? ( >=dev-qt/qtconnectivity-${QT_PV}[bluetooth] )
- dbus? (
- dev-python/dbus-python[${PYTHON_USEDEP}]
- sys-apps/dbus
- )
- designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
- help? ( >=dev-qt/qttools-${QT_PV}[assistant] )
- multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} )
- nfc? ( >=dev-qt/qtconnectivity-${QT_PV}[nfc] )
- opengl? (
- gles2-only? ( media-libs/libglvnd )
- )
- pdfium? ( >=dev-qt/qtwebengine-${QT_PV}[pdfium,widgets?] )
- positioning? ( >=dev-qt/qtpositioning-${QT_PV} )
- qml? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] )
- quick3d? ( >=dev-qt/qtquick3d-${QT_PV} )
- quick? ( >=dev-qt/qtdeclarative-${QT_PV}[opengl] )
- remoteobjects? ( >=dev-qt/qtremoteobjects-${QT_PV} )
- scxml? ( >=dev-qt/qtscxml-${QT_PV} )
- sensors? ( >=dev-qt/qtsensors-${QT_PV} )
- serialport? ( >=dev-qt/qtserialport-${QT_PV} )
- speech? (
- >=dev-qt/qtdeclarative-${QT_PV}
- >=dev-qt/qtspeech-${QT_PV}
- )
- svg? ( >=dev-qt/qtsvg-${QT_PV} )
- webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} )
- websockets? ( >=dev-qt/qtwebsockets-${QT_PV} )
-"
-RDEPEND="
- ${COMMON_DEPEND}
- >=dev-python/pyqt6-sip-13.8[${PYTHON_USEDEP}]
-"
-DEPEND="
- ${COMMON_DEPEND}
- vulkan? ( dev-util/vulkan-headers )
-"
-BDEPEND="
- >=dev-python/pyqt-builder-1.17[${PYTHON_USEDEP}]
- >=dev-python/sip-6.9[${PYTHON_USEDEP}]
- >=dev-qt/qtbase-${QT_PV}
- dbus? ( virtual/pkgconfig )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-6.8.1-qt690.patch
-)
-
-src_prepare() {
- default
-
- # hack: PyQt-builder runs qmake without our arguments and calls g++
- # or clang++ depending on what qtbase was built with, not used for
- # building but fails with -native-symlinks
- mkdir "${T}"/cxx || die
- local cxx
- ! cxx=$(type -P "${CHOST}"-g++) || ln -s -- "${cxx}" "${T}"/cxx/g++ ||
die
- ! cxx=$(type -P "${CHOST}"-clang++) || ln -s -- "${cxx}"
"${T}"/cxx/clang++ || die
- PATH=${T}/cxx:${PATH}
-}
-
-python_configure_all() {
- append-cxxflags -std=c++17 # for old gcc / clang that use <17 (bug
#892331)
- append-cxxflags ${CPPFLAGS} # respect CPPFLAGS notably for
DISTUTILS_EXT=1
-
- pyqt_use_enable() {
- local state=$(usex ${1} --enable= --disable=)
- shift
- echo ${*/#/${state}}
- }
-
- DISTUTILS_ARGS=(
- --jobs="$(makeopts_jobs)"
- --qmake="$(qt6_get_bindir)"/qmake
- --qmake-setting="$(qt6_get_qmake_args)"
- --verbose
- --confirm-license
-
- --enable=QtCore
-
- $(pyqt_use_enable bluetooth QtBluetooth)
- $(pyqt_use_enable dbus QtDBus)
- $(pyqt_use_enable designer QtDesigner)
- $(pyqt_use_enable help QtHelp)
- $(pyqt_use_enable gui QtGui)
- #--disable=QtLocation # force-disabled in project.py
- $(pyqt_use_enable multimedia QtMultimedia \
- $(usev widgets QtMultimediaWidgets))
- $(pyqt_use_enable network QtNetwork)
- $(pyqt_use_enable nfc QtNfc)
- $(pyqt_use_enable opengl QtOpenGL \
- $(usev widgets QtOpenGLWidgets))
- $(pyqt_use_enable pdfium QtPdf \
- $(usev widgets QtPdfWidgets))
- $(pyqt_use_enable positioning QtPositioning)
- $(pyqt_use_enable printsupport QtPrintSupport)
- $(pyqt_use_enable qml QtQml)
- $(pyqt_use_enable quick QtQuick \
- $(usev widgets QtQuickWidgets))
- $(pyqt_use_enable quick3d QtQuick3D)
- $(pyqt_use_enable remoteobjects QtRemoteObjects)
- $(pyqt_use_enable scxml QtStateMachine)
- $(pyqt_use_enable sensors QtSensors)
- $(pyqt_use_enable serialport QtSerialPort)
- $(pyqt_use_enable spatialaudio QtSpatialAudio)
- $(pyqt_use_enable sql QtSql)
- $(pyqt_use_enable svg QtSvg \
- $(usev widgets QtSvgWidgets))
- $(pyqt_use_enable testlib QtTest)
- $(pyqt_use_enable speech QtTextToSpeech)
- $(pyqt_use_enable webchannel QtWebChannel)
- $(pyqt_use_enable websockets QtWebSockets)
- $(pyqt_use_enable widgets QtWidgets)
- $(pyqt_use_enable xml QtXml)
-
- $(usev debug '--debug --qml-debug --tracing')
-
- $(usev !dbus --no-dbus-python)
- # note: upstream currently intentionally skips installing these
two
- # plugins when using wheels w/ pep517 so, *if* something does
need
- # them, it will need to be handled manually
- $(usev !designer --no-designer-plugin)
- $(usev !qml --no-qml-plugin)
-
- $(usev !gles2-only --disabled-feature=PyQt_OpenGL_ES2)
- $(usev !opengl --disabled-feature=PyQt_OpenGL)
- $(usev !ssl --disabled-feature=PyQt_SSL)
- $(usev !vulkan --disabled-feature=PyQt_Vulkan)
-
- # intended for Windows / Android or others
- --disable=QAxContainer
- --disabled-feature=PyQt_Permissions
- )
-}
-
-python_install_all() {
- einstalldocs
- use examples && dodoc -r examples
-}
