From ee0c4d5e506a6c64994a15c3af5cf1ca22045567 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 27 Nov 2023 22:51:10 +0000 Subject: gentoo auto-resync : 27:11:2023 - 22:51:09 --- dev-python/PyQt6/Manifest | 4 +- dev-python/PyQt6/PyQt6-6.5.3.ebuild | 3 +- dev-python/PyQt6/PyQt6-6.6.0-r1.ebuild | 175 +++++++++++++++++++++++++++++++++ dev-python/PyQt6/PyQt6-6.6.0.ebuild | 174 -------------------------------- 4 files changed, 179 insertions(+), 177 deletions(-) create mode 100644 dev-python/PyQt6/PyQt6-6.6.0-r1.ebuild delete mode 100644 dev-python/PyQt6/PyQt6-6.6.0.ebuild (limited to 'dev-python/PyQt6') diff --git a/dev-python/PyQt6/Manifest b/dev-python/PyQt6/Manifest index e228fd70dacc..dc1c7b272ac9 100644 --- a/dev-python/PyQt6/Manifest +++ b/dev-python/PyQt6/Manifest @@ -1,6 +1,6 @@ AUX PyQt6-6.5.2-qt660.patch 767 BLAKE2B ec6c345ad8a7f2b1029291bc76b8ccd3df6b0661761c1c6e2d1c8eeb033189f0ffa04c9a509a160bdd86768c5f89bfcd556602e9545404bdd5e7b67976ad2a0a SHA512 975bbb18dd39c9b4f232695210283e9d28da92945a80c22cc1e490d805bdef1ea70904b86af74ca7abdafcdb6b3cea5ffdbd58e7d6bd3e77f5d7c43414f3232c DIST PyQt6-6.5.3.tar.gz 1039271 BLAKE2B 965efa73daa83e46fbb1428b27f8bfc8e5cbfd4cfa5481b50835fdcc58f475416207a670882d47a0cc724e4dc06e0a00a512c5f83c4918134c2f1303aecda20e SHA512 a502693cc9e1887011466132cd85e232ce653bfc38519aed99a77332413bdb65a01ecad4680b831eb76365b086e6a3b52fa69017b39d95933a6372d2e7e8e4bb DIST PyQt6-6.6.0.tar.gz 1043298 BLAKE2B 1e0412e5f73734de625f5eb3f148d675c44909d56694e47e029a3ae91fd28f17e1edb2469f7af03baec52ad5636c3dba120d1328664f4f0557b7a9658b1e6cf1 SHA512 2fe8640b1dc82aa1da6064da2ef6c4ee81216ed34f28211b69d22c5ea00f782298f5a6a94d32ab00c3ee095abf15d2182a17324cd132458580f5659e789686e3 -EBUILD PyQt6-6.5.3.ebuild 5539 BLAKE2B 4ecc810ac5e63c6c0a6911c92518eb44ad877d3fc534bef4117932997be4bdfd2a4c6b872972f3537714ae78e2cf14faeff8b24d3c25e54f66c865ab3f3c2ac7 SHA512 0ea27819562f7c8e8b0099a217e9b1afda00149b82b13c20181c75d298b871d107c67ad33ae4e9476b60398bcd1877e316f465e5a5946d943a9689802db1acc1 -EBUILD PyQt6-6.6.0.ebuild 5488 BLAKE2B 959fcb0dfde0167250325c355034b65f743b9ec26e9042c74faaa0577508be8e5270d4d0e1f088a0f87f20eb97daa5a377a7db5e3794791bddff12270f23f7ca SHA512 ee18e63fef093744eb65353a34f080543e611f06ad417acda69207596146f2bddcdb461d56f22db52adab1c486e4f114add37dbe9c9386745a454ce5c9c8b4c6 +EBUILD PyQt6-6.5.3.ebuild 5585 BLAKE2B 4613e566f035e50b2d3ce07c460cd863a391f1df8a758a7178697da18bfddd25befd512f506f0dd65976ee7acd6e245126c3f3917ebfef849f5e4f6303e0d697 SHA512 68ca15ce30fb2297bfee0eba3a7839ddbe96bec3653107459982d2b20fd87a33653dad8135ed9665d18f9d9a32ae783a20d940d638221c081a476a62dc35231a +EBUILD PyQt6-6.6.0-r1.ebuild 5534 BLAKE2B ec7f209c98a2efa834e174465d93f60c5fef1aa0ce90e14a82fae393d9774389539071b95a6df5fb95b5837956cd950f073556439538940d81a6942d63ab4e3c SHA512 cfdba1d97e3485f72fc1c742bb2bfb0f259cc436e7d6f63db4510da456a6cca5756316bafeea8ed7d35798872d432f71110a16a89a9dc66d4a7425a04c62807c 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 index 480faa27e41d..d34d5ff53a5b 100644 --- a/dev-python/PyQt6/PyQt6-6.5.3.ebuild +++ b/dev-python/PyQt6/PyQt6-6.5.3.ebuild @@ -46,8 +46,9 @@ REQUIRED_USE=" 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?] + >=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}] diff --git a/dev-python/PyQt6/PyQt6-6.6.0-r1.ebuild b/dev-python/PyQt6/PyQt6-6.6.0-r1.ebuild new file mode 100644 index 000000000000..4dee14aeda33 --- /dev/null +++ b/dev-python/PyQt6/PyQt6-6.6.0-r1.ebuild @@ -0,0 +1,175 @@ +# 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 ) +" + +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.0.ebuild b/dev-python/PyQt6/PyQt6-6.6.0.ebuild deleted file mode 100644 index 8c7f98519bcf..000000000000 --- a/dev-python/PyQt6/PyQt6-6.6.0.ebuild +++ /dev/null @@ -1,174 +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 ) -" - -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 ) -" - -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 -} -- cgit v1.2.3