From b8c7370a682e4e29cda623222d17a790c01c3642 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 7 Aug 2024 12:37:21 +0100 Subject: gentoo auto-resync : 07:08:2024 - 12:37:20 --- dev-python/PyQt6/Manifest | 4 +- dev-python/PyQt6/PyQt6-6.7.0.ebuild | 2 + dev-python/PyQt6/PyQt6-6.7.1-r1.ebuild | 180 +++++++++++++++++++++++++++++++++ dev-python/PyQt6/PyQt6-6.7.1.ebuild | 178 -------------------------------- 4 files changed, 184 insertions(+), 180 deletions(-) create mode 100644 dev-python/PyQt6/PyQt6-6.7.1-r1.ebuild delete mode 100644 dev-python/PyQt6/PyQt6-6.7.1.ebuild (limited to 'dev-python/PyQt6') diff --git a/dev-python/PyQt6/Manifest b/dev-python/PyQt6/Manifest index a743a548cc5c..3aeaf258b58f 100644 --- a/dev-python/PyQt6/Manifest +++ b/dev-python/PyQt6/Manifest @@ -1,5 +1,5 @@ DIST PyQt6-6.7.0.tar.gz 1050408 BLAKE2B 30dc8a2762cb5a149c401d497af714bb9209bc46847c0699522ee60080c46f0b1d4da854e70151a508c90820a2aa32da422bfd20c4320bcc9b5d5f92fd9e8677 SHA512 619210d2de3e149b55e2d45cbd8ec2113b3effcaccd25eef6067ea99b82e250f1ce288b38136604536053690071f8c843339b934b5ce5e539a5dfdecc26f44d2 DIST PyQt6-6.7.1.tar.gz 1051212 BLAKE2B 9c1c619b08cc14e0a92ea22812c14d5a3cb47e45eea917d50ab63918d8433d54b354f26b885f2567b9c6e2f0380e819972d055d1a1751f6646ebb5e6cf72b228 SHA512 1e0fec009e1823b06460fd96eddc00ed31388c20f6d832aa0ebaa130baf06d83514df43af7961c3cb2872570d27e539d6db7bf6143ccdfd61a19da7521be2c7e -EBUILD PyQt6-6.7.0.ebuild 5553 BLAKE2B 2557991dc484d128343a72e8de4f1d316b04a1b5ed616b7fe90d08058e4ba578958bb308a1b775fff1d3796ae1c046b20ac7d76322d6c7b921c8f56c2e84b69c SHA512 3cdd4c609601e5b29421c4e8f0976057d086899acaacd06142266be605814bc2f05ddb720a03affecf9232001040a1df85bb50fa531f57fb74c29698093d7eae -EBUILD PyQt6-6.7.1.ebuild 5556 BLAKE2B bf7919d582ce361f273520343c589d34a1f1911cbd16193577dbb8623d77e7876bd758521a1bc89a56cb17e761cdbdb334994dae408843cf80f2353b70bf150c SHA512 3731d366aafe73bfe5ddbd397763ab5ea03c9023425f230ba7860d015ae076aae2e06b79ec9fd03bba916d8911bf21ae74a1fcdc143426cc3682b602422fecef +EBUILD PyQt6-6.7.0.ebuild 5648 BLAKE2B 3209a160cb7c9e7a2269d3c45ef28eb76ceef1c1044ed868976f3dc8c87c569549d64eab9b89771ec4fa51949b3f67bb2d43fc207d1df210f5f1a6a0c7f021b0 SHA512 c290e5647749b832f6ddff92321ad028bdfdcd030c16badba6758e361d0b0ae4faba35dc80d90fda48005b9545e795cd22a9ea340119e5cc035cffb3ef5146d8 +EBUILD PyQt6-6.7.1-r1.ebuild 5651 BLAKE2B 838c5c76c3d94fa3e988c3ad33578913ee4b2abbb7b24dfa5303f6191f9c0cdf93916821a518c653edaf592f42bb58e88e4292c3c7050abc308da25221861094 SHA512 cb8d9b44402740e1c1f69481ab5ae2660388dabf154ebe7489058a74a38713ee3406e9022743574ef38c1f6499144555d01cf529142135fc5dea824ca19c08d2 MISC metadata.xml 2391 BLAKE2B 16eecbd105ced07699632a4b294f7da74b59ff931e39afb8a21f67f073bfc90ff613d753a67bcd303ea9f2bf35d7b91c1c7a56ece044c421c4e45b5951f5efe3 SHA512 1d595e07e201891c8c7d5635d39db36ccb65c7333cb27c1cd5384a76029b987959df05795283a4474a41a997bf951e577570b7d3a52a9a2975d563767651efae diff --git a/dev-python/PyQt6/PyQt6-6.7.0.ebuild b/dev-python/PyQt6/PyQt6-6.7.0.ebuild index 049def93e827..feeb9ad16db7 100644 --- a/dev-python/PyQt6/PyQt6-6.7.0.ebuild +++ b/dev-python/PyQt6/PyQt6-6.7.0.ebuild @@ -47,8 +47,10 @@ REQUIRED_USE=" " # may use qt private symbols wrt qtbase's := +# non-trivially broken with Qt6.8 wrt upper bound, waiting for PyQt6-6.8.0 DEPEND=" >=dev-qt/qtbase-${QT_PV}=[dbus?,gles2-only=,gui?,network?,opengl?,sql?,ssl=,widgets?,xml?] + =dev-qt/qtconnectivity-${QT_PV}[bluetooth] ) dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] diff --git a/dev-python/PyQt6/PyQt6-6.7.1-r1.ebuild b/dev-python/PyQt6/PyQt6-6.7.1-r1.ebuild new file mode 100644 index 000000000000..b4c34d3c8829 --- /dev/null +++ b/dev-python/PyQt6/PyQt6-6.7.1-r1.ebuild @@ -0,0 +1,180 @@ +# Copyright 2022-2024 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..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 ~ppc64 ~riscv" +# 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 := +# non-trivially broken with Qt6.8 wrt upper bound, waiting for PyQt6-6.8.0 +DEPEND=" + >=dev-qt/qtbase-${QT_PV}=[dbus?,gles2-only=,gui?,network?,opengl?,sql?,ssl=,widgets?,xml?] + =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/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=" + ${DEPEND} + >=dev-python/PyQt6-sip-13.8[${PYTHON_USEDEP}] +" +BDEPEND=" + >=dev-python/PyQt-builder-1.15[${PYTHON_USEDEP}] + >=dev-python/sip-6.8.6[${PYTHON_USEDEP}] + >=dev-qt/qtbase-${QT_PV} + dbus? ( virtual/pkgconfig ) +" + +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) + --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.7.1.ebuild b/dev-python/PyQt6/PyQt6-6.7.1.ebuild deleted file mode 100644 index 0788d33ceccf..000000000000 --- a/dev-python/PyQt6/PyQt6-6.7.1.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 2022-2024 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..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 ~ppc64 ~riscv" -# 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/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=" - ${DEPEND} - >=dev-python/PyQt6-sip-13.8[${PYTHON_USEDEP}] -" -BDEPEND=" - >=dev-python/PyQt-builder-1.15[${PYTHON_USEDEP}] - >=dev-python/sip-6.8.6[${PYTHON_USEDEP}] - >=dev-qt/qtbase-${QT_PV} - dbus? ( virtual/pkgconfig ) -" - -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) - --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