From 54d0ccbac3b6fbd01dcd252ea006d4e9e62f8e6e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 20 Dec 2023 01:53:29 +0000 Subject: gentoo auto-resync : 20:12:2023 - 01:53:29 --- dev-python/PyQt6/Manifest | 5 +- dev-python/PyQt6/PyQt6-6.5.3.ebuild | 179 ------------------------- dev-python/PyQt6/PyQt6-6.6.1.ebuild | 2 +- dev-python/PyQt6/files/PyQt6-6.5.2-qt660.patch | 23 ---- 4 files changed, 2 insertions(+), 207 deletions(-) delete mode 100644 dev-python/PyQt6/PyQt6-6.5.3.ebuild delete mode 100644 dev-python/PyQt6/files/PyQt6-6.5.2-qt660.patch (limited to 'dev-python/PyQt6') diff --git a/dev-python/PyQt6/Manifest b/dev-python/PyQt6/Manifest index 8b4b3ce63e67..45a43027a65b 100644 --- a/dev-python/PyQt6/Manifest +++ b/dev-python/PyQt6/Manifest @@ -1,7 +1,4 @@ -AUX PyQt6-6.5.2-qt660.patch 767 BLAKE2B ec6c345ad8a7f2b1029291bc76b8ccd3df6b0661761c1c6e2d1c8eeb033189f0ffa04c9a509a160bdd86768c5f89bfcd556602e9545404bdd5e7b67976ad2a0a SHA512 975bbb18dd39c9b4f232695210283e9d28da92945a80c22cc1e490d805bdef1ea70904b86af74ca7abdafcdb6b3cea5ffdbd58e7d6bd3e77f5d7c43414f3232c AUX PyQt6-6.6.1-qt670.patch 2528 BLAKE2B 3157c4e4e063747db56e92b011147dfb3a57474b6e80f052372d4b83b91bf36bb18ba256f4e2b4466c140744b075ac47217915ad5d744900754c8f4af7ab8f61 SHA512 5894b371cfa9b22de2300cc75b7ab486944ecd7c8f2aed6bdd03355c9952ebd550ec2383ff057d629b54d91f92ef67cd566a39d7e38696d6ba2b09622b9900e8 -DIST PyQt6-6.5.3.tar.gz 1039271 BLAKE2B 965efa73daa83e46fbb1428b27f8bfc8e5cbfd4cfa5481b50835fdcc58f475416207a670882d47a0cc724e4dc06e0a00a512c5f83c4918134c2f1303aecda20e SHA512 a502693cc9e1887011466132cd85e232ce653bfc38519aed99a77332413bdb65a01ecad4680b831eb76365b086e6a3b52fa69017b39d95933a6372d2e7e8e4bb DIST PyQt6-6.6.1.tar.gz 1043203 BLAKE2B dd2b6988ebeabaae47fe57c5c0d17fbe4b62c377262b4bb360adb7fd6724ccb6a67ba5c2bd7498df98db3ce6b00978f936b11a43b464c3c7af169f25b30ee1a6 SHA512 c2ff8c47c9b0e43c009d0c90f565a54344e6f384c67dd30c2d422465d0702c07713acc0095c8b67827d1146675611c07d548ba282a26e41bb60a0a21977a7a64 -EBUILD PyQt6-6.5.3.ebuild 5585 BLAKE2B 4613e566f035e50b2d3ce07c460cd863a391f1df8a758a7178697da18bfddd25befd512f506f0dd65976ee7acd6e245126c3f3917ebfef849f5e4f6303e0d697 SHA512 68ca15ce30fb2297bfee0eba3a7839ddbe96bec3653107459982d2b20fd87a33653dad8135ed9665d18f9d9a32ae783a20d940d638221c081a476a62dc35231a -EBUILD PyQt6-6.6.1.ebuild 5585 BLAKE2B bb30a45cc0b11ab19bcd525f879e90568d23925853457f1d9fb371f18f999e56219623b875093c95bf33ff6769364a81a60ca83bf2439f933f3039a8f9d902a2 SHA512 5ad1b28c3bce899d1c165e9ca3088cd7b5b9cf23bf3de39bc5ba028e7680f4c17e3d02dbab3ac17016e823380a6281831f294379aadbc0e0ecf156ea1ef1b07b +EBUILD PyQt6-6.6.1.ebuild 5582 BLAKE2B dba830f4557c90c97a00fec3755f50086a726ea89f33a180ddf62754ee168c27a0cd709cc98974268ae91346ec88ae1aacaf7e34e65761842e17e911b2c2e57c SHA512 6e16b1975b6734e66b7c50af67fde667e5d24a9644c34c2ab0be9d5df95221e95333cc4ea432cc49b08b25b78a8ceddcac899949200f869d0f246f1ff7635a87 MISC metadata.xml 2391 BLAKE2B 16eecbd105ced07699632a4b294f7da74b59ff931e39afb8a21f67f073bfc90ff613d753a67bcd303ea9f2bf35d7b91c1c7a56ece044c421c4e45b5951f5efe3 SHA512 1d595e07e201891c8c7d5635d39db36ccb65c7333cb27c1cd5384a76029b987959df05795283a4474a41a997bf951e577570b7d3a52a9a2975d563767651efae diff --git a/dev-python/PyQt6/PyQt6-6.5.3.ebuild b/dev-python/PyQt6/PyQt6-6.5.3.ebuild deleted file mode 100644 index d34d5ff53a5b..000000000000 --- a/dev-python/PyQt6/PyQt6-6.5.3.ebuild +++ /dev/null @@ -1,179 +0,0 @@ -# Copyright 2022-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=sip -PYPI_NO_NORMALIZE=1 -PYTHON_COMPAT=( python3_{10..12} ) -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" -# 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 serialport sensors spatialaudio speech +sql - +ssl svg testlib webchannel websockets +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 ) - spatialaudio? ( multimedia ) - sql? ( widgets ) - svg? ( gui ) - testlib? ( gui widgets ) - webchannel? ( network ) - websockets? ( network ) - widgets? ( gui ) -" - -# may use qt private symbols wrt qtbase's := -DEPEND=" - >=dev-qt/qtbase-${QT_PV}=[dbus?,gles2-only=,gui?,network?,opengl?,sql?,ssl=,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] ) - sensors? ( >=dev-qt/qtsensors-${QT_PV} ) - serialport? ( >=dev-qt/qtserialport-${QT_PV} ) - speech? ( >=dev-qt/qtspeech-${QT_PV} ) - svg? ( >=dev-qt/qtsvg-${QT_PV} ) - webchannel? ( >=dev-qt/qtwebchannel-${QT_PV} ) - websockets? ( >=dev-qt/qtwebsockets-${QT_PV} ) -" -RDEPEND=" - ${DEPEND} - >=dev-python/PyQt6-sip-13.6[${PYTHON_USEDEP}] -" -BDEPEND=" - >=dev-python/PyQt-builder-1.15[${PYTHON_USEDEP}] - >=dev-python/sip-6.7.12[${PYTHON_USEDEP}] - >=dev-qt/qtbase-${QT_PV} - dbus? ( virtual/pkgconfig ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-6.5.2-qt660.patch -) - -src_prepare() { - default - - # hack: qmake queries g++ or clang++ for info depending on which qtbase was - # built with, but ignores CHOST failing with -native-symlinks (bug #726112) - # and potentially using wrong information when cross-compiling - 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) - --disable=QtRemoteObjects # not packaged - $(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) - - # intended for Windows / Android or others - --disable=QAxContainer - --disabled-feature=PyQt_Permissions - ) -} - -python_install_all() { - einstalldocs - use examples && dodoc -r examples -} diff --git a/dev-python/PyQt6/PyQt6-6.6.1.ebuild b/dev-python/PyQt6/PyQt6-6.6.1.ebuild index 1bf42ba63ec2..dc80efd5e2f0 100644 --- a/dev-python/PyQt6/PyQt6-6.6.1.ebuild +++ b/dev-python/PyQt6/PyQt6-6.6.1.ebuild @@ -61,7 +61,7 @@ DEPEND=" opengl? ( gles2-only? ( media-libs/libglvnd ) ) - pdfium? ( >=dev-qt/qtwebengine-${QT_PV}[pdfium(-),widgets?] ) + 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} ) diff --git a/dev-python/PyQt6/files/PyQt6-6.5.2-qt660.patch b/dev-python/PyQt6/files/PyQt6-6.5.2-qt660.patch deleted file mode 100644 index f0e204238a0a..000000000000 --- a/dev-python/PyQt6/files/PyQt6-6.5.2-qt660.patch +++ /dev/null @@ -1,23 +0,0 @@ -Quick workaround to fix build with USE=sql for Qt6.6 due to [1] -while waiting for PyQt6-6.6.0. Not a proper fix but nothing in -tree needs this bit currently. - -USE=bluetooth is still broken, but is not essential (no revdeps), -and can instead be masked for the time being. - -[1] https://github.com/qt/qtbase/commit/d924253c91 ---- a/sip/QtCore/QtCoremod.sip -+++ b/sip/QtCore/QtCoremod.sip -@@ -24,3 +24,3 @@ - --%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} -+%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} - ---- a/sip/QtSql/qsqlresult.sip -+++ b/sip/QtSql/qsqlresult.sip -@@ -65,3 +65,5 @@ - int boundValueCount() const; -+%If (- Qt_6_6_0) - QList &boundValues() const; -+%End - QString executedQuery() const; -- cgit v1.2.3