From bf3704584a111859229f36449fbc925a5a19dc0e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 28 Sep 2023 17:35:19 +0100 Subject: gentoo auto-resync : 28:09:2023 - 17:35:19 --- dev-python/Manifest.gz | Bin 267669 -> 267677 bytes dev-python/PyQt6-WebEngine/Manifest | 2 +- .../PyQt6-WebEngine/PyQt6-WebEngine-6.5.0.ebuild | 3 +- dev-python/PyQt6/Manifest | 5 +- dev-python/PyQt6/PyQt6-6.5.2-r1.ebuild | 172 +++++++++++++++++++++ dev-python/PyQt6/PyQt6-6.5.2.ebuild | 5 +- dev-python/PyQt6/metadata.xml | 1 + 7 files changed, 180 insertions(+), 8 deletions(-) create mode 100644 dev-python/PyQt6/PyQt6-6.5.2-r1.ebuild (limited to 'dev-python') diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz index 6c66ba33e5e0..c2b3e6bf0b7c 100644 Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ diff --git a/dev-python/PyQt6-WebEngine/Manifest b/dev-python/PyQt6-WebEngine/Manifest index 63e3788cda9b..f1c97b7b0c4c 100644 --- a/dev-python/PyQt6-WebEngine/Manifest +++ b/dev-python/PyQt6-WebEngine/Manifest @@ -1,3 +1,3 @@ DIST PyQt6_WebEngine-6.5.0.tar.gz 31349 BLAKE2B 80ab4ad292107e5ca57c5b27f2af3747f9c28ebf2c1afe0f32fe1fbd6897dd701d7f46bda8f08c5f0048d4efef4c3c0087854acbc58a319163e328f74177b05c SHA512 bafa26cc800ec031fe9bb1e309832df79b41c5f43a6cdc8ecc2bc4b09c59b60975a67ede6190726db887689305e7a6012f705eb9b83c3e0c82a23f3f1c3880ff -EBUILD PyQt6-WebEngine-6.5.0.ebuild 1900 BLAKE2B be25e2a2ee937e8717f94454d37f055fd1bf316a9466760f24ed07d6e1c43699a26afd63b483a4220808bbcd7c7fed2b65397dbc4933744a8a9e9420a2321acb SHA512 6445b9247f03dcd19506f2e21d650aa972b82662f7e791c4da7693c26ea4da6c3f05ca480aca4bb4b3e51118d38af1bc7074cec177869759d12cf71adf2705ee +EBUILD PyQt6-WebEngine-6.5.0.ebuild 1837 BLAKE2B 14c6bce4749c3f84e1e6a81b4a268691884f77048bb6182857720f021103502130bd3c92fa77919dfce9bdf7000eb2707c9d143f38eab464adeea3f08da31f73 SHA512 10ec7fdc07111a269f581d9992c84355eee509aa178ca6621b703b1ab3854ed94a2a666875607c761d359b4ab0b336abeac00415a484482de43b2bef7af9b68d MISC metadata.xml 574 BLAKE2B 1cc3bbf5d25e8aac390530005c225bfc618fbb1bdef3a3d075f445eee2cf68d86feb6ac8841d7e0efd1679b19fc14b33b33accdd7e4932e742f46907a8f98601 SHA512 1af94b1a66be1dd38feb818ba973852912bacacc715e0bd893f8b3de56d17f8902b7486cc487137defad749773a6f728c470cbb9c62d15f91a63d80b16296604 diff --git a/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.5.0.ebuild b/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.5.0.ebuild index 8cf1955de931..c1372fd9c761 100644 --- a/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.5.0.ebuild +++ b/dev-python/PyQt6-WebEngine/PyQt6-WebEngine-6.5.0.ebuild @@ -20,10 +20,9 @@ SLOT="0" KEYWORDS="amd64" IUSE="debug quick +widgets" -# can use parts of the Qt private api and "sometimes" needs rebuilds wrt := RDEPEND=" >=dev-python/PyQt6-${PV}[gui,ssl,${PYTHON_USEDEP}] - >=dev-qt/qtbase-${QT_PV}= + >=dev-qt/qtbase-${QT_PV}[gui,widgets?] >=dev-qt/qtwebengine-${QT_PV}[widgets] quick? ( dev-python/PyQt6[qml] ) widgets? ( dev-python/PyQt6[network,printsupport,webchannel,widgets] ) diff --git a/dev-python/PyQt6/Manifest b/dev-python/PyQt6/Manifest index 86dbe4a97594..e5855f489b5a 100644 --- a/dev-python/PyQt6/Manifest +++ b/dev-python/PyQt6/Manifest @@ -1,3 +1,4 @@ DIST PyQt6-6.5.2.tar.gz 1037215 BLAKE2B dae331dc27975f3ad4fca10cedf093fecabf819d1fd97b873f9a793ce12168af9a72e2b119a4fc3ecf263e1ba42103f48d5198554248743a6289efc8aa3b7d70 SHA512 11da50ff8b914794e8044e136a3c8a79d16aa63ab33045f2807985c2fe2235c1a7682f7e955c9e8852093c34a671ec09d84afaa9d3d59945461797e81911721f -EBUILD PyQt6-6.5.2.ebuild 5374 BLAKE2B 24673d1881e7997e83da686d7899b2329c54b7dc0b6d5ee87ea91b8c7f92cbf1640a70dbf778b8d04e0784b46e90a420fa80ac28f7af2330d9dc13f96fdf4d2d SHA512 6cc575947d9dd747847738d6e4492b487e5e87e12f4b0817020e76dd9c51d7e6427701ad316f981bde40c45adf15ca135f302079a0a81f81cb267e328efd4784 -MISC metadata.xml 2277 BLAKE2B 22ee4e39000e75990db2f605303b3a4b8be0032cd82cbeaef4a0cf3730b7fbdc4dc45be9530373471c953e9fd767a54bfde705d67153dc24e70609bb830f37f1 SHA512 09e0c1fb5cae914501c2b8626ca89c7b03bb30d3efee1afe47fb3e938a3d4c1952dc21ad2ca3c6d95efd55fb918e60a21b3bf1b66e7737ae403e8e08d1f53e41 +EBUILD PyQt6-6.5.2-r1.ebuild 5393 BLAKE2B f89cae4cfbc598096f6f5f82adfa8d6f69b24188b5211aa932907c3866cde61981197ad666a33a1206785f3d5a7372a733f1cdd88994d10dc0d52feda1a82811 SHA512 a0da6c4687b7ffbfd6787bb115d0e6b99ba6b5d573cbd25bcbf0b214bc3f9c493160f497e748fcfe1ee1928d15623017eda4da2505af2c8a7273721d3e5d1e61 +EBUILD PyQt6-6.5.2.ebuild 5307 BLAKE2B 429cdfbabd96d8998b1323eb2e6e473409be84fb94700d93288c80a709a629fb07f33890d72294af669ba640e8fd3b702088f5436e46b02b79f58739e4718f09 SHA512 713a9d265e099b41b3728cd3f38be7ec9d05061859078731264c14453573569d68896f51c81b96693198f143d6cd06c0b129a2f0ed0ebb48126260cb01d350a2 +MISC metadata.xml 2391 BLAKE2B 16eecbd105ced07699632a4b294f7da74b59ff931e39afb8a21f67f073bfc90ff613d753a67bcd303ea9f2bf35d7b91c1c7a56ece044c421c4e45b5951f5efe3 SHA512 1d595e07e201891c8c7d5635d39db36ccb65c7333cb27c1cd5384a76029b987959df05795283a4474a41a997bf951e577570b7d3a52a9a2975d563767651efae diff --git a/dev-python/PyQt6/PyQt6-6.5.2-r1.ebuild b/dev-python/PyQt6/PyQt6-6.5.2-r1.ebuild new file mode 100644 index 000000000000..08010f0076ec --- /dev/null +++ b/dev-python/PyQt6/PyQt6-6.5.2-r1.ebuild @@ -0,0 +1,172 @@ +# 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} ) + 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.4[${PYTHON_USEDEP}] +" +BDEPEND=" + >=dev-python/PyQt-builder-1.15[${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.5.2.ebuild b/dev-python/PyQt6/PyQt6-6.5.2.ebuild index 709ab50fa52c..1cea7b121eaf 100644 --- a/dev-python/PyQt6/PyQt6-6.5.2.ebuild +++ b/dev-python/PyQt6/PyQt6-6.5.2.ebuild @@ -45,9 +45,8 @@ REQUIRED_USE=" widgets? ( gui ) " -# can use parts of the Qt private api and "sometimes" needs rebuilds wrt := 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}] @@ -61,7 +60,7 @@ DEPEND=" gles2-only? ( media-libs/libglvnd ) ) positioning? ( >=dev-qt/qtpositioning-${QT_PV} ) - qml? ( >=dev-qt/qtdeclarative-${QT_PV} ) + qml? ( >=dev-qt/qtdeclarative-${QT_PV}[widgets?] ) quick3d? ( >=dev-qt/qtquick3d-${QT_PV} ) sensors? ( >=dev-qt/qtsensors-${QT_PV} ) serialport? ( >=dev-qt/qtserialport-${QT_PV} ) diff --git a/dev-python/PyQt6/metadata.xml b/dev-python/PyQt6/metadata.xml index 930d5440dcc5..58da8019ee6e 100644 --- a/dev-python/PyQt6/metadata.xml +++ b/dev-python/PyQt6/metadata.xml @@ -15,6 +15,7 @@ Build bindings for the QtNetwork module Build bindings for the QtNfc module Build bindings for the QtOpenGL module + Build bindings for the QtPdf module (uses pdfium from dev-qt/qtwebengine) Build bindings for the QtPositioning module Build bindings for the QtPrintSupport module Build bindings for the QtQml module and enable the qml plugin -- cgit v1.2.3