From 44a22ab89258383202cae3037c3a5685aa903251 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 5 Sep 2023 16:23:54 +0100 Subject: gentoo auto-resync : 05:09:2023 - 16:23:54 --- dev-python/Manifest.gz | Bin 268263 -> 268263 bytes dev-python/PyQt6-WebEngine/Manifest | 2 +- dev-python/PyQt6-WebEngine/metadata.xml | 6 +- dev-python/PyQt6-sip/Manifest | 2 +- dev-python/PyQt6-sip/metadata.xml | 6 +- dev-python/PyQt6/Manifest | 4 +- dev-python/PyQt6/PyQt6-6.5.2.ebuild | 33 +-- dev-python/PyQt6/metadata.xml | 10 +- dev-python/pyside6/Manifest | 4 +- dev-python/pyside6/pyside6-6.5.1.1-r1.ebuild | 223 +++++++++++++++++++++ dev-python/pyside6/pyside6-6.5.1.1.ebuild | 223 --------------------- dev-python/pyside6/pyside6-6.5.2-r1.ebuild | 223 +++++++++++++++++++++ dev-python/pyside6/pyside6-6.5.2.ebuild | 223 --------------------- dev-python/qiskit-aer/Manifest | 1 - .../files/qiskit-aer-0.12.0-wheel-dep.patch | 22 -- 15 files changed, 484 insertions(+), 498 deletions(-) create mode 100644 dev-python/pyside6/pyside6-6.5.1.1-r1.ebuild delete mode 100644 dev-python/pyside6/pyside6-6.5.1.1.ebuild create mode 100644 dev-python/pyside6/pyside6-6.5.2-r1.ebuild delete mode 100644 dev-python/pyside6/pyside6-6.5.2.ebuild delete mode 100644 dev-python/qiskit-aer/files/qiskit-aer-0.12.0-wheel-dep.patch (limited to 'dev-python') diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz index bdf7c804ab42..249f9a60c718 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 08c459998915..ea8ef8520b55 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 1901 BLAKE2B 94d1c54d3fdea16fc23afbd6434759b3efe38e2d69cb75785d6457d4c17789aeb4cfa56c9f7e664e3327e993c50270497b079fc2b1d67bbc23513bfdec9e2af3 SHA512 94f239cc71cac9599053d32b4fe50c844589a0fb4f20381d441bd74f97e80493e4173e1467a2dd3f28137d0d4e2e4d23f4428e6523ba90b084a034ef1fbd049b -MISC metadata.xml 572 BLAKE2B d0c911bf7d8f4f33e30daabfafe3447367045dce444dda4d8600ea47a844842996989ee7c64ccee6ce77a033bdbd1e7c58136e16ddd5f76a7b5688681f791d2c SHA512 11a8b7ab3fe9fa8e8a7160658aac5b8148a60f30b49bcba92cb08eee6d8f5021e4d117632dcddab98c9a0ebbbecd256ce09fbbe43f05105f7429355f9120e42f +MISC metadata.xml 574 BLAKE2B 1cc3bbf5d25e8aac390530005c225bfc618fbb1bdef3a3d075f445eee2cf68d86feb6ac8841d7e0efd1679b19fc14b33b33accdd7e4932e742f46907a8f98601 SHA512 1af94b1a66be1dd38feb818ba973852912bacacc715e0bd893f8b3de56d17f8902b7486cc487137defad749773a6f728c470cbb9c62d15f91a63d80b16296604 diff --git a/dev-python/PyQt6-WebEngine/metadata.xml b/dev-python/PyQt6-WebEngine/metadata.xml index 88c4a67e1477..1e0abbb7a85c 100644 --- a/dev-python/PyQt6-WebEngine/metadata.xml +++ b/dev-python/PyQt6-WebEngine/metadata.xml @@ -1,9 +1,9 @@ - - ionen@gentoo.org - Ionen Wolkens + + qt@gentoo.org + Gentoo Qt Project Build bindings for the QtWebEngineQuick module diff --git a/dev-python/PyQt6-sip/Manifest b/dev-python/PyQt6-sip/Manifest index 205ff2cddf9f..4caaaad69a49 100644 --- a/dev-python/PyQt6-sip/Manifest +++ b/dev-python/PyQt6-sip/Manifest @@ -1,3 +1,3 @@ DIST PyQt6_sip-13.5.2.tar.gz 111381 BLAKE2B 38d38ed72877525ce2464d4f7bdd53b5c383dea89bd940a7f4db4bde54ebefab5b6f82449a9b915b0d64ae6763bf14d784f3a75e465e76ba44cdda22f1aa14a7 SHA512 b3616b2ab91d1e437dc13b56f7e8cb9edf0cdf5d9d76b5681398cb9d5d793fd09d323a8603969e879f990b81f9743527995c10e70ba5af33b5bb62e3a7967767 EBUILD PyQt6-sip-13.5.2.ebuild 425 BLAKE2B aae93302707b9513d029ffcb74ea5c25d7f597b782863ab832f428c1c09eadf246eeb92d0dda74d04f3e78bc23854cd1507ea1393bdd7bb289558307b4c83092 SHA512 0f512506a22a1af3ea2ad51e39b16ac7568d0d013f2ce279e98d2f435ef029196fc94b4b1836f1606d85260f1dd853f0491e4b4579482740de52fd0a222ed98d -MISC metadata.xml 397 BLAKE2B e634d1d335e66f1999898912570f465e7f4e79f7e8aa60b9ad5e8038078ae65c93db31af3e25a7b879941b97704b81efe7e4ab8a698f710eecca914af733f4e7 SHA512 56fa4d44568faf5818bf66b2fef7c2e7cb5010de8c57c21c3c4c8550ab9da671af5afe71e83890e7432c73e5c299b46b6abf2fedbb519f408c21d395900fa490 +MISC metadata.xml 399 BLAKE2B d762950e9c399c7cd0db4c7e521745824cea16fa2575878b8d20a932914037eabce35cc988532b3711d4447a132fdb4a61383017e3b3f7e89f09db74efb05244 SHA512 7c8fa564a8b30bb8207dd4eb70caaa1da4db60a1bc24dced4df22b371f441daabc484c57dcda87fb89bacbeb706414938750553c59b11da8d392d61531d92a41 diff --git a/dev-python/PyQt6-sip/metadata.xml b/dev-python/PyQt6-sip/metadata.xml index a999cde076c9..4db1b0254ea4 100644 --- a/dev-python/PyQt6-sip/metadata.xml +++ b/dev-python/PyQt6-sip/metadata.xml @@ -1,9 +1,9 @@ - - ionen@gentoo.org - Ionen Wolkens + + qt@gentoo.org + Gentoo Qt Project https://www.riverbankcomputing.com/mailman/listinfo/pyqt/ diff --git a/dev-python/PyQt6/Manifest b/dev-python/PyQt6/Manifest index b4b7e727fd6b..0fc12b5d85d4 100644 --- a/dev-python/PyQt6/Manifest +++ b/dev-python/PyQt6/Manifest @@ -1,3 +1,3 @@ DIST PyQt6-6.5.2.tar.gz 1037215 BLAKE2B dae331dc27975f3ad4fca10cedf093fecabf819d1fd97b873f9a793ce12168af9a72e2b119a4fc3ecf263e1ba42103f48d5198554248743a6289efc8aa3b7d70 SHA512 11da50ff8b914794e8044e136a3c8a79d16aa63ab33045f2807985c2fe2235c1a7682f7e955c9e8852093c34a671ec09d84afaa9d3d59945461797e81911721f -EBUILD PyQt6-6.5.2.ebuild 5267 BLAKE2B 04aa28c34e619197855c357cacb02dbb7d3ba6fd2fad5e712dae14b1a75014f90b1d07b1bcb63e2c246fea1eb146f69b4515611d04efc82f15af93ab5269b5e1 SHA512 2b534688d32b2d1bf81c190aab4bbca961593c4c0cfa5de95932c58eacd0ae1a8b6d4c2fa30578963432667eaa30fd5693c896845e34fbc37c18df6d0efdfa25 -MISC metadata.xml 1995 BLAKE2B 8fda7f9c4a21ad6264b77b4bb9dc76698082e3272647911c7a0afa138c48cde16d18c9d282caa49ce3ffa36b211c51e865af87fc9caf739de106fb3cb6ff6896 SHA512 2ab635404dd6b1be94cad9c5ee424939ded0f26a7415dc766d823ad5b0ede1beae09a90bb519ba82e0b2ffb638c5abc7841c4d1f0c7481a112cef5a56fc96e84 +EBUILD PyQt6-6.5.2.ebuild 5375 BLAKE2B 4fba0f8b473ad9ef5c6764402a6dc597ba1e75e540028d55082b333646599bb4a67f1c203bb7e8dca020990e3c0043d24f8f7d408e2f20b82b73dd3f31f288dc SHA512 397cf49d07f1d9c1baace1466eeb803556354abc3906866133f3c63168d035d1bbe3e60d3c6c46756d94b3b57fd5987c8643a09e1fd9edfbfd72072aa88775d6 +MISC metadata.xml 2277 BLAKE2B 22ee4e39000e75990db2f605303b3a4b8be0032cd82cbeaef4a0cf3730b7fbdc4dc45be9530373471c953e9fd767a54bfde705d67153dc24e70609bb830f37f1 SHA512 09e0c1fb5cae914501c2b8626ca89c7b03bb30d3efee1afe47fb3e938a3d4c1952dc21ad2ca3c6d95efd55fb918e60a21b3bf1b66e7737ae403e8e08d1f53e41 diff --git a/dev-python/PyQt6/PyQt6-6.5.2.ebuild b/dev-python/PyQt6/PyQt6-6.5.2.ebuild index 16495698c205..311aa076e528 100644 --- a/dev-python/PyQt6/PyQt6-6.5.2.ebuild +++ b/dev-python/PyQt6/PyQt6-6.5.2.ebuild @@ -21,9 +21,10 @@ 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=" - +dbus debug qml designer examples gles2-only +gui help multimedia - +network opengl positioning +printsupport quick quick3d serialport - spatialaudio +sql +ssl svg testlib webchannel websockets +widgets +xml + bluetooth +dbus debug designer examples gles2-only +gui help + multimedia +network nfc opengl 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=" @@ -47,6 +48,7 @@ REQUIRED_USE=" # 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?] + bluetooth? ( >=dev-qt/qtconnectivity-${QT_PV}[bluetooth] ) dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] sys-apps/dbus @@ -54,11 +56,16 @@ DEPEND=" designer? ( >=dev-qt/qttools-${QT_PV}[designer] ) help? ( >=dev-qt/qttools-${QT_PV}[assistant] ) multimedia? ( >=dev-qt/qtmultimedia-${QT_PV} ) - opengl? ( gles2-only? ( media-libs/libglvnd ) ) + nfc? ( >=dev-qt/qtconnectivity-${QT_PV}[nfc] ) + opengl? ( + gles2-only? ( media-libs/libglvnd ) + ) positioning? ( >=dev-qt/qtpositioning-${QT_PV} ) qml? ( >=dev-qt/qtdeclarative-${QT_PV} ) 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} ) @@ -103,10 +110,9 @@ python_configure_all() { --verbose --confirm-license - # TODO: enable more as new qt6 packages get added - --disable=QAxContainer - --disable=QtBluetooth --enable=QtCore + + $(pyqt_use_enable bluetooth QtBluetooth) $(pyqt_use_enable dbus QtDBus) $(pyqt_use_enable designer QtDesigner) $(pyqt_use_enable help QtHelp) @@ -115,7 +121,7 @@ python_configure_all() { $(pyqt_use_enable multimedia QtMultimedia \ $(usev widgets QtMultimediaWidgets)) $(pyqt_use_enable network QtNetwork) - --disable=QtNfc + $(pyqt_use_enable nfc QtNfc) $(pyqt_use_enable opengl QtOpenGL \ $(usev widgets QtOpenGLWidgets)) --disable=QtPdf #+QtPdfWidgets (QtPdf is disabled in qtwebengine:6) @@ -125,15 +131,15 @@ python_configure_all() { $(pyqt_use_enable quick QtQuick \ $(usev widgets QtQuickWidgets)) $(pyqt_use_enable quick3d QtQuick3D) - --disable=QtRemoteObjects - --disable=QtSensors + --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) - --disable=QtTextToSpeech + $(pyqt_use_enable speech QtTextToSpeech) $(pyqt_use_enable webchannel QtWebChannel) $(pyqt_use_enable websockets QtWebSockets) $(pyqt_use_enable widgets QtWidgets) @@ -152,9 +158,8 @@ python_configure_all() { $(usev !opengl --disabled-feature=PyQt_OpenGL) $(usev !ssl --disabled-feature=PyQt_SSL) - # TODO: drop this when depend on a >=qtbase- which enables - # -DQT_FEATURE_permissions=ON (currently missing, and the feature - # is furthermore broken with gcc-13 on qtbase's end) + # intended for Windows / Android or others + --disable=QAxContainer --disabled-feature=PyQt_Permissions ) } diff --git a/dev-python/PyQt6/metadata.xml b/dev-python/PyQt6/metadata.xml index e10a52de1e47..930d5440dcc5 100644 --- a/dev-python/PyQt6/metadata.xml +++ b/dev-python/PyQt6/metadata.xml @@ -1,25 +1,29 @@ - - ionen@gentoo.org - Ionen Wolkens + + qt@gentoo.org + Gentoo Qt Project + Build bindings for the QtBluetooth module Build bindings for the QtDBus module Build bindings for the QtDesigner module and enable the designer plugin Build bindings for the QtGui module Build bindings for the QtHelp module Build bindings for the QtMultimedia module Build bindings for the QtNetwork module + Build bindings for the QtNfc module Build bindings for the QtOpenGL module Build bindings for the QtPositioning module Build bindings for the QtPrintSupport module Build bindings for the QtQml module and enable the qml plugin Build bindings for the QtQuick module Build bindings for the QtQuick3D module + Build bindings for the QtSensors module Build bindings for the QtSerialPort module Build bindings for the QtSpatialAudio module + Build bindings for the QtTextToSpeech module Build bindings for the QtSql module Build bindings for the QtSvg module Build bindings for the QtTest module diff --git a/dev-python/pyside6/Manifest b/dev-python/pyside6/Manifest index 02ee115652f8..ddd02b0f85e0 100644 --- a/dev-python/pyside6/Manifest +++ b/dev-python/pyside6/Manifest @@ -2,6 +2,6 @@ AUX pyside6-6.3.1-fix-designer-plugin-install-location.patch 685 BLAKE2B 2f3b387 AUX pyside6-6.3.1-no-strip.patch 953 BLAKE2B f88bac603a584213a864fcfc7c528f1d236ebdbfb653c3877316cd0b95c30c2f7288b1c81c6a90a3e4228536da4aa63552991fefa952f450b0b852b3e2aed94a SHA512 2920075a26fc059bdebc8eb5fa7c15de74729b7f8d1eb59197f7426afa7a65f1f78a8ebb76e946b2dfaf5817dbf090744bafaed2f2156f2d1548c2932a7ce61a DIST pyside-setup-everywhere-src-6.5.1.1.tar.xz 13565304 BLAKE2B 55b221142f5e112a39c0b5df7f7b200f65cfd30da2884340b9bef5e7cb1bcfe2e8ed7aeb0cf7ef5f894f43f6ad582b35e649b7c6430bdba8719e70cca3c29c2d SHA512 fe99ad09b4e0b238175594bbff94453a84c56f21b004477fdab2a2435b4b4148b0b99b26e1b1e1671b71656f4cfb03c3913aa6d85084e3eb8200ff906535a5eb DIST pyside-setup-everywhere-src-6.5.2.tar.xz 13576204 BLAKE2B 3e1d62e6d877140137896552184c8fe56fd62056a1ea506ab474256ee0e2f16d3e10ddb84965602650bb466f3563555c3c344698b6877a45f9130d1e919aba21 SHA512 ca677645579fc6b82285dd6c294909ca5e91a8c8efbc53bd103aff64e3ef89eff67820bfc9100cf50f043015d41c49d4ff86b3008f02505941a09bd54621f403 -EBUILD pyside6-6.5.1.1.ebuild 9149 BLAKE2B c42047649cdd5bb42357288fa8a3195b4a1852eecc07976464fb521fa52d2a648ddc517a7a8a180d1ac0ad076787d0b2d0bb713c2a0cb446924f961304e32f4f SHA512 d5271b0730e49807eaa797e81b49165a41578e5473330f714b632b3a4311d18ee0faa78908223dd8c8cab19efff7c792879ad9e04ff89a0eaed893fe04b97303 -EBUILD pyside6-6.5.2.ebuild 9150 BLAKE2B d8649761cbbbfcb3c7708e691845f0f155ea7031b6fff21c14c4829288147de161b17152c9b56d86174561f039f25b132d03dbbe2229ed1f08ea7e08379ff704 SHA512 4e51e77421463784ecd4d33a312ca5c3da88d7c0ddc07a76df178753e1e12a6c7b6029f565a5a14c905cb7c26baea20e6b58443f35f532d924a323b7cf3fe1b5 +EBUILD pyside6-6.5.1.1-r1.ebuild 9152 BLAKE2B 79b2ee1b8eafe65739b737884d9a808d5ddfc628a4bc0b0718d5bf4c770ae4a1fd047db7263afcafaeeb8fcabedc2a29dd01c98e9a42bb8e3afea3cb15a10667 SHA512 3dedfd17078fa257780d6c98ee4e0309289405464dd0122a56e022d34a35ddf6bedebedf948ef84dbdc5189c8ca194c60b00bd30e052259130db9caf4b1a3768 +EBUILD pyside6-6.5.2-r1.ebuild 9153 BLAKE2B 7d20a0ffa884a78874a0286d04cdaf7a9f99ee7fce764bec70112258af95e4789f39d48bdf7b763be747aefaf1c048478c5c1953dc5037807b70463d6a635842 SHA512 78009ea97d6d3fabef2a6dd3209d6159a234ebbfe899dfb746e610c739f29e02d631bbbd92384c618b96bcf2aa2b3d305d0d445eb17e2c0edf2ca88fec932a02 MISC metadata.xml 1830 BLAKE2B fe8b0657824ef49182b8a5ac334539e10ff88d56f1d0ff517ce9247f0ec1c8b82158688fefde8e01c99fadcb0268e6e0109fef49830ffdec821e803e2ad23517 SHA512 4b49ec54b699673da2c9173f849f70e2a42321608c2893fa9d161a2ff51a917864042b3c0421c3723b98bcbde0d53e78e8c832f25a689dc7e3499d05446a014b diff --git a/dev-python/pyside6/pyside6-6.5.1.1-r1.ebuild b/dev-python/pyside6/pyside6-6.5.1.1-r1.ebuild new file mode 100644 index 000000000000..e428854ccd9b --- /dev/null +++ b/dev-python/pyside6/pyside6-6.5.1.1-r1.ebuild @@ -0,0 +1,223 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# TODO: Add PyPy once officially supported. See also: +# https://bugreports.qt.io/browse/PYSIDE-535 +PYTHON_COMPAT=( python3_{9..11} ) + +inherit cmake python-r1 virtualx + +# TODO: Add conditional support for "QtRemoteObjects" via a new "remoteobjects" +# USE flag after an external "dev-qt/qtremoteobjects" package has been created. +# TODO: Add conditional support for apidoc generation via a new "doc" USE flag. +# Note that doing so requires the Qt source tree, sphinx, and graphviz. Once +# ready, pass the ${QT_SRC_DIR} variable to cmake to enable this support. +# TODO: Disable GLES support if the "gles2-only" USE flag is disabled. Note +# that the "PySide6/QtGui/CMakeLists.txt" and +# "PySide6/QtOpenGLFunctions/CMakeLists.txt" files test for GLES support by +# testing whether the "Qt5::Gui" list property defined by +# "/usr/lib64/cmake/Qt5Gui/Qt5GuiConfig.cmake" at "dev-qt/qtgui" installation +# time contains the substring "opengles2". Since cmake does not permit +# properties to be overridden from the command line, these files must instead +# be conditionally patched to avoid these tests. An issue should be filed with +# upstream requesting a CLI-settable variable to control this. + +MY_PN="pyside-setup-everywhere-src" + +DESCRIPTION="Python bindings for the Qt framework" +HOMEPAGE="https://wiki.qt.io/PySide6" +SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_PN}-${PV}.tar.xz" +S="${WORKDIR}/${MY_PN}-$(ver_cut 1-3)/sources/pyside6" + +# See "sources/pyside6/PySide6/licensecomment.txt" for licensing details. +# Shall we allow essential modules to be disabled? They are: +# (core), gui, widgets, printsupport, sql, network, testlib, concurrent, +# x11extras (for X) +LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )" +SLOT="0" +KEYWORDS="~amd64" +IUSE=" + +dbus charts +concurrent designer gles2-only +gui help multimedia + +network network-auth +opengl positioning +printsupport qml quick + quick3d serialport +sql svg test +testlib webchannel webengine + websockets +widgets +xml +" + +# Manually reextract these requirements on version bumps by running the +# following one-liner from within "${S}": +# $ grep 'set.*_deps' PySide6/Qt*/CMakeLists.txt +# Note that the "designer" USE flag corresponds to the "Qt6UiTools" module. +REQUIRED_USE="${PYTHON_REQUIRED_USE} + charts? ( gui widgets ) + designer? ( widgets ) + gles2-only? ( gui ) + gui? ( dbus opengl ) + help? ( network sql widgets ) + multimedia? ( gui network ) + network-auth? ( network ) + opengl? ( gui ) + printsupport? ( widgets ) + qml? ( network ) + quick? ( gui network opengl qml ) + quick3d? ( gui network opengl qml quick ) + sql? ( widgets ) + svg? ( gui ) + testlib? ( widgets ) + webchannel? ( qml ) + webengine? ( network gui printsupport quick webchannel ) + websockets? ( network ) + widgets? ( gui ) +" + +# Tests fail pretty bad and I'm not fixing them right now +RESTRICT="test" + +# Minimal supported version of Qt. +QT_PV="$(ver_cut 1-2)*:6" + +RDEPEND="${PYTHON_DEPS} + ~dev-python/shiboken6-${PV}[${PYTHON_USEDEP}] + =dev-qt/qtbase-${QT_PV}[concurrent?,dbus?,gles2-only=,network?,opengl?,sql?,widgets?,xml?] + charts? ( =dev-qt/qtcharts-${QT_PV} ) + designer? ( =dev-qt/qttools-${QT_PV}[designer] ) + gui? ( + =dev-qt/qtbase-${QT_PV}[gui,jpeg(+)] + x11-libs/libxkbcommon + ) + help? ( =dev-qt/qttools-${QT_PV}[assistant] ) + multimedia? ( =dev-qt/qtmultimedia-${QT_PV} ) + network-auth? ( =dev-qt/qtnetworkauth-${QT_PV} ) + positioning? ( =dev-qt/qtpositioning-${QT_PV} ) + printsupport? ( =dev-qt/qtbase-${QT_PV}[gui,widgets] ) + qml? ( =dev-qt/qtdeclarative-${QT_PV}[widgets?] ) + quick3d? ( =dev-qt/qtquick3d-${QT_PV} ) + serialport? ( =dev-qt/qtserialport-${QT_PV} ) + svg? ( =dev-qt/qtsvg-${QT_PV} ) + testlib? ( =dev-qt/qtbase-${QT_PV}[gui] ) + webchannel? ( =dev-qt/qtwebchannel-${QT_PV} ) + webengine? ( =dev-qt/qtwebengine-${QT_PV}[widgets?] ) + websockets? ( =dev-qt/qtwebsockets-${QT_PV} ) +" +DEPEND="${RDEPEND} + test? ( =dev-qt/qtbase-${QT_PV}[gui] ) +" +# testlib is toggled by the gui flag on qtbase + +PATCHES=( + "${FILESDIR}/${PN}-6.3.1-no-strip.patch" + "${FILESDIR}/${PN}-6.3.1-fix-designer-plugin-install-location.patch" +) + +src_configure() { + # See collect_module_if_found macros in PySideHelpers.cmake + local mycmakeargs=( + -DBUILD_TESTS=$(usex test) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DAnimation=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DCore=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DExtras=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DInput=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DLogic=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DRender=yes + #-DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Bluetooth=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Charts=$(usex !charts) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Concurrent=$(usex !concurrent) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6DataVisualization=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6DBus=$(usex !dbus) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Designer=$(usex !designer) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Gui=$(usex !gui) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Help=$(usex !help) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6HttpServer=yes + #-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Location=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Multimedia=$(usex !multimedia) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6MultimediaWidgets=$(usex !multimedia yes $(usex !widgets)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6NetworkAuth=$(usex !network-auth) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Network=$(usex !network) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Nfc=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGL=$(usex !opengl) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGLWidgets=$(usex !opengl yes $(usex !widgets)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Pdf=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6PdfWidgets=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Positioning=$(usex !positioning) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6PrintSupport=$(usex !printsupport) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Qml=$(usex !qml) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick3D=$(usex !quick3d) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick=$(usex !quick) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickControls2=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets=$(usex !quick yes $(usex !widgets)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6RemoteObjects=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Scxml=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sensors=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6SerialPort=$(usex !serialport) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6SpatialAudio=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sql=$(usex !sql) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6StateMachine=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Svg=$(usex !svg) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6SvgWidgets=$(usex !svg yes $(usex !widgets)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Test=$(usex !testlib) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6TextToSpeech=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6UiTools=$(usex !designer) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebChannel=$(usex !webchannel) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineCore=$(usex !webengine) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineQuick=$(usex !webengine yes $(usex !quick)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineWidgets=$(usex !webengine yes $(usex !widgets)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebSockets=$(usex !websockets) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets=$(usex !widgets) + #-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WinExtras=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Xml=$(usex !xml) + # try to avoid pre-stripping + -DQFP_NO_OVERRIDE_OPTIMIZATION_FLAGS=yes + -DQFP_NO_STRIP=yes + + ) + + pyside6_configure() { + local mycmakeargs=( + "${mycmakeargs[@]}" + -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" + -DPYTHON_EXECUTABLE="${PYTHON}" + -DPYTHON_SITE_PACKAGES="$(python_get_sitedir)" + -DSHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX="-${EPYTHON}" + ) + cmake_src_configure + } + python_foreach_impl pyside6_configure +} + +src_compile() { + python_foreach_impl cmake_src_compile +} + +src_test() { + local -x PYTHONDONTWRITEBYTECODE + python_foreach_impl virtx cmake_src_test +} + +src_install() { + pyside6_install() { + cmake_src_install + python_optimize + + # Uniquify the shiboken6 pkgconfig dependency in the PySide6 pkgconfig + # file for the current Python target. See also: + # https://github.com/leycec/raiagent/issues/73 + sed -i -e 's~^Requires: shiboken6$~&-'${EPYTHON}'~' \ + "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}.pc || die + + # Uniquify the PySide6 pkgconfig file for the current Python target, + # preserving an unversioned "pyside6.pc" file arbitrarily associated + # with the last Python target. (See the previously linked issue.) + cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die + } + python_foreach_impl pyside6_install + + # CMakeLists.txt installs a "PySide6Targets-gentoo.cmake" file forcing + # downstream consumers (e.g., pyside6-tools) to target one + # "libpyside6-*.so" library linked to one Python interpreter. See also: + # https://bugreports.qt.io/browse/PYSIDE-1053 + # https://github.com/leycec/raiagent/issues/74 + sed -i -e 's~pyside6-python[[:digit:]]\+\.[[:digit:]]\+~pyside6${PYTHON_CONFIG_SUFFIX}~g' \ + "${ED}/usr/$(get_libdir)/cmake/PySide6/PySide6Targets-${CMAKE_BUILD_TYPE,,}.cmake" || die +} diff --git a/dev-python/pyside6/pyside6-6.5.1.1.ebuild b/dev-python/pyside6/pyside6-6.5.1.1.ebuild deleted file mode 100644 index 210891c3043a..000000000000 --- a/dev-python/pyside6/pyside6-6.5.1.1.ebuild +++ /dev/null @@ -1,223 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# TODO: Add PyPy once officially supported. See also: -# https://bugreports.qt.io/browse/PYSIDE-535 -PYTHON_COMPAT=( python3_{9..11} ) - -inherit cmake python-r1 virtualx - -# TODO: Add conditional support for "QtRemoteObjects" via a new "remoteobjects" -# USE flag after an external "dev-qt/qtremoteobjects" package has been created. -# TODO: Add conditional support for apidoc generation via a new "doc" USE flag. -# Note that doing so requires the Qt source tree, sphinx, and graphviz. Once -# ready, pass the ${QT_SRC_DIR} variable to cmake to enable this support. -# TODO: Disable GLES support if the "gles2-only" USE flag is disabled. Note -# that the "PySide6/QtGui/CMakeLists.txt" and -# "PySide6/QtOpenGLFunctions/CMakeLists.txt" files test for GLES support by -# testing whether the "Qt5::Gui" list property defined by -# "/usr/lib64/cmake/Qt5Gui/Qt5GuiConfig.cmake" at "dev-qt/qtgui" installation -# time contains the substring "opengles2". Since cmake does not permit -# properties to be overridden from the command line, these files must instead -# be conditionally patched to avoid these tests. An issue should be filed with -# upstream requesting a CLI-settable variable to control this. - -MY_PN="pyside-setup-everywhere-src" - -DESCRIPTION="Python bindings for the Qt framework" -HOMEPAGE="https://wiki.qt.io/PySide6" -SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_PN}-${PV}.tar.xz" -S="${WORKDIR}/${MY_PN}-$(ver_cut 1-3)/sources/pyside6" - -# See "sources/pyside6/PySide6/licensecomment.txt" for licensing details. -# Shall we allow essential modules to be disabled? They are: -# (core), gui, widgets, printsupport, sql, network, testlib, concurrent, -# x11extras (for X) -LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )" -SLOT="0" -KEYWORDS="~amd64" -IUSE=" - +dbus charts +concurrent designer gles2-only +gui help multimedia - +network network-auth +opengl positioning +printsupport qml quick - quick3d serialport +sql svg test +testlib webchannel webengine - websockets +widgets +xml -" - -# Manually reextract these requirements on version bumps by running the -# following one-liner from within "${S}": -# $ grep 'set.*_deps' PySide6/Qt*/CMakeLists.txt -# Note that the "designer" USE flag corresponds to the "Qt6UiTools" module. -REQUIRED_USE="${PYTHON_REQUIRED_USE} - charts? ( gui widgets ) - designer? ( widgets ) - gles2-only? ( gui ) - gui? ( dbus opengl ) - help? ( network sql widgets ) - multimedia? ( gui network ) - network-auth? ( network ) - opengl? ( gui ) - printsupport? ( widgets ) - qml? ( network ) - quick? ( gui network opengl qml ) - quick3d? ( gui network opengl qml quick ) - sql? ( widgets ) - svg? ( gui ) - testlib? ( widgets ) - webchannel? ( qml ) - webengine? ( network gui printsupport quick webchannel ) - websockets? ( network ) - widgets? ( gui ) -" - -# Tests fail pretty bad and I'm not fixing them right now -RESTRICT="test" - -# Minimal supported version of Qt. -QT_PV="$(ver_cut 1-2)*:6" - -RDEPEND="${PYTHON_DEPS} - ~dev-python/shiboken6-${PV}[${PYTHON_USEDEP}] - =dev-qt/qtbase-${QT_PV}[concurrent?,dbus?,gles2-only=,network?,opengl?,sql?,widgets?,xml?] - charts? ( =dev-qt/qtcharts-${QT_PV} ) - designer? ( =dev-qt/qttools-${QT_PV}[designer] ) - gui? ( - =dev-qt/qtbase-${QT_PV}[gui,jpeg] - x11-libs/libxkbcommon - ) - help? ( =dev-qt/qttools-${QT_PV}[assistant] ) - multimedia? ( =dev-qt/qtmultimedia-${QT_PV} ) - network-auth? ( =dev-qt/qtnetworkauth-${QT_PV} ) - positioning? ( =dev-qt/qtpositioning-${QT_PV} ) - printsupport? ( =dev-qt/qtbase-${QT_PV}[gui,widgets] ) - qml? ( =dev-qt/qtdeclarative-${QT_PV}[widgets?] ) - quick3d? ( =dev-qt/qtquick3d-${QT_PV} ) - serialport? ( =dev-qt/qtserialport-${QT_PV} ) - svg? ( =dev-qt/qtsvg-${QT_PV} ) - testlib? ( =dev-qt/qtbase-${QT_PV}[gui] ) - webchannel? ( =dev-qt/qtwebchannel-${QT_PV} ) - webengine? ( =dev-qt/qtwebengine-${QT_PV}[widgets?] ) - websockets? ( =dev-qt/qtwebsockets-${QT_PV} ) -" -DEPEND="${RDEPEND} - test? ( =dev-qt/qtbase-${QT_PV}[gui] ) -" -# testlib is toggled by the gui flag on qtbase - -PATCHES=( - "${FILESDIR}/${PN}-6.3.1-no-strip.patch" - "${FILESDIR}/${PN}-6.3.1-fix-designer-plugin-install-location.patch" -) - -src_configure() { - # See collect_module_if_found macros in PySideHelpers.cmake - local mycmakeargs=( - -DBUILD_TESTS=$(usex test) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DAnimation=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DCore=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DExtras=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DInput=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DLogic=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DRender=yes - #-DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Bluetooth=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Charts=$(usex !charts) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Concurrent=$(usex !concurrent) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6DataVisualization=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6DBus=$(usex !dbus) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Designer=$(usex !designer) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Gui=$(usex !gui) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Help=$(usex !help) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6HttpServer=yes - #-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Location=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Multimedia=$(usex !multimedia) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6MultimediaWidgets=$(usex !multimedia yes $(usex !widgets)) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6NetworkAuth=$(usex !network-auth) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Network=$(usex !network) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Nfc=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGL=$(usex !opengl) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGLWidgets=$(usex !opengl yes $(usex !widgets)) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Pdf=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6PdfWidgets=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Positioning=$(usex !positioning) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6PrintSupport=$(usex !printsupport) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Qml=$(usex !qml) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick3D=$(usex !quick3d) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick=$(usex !quick) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickControls2=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets=$(usex !quick yes $(usex !widgets)) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6RemoteObjects=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Scxml=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sensors=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6SerialPort=$(usex !serialport) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6SpatialAudio=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sql=$(usex !sql) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6StateMachine=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Svg=$(usex !svg) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6SvgWidgets=$(usex !svg yes $(usex !widgets)) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Test=$(usex !testlib) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6TextToSpeech=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6UiTools=$(usex !designer) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebChannel=$(usex !webchannel) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineCore=$(usex !webengine) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineQuick=$(usex !webengine yes $(usex !quick)) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineWidgets=$(usex !webengine yes $(usex !widgets)) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebSockets=$(usex !websockets) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets=$(usex !widgets) - #-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WinExtras=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Xml=$(usex !xml) - # try to avoid pre-stripping - -DQFP_NO_OVERRIDE_OPTIMIZATION_FLAGS=yes - -DQFP_NO_STRIP=yes - - ) - - pyside6_configure() { - local mycmakeargs=( - "${mycmakeargs[@]}" - -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" - -DPYTHON_EXECUTABLE="${PYTHON}" - -DPYTHON_SITE_PACKAGES="$(python_get_sitedir)" - -DSHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX="-${EPYTHON}" - ) - cmake_src_configure - } - python_foreach_impl pyside6_configure -} - -src_compile() { - python_foreach_impl cmake_src_compile -} - -src_test() { - local -x PYTHONDONTWRITEBYTECODE - python_foreach_impl virtx cmake_src_test -} - -src_install() { - pyside6_install() { - cmake_src_install - python_optimize - - # Uniquify the shiboken6 pkgconfig dependency in the PySide6 pkgconfig - # file for the current Python target. See also: - # https://github.com/leycec/raiagent/issues/73 - sed -i -e 's~^Requires: shiboken6$~&-'${EPYTHON}'~' \ - "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}.pc || die - - # Uniquify the PySide6 pkgconfig file for the current Python target, - # preserving an unversioned "pyside6.pc" file arbitrarily associated - # with the last Python target. (See the previously linked issue.) - cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die - } - python_foreach_impl pyside6_install - - # CMakeLists.txt installs a "PySide6Targets-gentoo.cmake" file forcing - # downstream consumers (e.g., pyside6-tools) to target one - # "libpyside6-*.so" library linked to one Python interpreter. See also: - # https://bugreports.qt.io/browse/PYSIDE-1053 - # https://github.com/leycec/raiagent/issues/74 - sed -i -e 's~pyside6-python[[:digit:]]\+\.[[:digit:]]\+~pyside6${PYTHON_CONFIG_SUFFIX}~g' \ - "${ED}/usr/$(get_libdir)/cmake/PySide6/PySide6Targets-${CMAKE_BUILD_TYPE,,}.cmake" || die -} diff --git a/dev-python/pyside6/pyside6-6.5.2-r1.ebuild b/dev-python/pyside6/pyside6-6.5.2-r1.ebuild new file mode 100644 index 000000000000..09ab09ce3ed7 --- /dev/null +++ b/dev-python/pyside6/pyside6-6.5.2-r1.ebuild @@ -0,0 +1,223 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# TODO: Add PyPy once officially supported. See also: +# https://bugreports.qt.io/browse/PYSIDE-535 +PYTHON_COMPAT=( python3_{10..11} ) + +inherit cmake python-r1 virtualx + +# TODO: Add conditional support for "QtRemoteObjects" via a new "remoteobjects" +# USE flag after an external "dev-qt/qtremoteobjects" package has been created. +# TODO: Add conditional support for apidoc generation via a new "doc" USE flag. +# Note that doing so requires the Qt source tree, sphinx, and graphviz. Once +# ready, pass the ${QT_SRC_DIR} variable to cmake to enable this support. +# TODO: Disable GLES support if the "gles2-only" USE flag is disabled. Note +# that the "PySide6/QtGui/CMakeLists.txt" and +# "PySide6/QtOpenGLFunctions/CMakeLists.txt" files test for GLES support by +# testing whether the "Qt5::Gui" list property defined by +# "/usr/lib64/cmake/Qt5Gui/Qt5GuiConfig.cmake" at "dev-qt/qtgui" installation +# time contains the substring "opengles2". Since cmake does not permit +# properties to be overridden from the command line, these files must instead +# be conditionally patched to avoid these tests. An issue should be filed with +# upstream requesting a CLI-settable variable to control this. + +MY_PN="pyside-setup-everywhere-src" + +DESCRIPTION="Python bindings for the Qt framework" +HOMEPAGE="https://wiki.qt.io/PySide6" +SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_PN}-${PV}.tar.xz" +S="${WORKDIR}/${MY_PN}-$(ver_cut 1-3)/sources/pyside6" + +# See "sources/pyside6/PySide6/licensecomment.txt" for licensing details. +# Shall we allow essential modules to be disabled? They are: +# (core), gui, widgets, printsupport, sql, network, testlib, concurrent, +# x11extras (for X) +LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )" +SLOT="0" +KEYWORDS="~amd64" +IUSE=" + +dbus charts +concurrent designer gles2-only +gui help multimedia + +network network-auth +opengl positioning +printsupport qml quick + quick3d serialport +sql svg test +testlib webchannel webengine + websockets +widgets +xml +" + +# Manually reextract these requirements on version bumps by running the +# following one-liner from within "${S}": +# $ grep 'set.*_deps' PySide6/Qt*/CMakeLists.txt +# Note that the "designer" USE flag corresponds to the "Qt6UiTools" module. +REQUIRED_USE="${PYTHON_REQUIRED_USE} + charts? ( gui widgets ) + designer? ( widgets ) + gles2-only? ( gui ) + gui? ( dbus opengl ) + help? ( network sql widgets ) + multimedia? ( gui network ) + network-auth? ( network ) + opengl? ( gui ) + printsupport? ( widgets ) + qml? ( network ) + quick? ( gui network opengl qml ) + quick3d? ( gui network opengl qml quick ) + sql? ( widgets ) + svg? ( gui ) + testlib? ( widgets ) + webchannel? ( qml ) + webengine? ( network gui printsupport quick webchannel ) + websockets? ( network ) + widgets? ( gui ) +" + +# Tests fail pretty bad and I'm not fixing them right now +RESTRICT="test" + +# Minimal supported version of Qt. +QT_PV="$(ver_cut 1-2)*:6" + +RDEPEND="${PYTHON_DEPS} + ~dev-python/shiboken6-${PV}[${PYTHON_USEDEP}] + =dev-qt/qtbase-${QT_PV}[concurrent?,dbus?,gles2-only=,network?,opengl?,sql?,widgets?,xml?] + charts? ( =dev-qt/qtcharts-${QT_PV} ) + designer? ( =dev-qt/qttools-${QT_PV}[designer] ) + gui? ( + =dev-qt/qtbase-${QT_PV}[gui,jpeg(+)] + x11-libs/libxkbcommon + ) + help? ( =dev-qt/qttools-${QT_PV}[assistant] ) + multimedia? ( =dev-qt/qtmultimedia-${QT_PV} ) + network-auth? ( =dev-qt/qtnetworkauth-${QT_PV} ) + positioning? ( =dev-qt/qtpositioning-${QT_PV} ) + printsupport? ( =dev-qt/qtbase-${QT_PV}[gui,widgets] ) + qml? ( =dev-qt/qtdeclarative-${QT_PV}[widgets?] ) + quick3d? ( =dev-qt/qtquick3d-${QT_PV} ) + serialport? ( =dev-qt/qtserialport-${QT_PV} ) + svg? ( =dev-qt/qtsvg-${QT_PV} ) + testlib? ( =dev-qt/qtbase-${QT_PV}[gui] ) + webchannel? ( =dev-qt/qtwebchannel-${QT_PV} ) + webengine? ( =dev-qt/qtwebengine-${QT_PV}[widgets?] ) + websockets? ( =dev-qt/qtwebsockets-${QT_PV} ) +" +DEPEND="${RDEPEND} + test? ( =dev-qt/qtbase-${QT_PV}[gui] ) +" +# testlib is toggled by the gui flag on qtbase + +PATCHES=( + "${FILESDIR}/${PN}-6.3.1-no-strip.patch" + "${FILESDIR}/${PN}-6.3.1-fix-designer-plugin-install-location.patch" +) + +src_configure() { + # See collect_module_if_found macros in PySideHelpers.cmake + local mycmakeargs=( + -DBUILD_TESTS=$(usex test) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DAnimation=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DCore=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DExtras=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DInput=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DLogic=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DRender=yes + #-DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Bluetooth=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Charts=$(usex !charts) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Concurrent=$(usex !concurrent) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6DataVisualization=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6DBus=$(usex !dbus) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Designer=$(usex !designer) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Gui=$(usex !gui) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Help=$(usex !help) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6HttpServer=yes + #-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Location=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Multimedia=$(usex !multimedia) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6MultimediaWidgets=$(usex !multimedia yes $(usex !widgets)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6NetworkAuth=$(usex !network-auth) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Network=$(usex !network) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Nfc=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGL=$(usex !opengl) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGLWidgets=$(usex !opengl yes $(usex !widgets)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Pdf=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6PdfWidgets=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Positioning=$(usex !positioning) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6PrintSupport=$(usex !printsupport) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Qml=$(usex !qml) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick3D=$(usex !quick3d) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick=$(usex !quick) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickControls2=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets=$(usex !quick yes $(usex !widgets)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6RemoteObjects=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Scxml=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sensors=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6SerialPort=$(usex !serialport) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6SpatialAudio=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sql=$(usex !sql) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6StateMachine=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Svg=$(usex !svg) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6SvgWidgets=$(usex !svg yes $(usex !widgets)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Test=$(usex !testlib) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6TextToSpeech=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6UiTools=$(usex !designer) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebChannel=$(usex !webchannel) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineCore=$(usex !webengine) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineQuick=$(usex !webengine yes $(usex !quick)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineWidgets=$(usex !webengine yes $(usex !widgets)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebSockets=$(usex !websockets) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets=$(usex !widgets) + #-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WinExtras=yes + -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Xml=$(usex !xml) + # try to avoid pre-stripping + -DQFP_NO_OVERRIDE_OPTIMIZATION_FLAGS=yes + -DQFP_NO_STRIP=yes + + ) + + pyside6_configure() { + local mycmakeargs=( + "${mycmakeargs[@]}" + -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" + -DPYTHON_EXECUTABLE="${PYTHON}" + -DPYTHON_SITE_PACKAGES="$(python_get_sitedir)" + -DSHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX="-${EPYTHON}" + ) + cmake_src_configure + } + python_foreach_impl pyside6_configure +} + +src_compile() { + python_foreach_impl cmake_src_compile +} + +src_test() { + local -x PYTHONDONTWRITEBYTECODE + python_foreach_impl virtx cmake_src_test +} + +src_install() { + pyside6_install() { + cmake_src_install + python_optimize + + # Uniquify the shiboken6 pkgconfig dependency in the PySide6 pkgconfig + # file for the current Python target. See also: + # https://github.com/leycec/raiagent/issues/73 + sed -i -e 's~^Requires: shiboken6$~&-'${EPYTHON}'~' \ + "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}.pc || die + + # Uniquify the PySide6 pkgconfig file for the current Python target, + # preserving an unversioned "pyside6.pc" file arbitrarily associated + # with the last Python target. (See the previously linked issue.) + cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die + } + python_foreach_impl pyside6_install + + # CMakeLists.txt installs a "PySide6Targets-gentoo.cmake" file forcing + # downstream consumers (e.g., pyside6-tools) to target one + # "libpyside6-*.so" library linked to one Python interpreter. See also: + # https://bugreports.qt.io/browse/PYSIDE-1053 + # https://github.com/leycec/raiagent/issues/74 + sed -i -e 's~pyside6-python[[:digit:]]\+\.[[:digit:]]\+~pyside6${PYTHON_CONFIG_SUFFIX}~g' \ + "${ED}/usr/$(get_libdir)/cmake/PySide6/PySide6Targets-${CMAKE_BUILD_TYPE,,}.cmake" || die +} diff --git a/dev-python/pyside6/pyside6-6.5.2.ebuild b/dev-python/pyside6/pyside6-6.5.2.ebuild deleted file mode 100644 index 943a1897d3de..000000000000 --- a/dev-python/pyside6/pyside6-6.5.2.ebuild +++ /dev/null @@ -1,223 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# TODO: Add PyPy once officially supported. See also: -# https://bugreports.qt.io/browse/PYSIDE-535 -PYTHON_COMPAT=( python3_{10..11} ) - -inherit cmake python-r1 virtualx - -# TODO: Add conditional support for "QtRemoteObjects" via a new "remoteobjects" -# USE flag after an external "dev-qt/qtremoteobjects" package has been created. -# TODO: Add conditional support for apidoc generation via a new "doc" USE flag. -# Note that doing so requires the Qt source tree, sphinx, and graphviz. Once -# ready, pass the ${QT_SRC_DIR} variable to cmake to enable this support. -# TODO: Disable GLES support if the "gles2-only" USE flag is disabled. Note -# that the "PySide6/QtGui/CMakeLists.txt" and -# "PySide6/QtOpenGLFunctions/CMakeLists.txt" files test for GLES support by -# testing whether the "Qt5::Gui" list property defined by -# "/usr/lib64/cmake/Qt5Gui/Qt5GuiConfig.cmake" at "dev-qt/qtgui" installation -# time contains the substring "opengles2". Since cmake does not permit -# properties to be overridden from the command line, these files must instead -# be conditionally patched to avoid these tests. An issue should be filed with -# upstream requesting a CLI-settable variable to control this. - -MY_PN="pyside-setup-everywhere-src" - -DESCRIPTION="Python bindings for the Qt framework" -HOMEPAGE="https://wiki.qt.io/PySide6" -SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside6/PySide6-${PV}-src/${MY_PN}-${PV}.tar.xz" -S="${WORKDIR}/${MY_PN}-$(ver_cut 1-3)/sources/pyside6" - -# See "sources/pyside6/PySide6/licensecomment.txt" for licensing details. -# Shall we allow essential modules to be disabled? They are: -# (core), gui, widgets, printsupport, sql, network, testlib, concurrent, -# x11extras (for X) -LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )" -SLOT="0" -KEYWORDS="~amd64" -IUSE=" - +dbus charts +concurrent designer gles2-only +gui help multimedia - +network network-auth +opengl positioning +printsupport qml quick - quick3d serialport +sql svg test +testlib webchannel webengine - websockets +widgets +xml -" - -# Manually reextract these requirements on version bumps by running the -# following one-liner from within "${S}": -# $ grep 'set.*_deps' PySide6/Qt*/CMakeLists.txt -# Note that the "designer" USE flag corresponds to the "Qt6UiTools" module. -REQUIRED_USE="${PYTHON_REQUIRED_USE} - charts? ( gui widgets ) - designer? ( widgets ) - gles2-only? ( gui ) - gui? ( dbus opengl ) - help? ( network sql widgets ) - multimedia? ( gui network ) - network-auth? ( network ) - opengl? ( gui ) - printsupport? ( widgets ) - qml? ( network ) - quick? ( gui network opengl qml ) - quick3d? ( gui network opengl qml quick ) - sql? ( widgets ) - svg? ( gui ) - testlib? ( widgets ) - webchannel? ( qml ) - webengine? ( network gui printsupport quick webchannel ) - websockets? ( network ) - widgets? ( gui ) -" - -# Tests fail pretty bad and I'm not fixing them right now -RESTRICT="test" - -# Minimal supported version of Qt. -QT_PV="$(ver_cut 1-2)*:6" - -RDEPEND="${PYTHON_DEPS} - ~dev-python/shiboken6-${PV}[${PYTHON_USEDEP}] - =dev-qt/qtbase-${QT_PV}[concurrent?,dbus?,gles2-only=,network?,opengl?,sql?,widgets?,xml?] - charts? ( =dev-qt/qtcharts-${QT_PV} ) - designer? ( =dev-qt/qttools-${QT_PV}[designer] ) - gui? ( - =dev-qt/qtbase-${QT_PV}[gui,jpeg] - x11-libs/libxkbcommon - ) - help? ( =dev-qt/qttools-${QT_PV}[assistant] ) - multimedia? ( =dev-qt/qtmultimedia-${QT_PV} ) - network-auth? ( =dev-qt/qtnetworkauth-${QT_PV} ) - positioning? ( =dev-qt/qtpositioning-${QT_PV} ) - printsupport? ( =dev-qt/qtbase-${QT_PV}[gui,widgets] ) - qml? ( =dev-qt/qtdeclarative-${QT_PV}[widgets?] ) - quick3d? ( =dev-qt/qtquick3d-${QT_PV} ) - serialport? ( =dev-qt/qtserialport-${QT_PV} ) - svg? ( =dev-qt/qtsvg-${QT_PV} ) - testlib? ( =dev-qt/qtbase-${QT_PV}[gui] ) - webchannel? ( =dev-qt/qtwebchannel-${QT_PV} ) - webengine? ( =dev-qt/qtwebengine-${QT_PV}[widgets?] ) - websockets? ( =dev-qt/qtwebsockets-${QT_PV} ) -" -DEPEND="${RDEPEND} - test? ( =dev-qt/qtbase-${QT_PV}[gui] ) -" -# testlib is toggled by the gui flag on qtbase - -PATCHES=( - "${FILESDIR}/${PN}-6.3.1-no-strip.patch" - "${FILESDIR}/${PN}-6.3.1-fix-designer-plugin-install-location.patch" -) - -src_configure() { - # See collect_module_if_found macros in PySideHelpers.cmake - local mycmakeargs=( - -DBUILD_TESTS=$(usex test) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DAnimation=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DCore=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DExtras=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DInput=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DLogic=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DRender=yes - #-DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Bluetooth=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Charts=$(usex !charts) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Concurrent=$(usex !concurrent) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6DataVisualization=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6DBus=$(usex !dbus) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Designer=$(usex !designer) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Gui=$(usex !gui) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Help=$(usex !help) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6HttpServer=yes - #-DCMAKE_DISABLE_FIND_PACKAGE_Qt6Location=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Multimedia=$(usex !multimedia) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6MultimediaWidgets=$(usex !multimedia yes $(usex !widgets)) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6NetworkAuth=$(usex !network-auth) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Network=$(usex !network) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Nfc=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGL=$(usex !opengl) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGLWidgets=$(usex !opengl yes $(usex !widgets)) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Pdf=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6PdfWidgets=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Positioning=$(usex !positioning) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6PrintSupport=$(usex !printsupport) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Qml=$(usex !qml) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick3D=$(usex !quick3d) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Quick=$(usex !quick) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickControls2=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6QuickWidgets=$(usex !quick yes $(usex !widgets)) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6RemoteObjects=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Scxml=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sensors=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6SerialPort=$(usex !serialport) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6SpatialAudio=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sql=$(usex !sql) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6StateMachine=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Svg=$(usex !svg) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6SvgWidgets=$(usex !svg yes $(usex !widgets)) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Test=$(usex !testlib) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6TextToSpeech=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6UiTools=$(usex !designer) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebChannel=$(usex !webchannel) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineCore=$(usex !webengine) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineQuick=$(usex !webengine yes $(usex !quick)) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineWidgets=$(usex !webengine yes $(usex !widgets)) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebSockets=$(usex !websockets) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets=$(usex !widgets) - #-DCMAKE_DISABLE_FIND_PACKAGE_Qt6WinExtras=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Xml=$(usex !xml) - # try to avoid pre-stripping - -DQFP_NO_OVERRIDE_OPTIMIZATION_FLAGS=yes - -DQFP_NO_STRIP=yes - - ) - - pyside6_configure() { - local mycmakeargs=( - "${mycmakeargs[@]}" - -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" - -DPYTHON_EXECUTABLE="${PYTHON}" - -DPYTHON_SITE_PACKAGES="$(python_get_sitedir)" - -DSHIBOKEN_PYTHON_SHARED_LIBRARY_SUFFIX="-${EPYTHON}" - ) - cmake_src_configure - } - python_foreach_impl pyside6_configure -} - -src_compile() { - python_foreach_impl cmake_src_compile -} - -src_test() { - local -x PYTHONDONTWRITEBYTECODE - python_foreach_impl virtx cmake_src_test -} - -src_install() { - pyside6_install() { - cmake_src_install - python_optimize - - # Uniquify the shiboken6 pkgconfig dependency in the PySide6 pkgconfig - # file for the current Python target. See also: - # https://github.com/leycec/raiagent/issues/73 - sed -i -e 's~^Requires: shiboken6$~&-'${EPYTHON}'~' \ - "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}.pc || die - - # Uniquify the PySide6 pkgconfig file for the current Python target, - # preserving an unversioned "pyside6.pc" file arbitrarily associated - # with the last Python target. (See the previously linked issue.) - cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die - } - python_foreach_impl pyside6_install - - # CMakeLists.txt installs a "PySide6Targets-gentoo.cmake" file forcing - # downstream consumers (e.g., pyside6-tools) to target one - # "libpyside6-*.so" library linked to one Python interpreter. See also: - # https://bugreports.qt.io/browse/PYSIDE-1053 - # https://github.com/leycec/raiagent/issues/74 - sed -i -e 's~pyside6-python[[:digit:]]\+\.[[:digit:]]\+~pyside6${PYTHON_CONFIG_SUFFIX}~g' \ - "${ED}/usr/$(get_libdir)/cmake/PySide6/PySide6Targets-${CMAKE_BUILD_TYPE,,}.cmake" || die -} diff --git a/dev-python/qiskit-aer/Manifest b/dev-python/qiskit-aer/Manifest index 97d34ca0752a..876d54d2f194 100644 --- a/dev-python/qiskit-aer/Manifest +++ b/dev-python/qiskit-aer/Manifest @@ -1,7 +1,6 @@ AUX qiskit-aer-0.10.3-remove-cmake-dependency.patch 253 BLAKE2B 7b5da68c4a6c64ea4b3f0a0ff1a52294783762d8b34f3b7facbbe5bb2657b5cbe0e502ed01ea6c1b4135985391c5d6bc8fccfc34164bb6a88bbaf1e3aa9b3968 SHA512 6d9a14d7c04292efcbb3f7f8abdfa1f1efeeeb081b5775f01162f95fcc9c0f6465863058dd88374b0bb2525dc4fdc3b7408100b3ac990109554b2d77b3a93223 AUX qiskit-aer-0.11.2-terra-test.patch 1728 BLAKE2B bafee3006858ff064285f95a6c275ef83794eb6650b02964b043a6a3f0bd0c3aeaeffc854404ce19d89277328374486e5483d78c22583485b93ffa65b877420d SHA512 9d84dec047247d152aaad053633d0d88cc3cc02e621a1a409a73aa84f502748609abe57657058bf2bc6c0818b6385734556d1ef60a2ea2cfa9019c74208286b1 AUX qiskit-aer-0.12.0-remove-cmake-dependency.patch 504 BLAKE2B 3b64e7cc3e8b3144fc6983e1c5e99cb25197a555d76a79f4d3f32afca017d43c82c96ce4cdd9fe847eb95b3a0ded1fe9efa7569e23ce0032495c1aaedc460c7c SHA512 927715515b98e617648afa869aef56a5d86607c3ef829b7fd01bc7e9df0a626827f576d0ca7579a7d75415a3d82cadbefbb697b363a584c8c2e549306057c5c6 -AUX qiskit-aer-0.12.0-wheel-dep.patch 744 BLAKE2B c37f15fb6a0414bb75e6dfe3143f1348bf0a4b9ddb817b23c831a35d8a07ddb9768406878d7c049af21a6f49c7bb060fe6533638bb85527bd5071e7ce4f9aa95 SHA512 8ed915f188613ddfbce79cb3c51bd84ac32bf24cceceae5c6d7d44720cb5bc42ec5c42bd44e8c0a85f4409c7937ab65b4bb57781b2b6a7654744223833ef6826 DIST qiskit-aer-0.11.2.gh.tar.gz 6707283 BLAKE2B ae32a469d23a31f202b9f970c59e9efb76c290243bce6179b0a58590d671f6dec0428245131e7cb2966b818dae9fbe7e7078a63fac107572e9e7d4a66e47a539 SHA512 48b28f6c54c898bb3984062ec772373e90899fd436c8e00f0c4abd57b6b98ea6c647283445fe551bd516483b66d25c9861ef519f01a0d1ddc6b3ddbce07bc56a DIST qiskit-aer-0.12.2.gh.tar.gz 6979559 BLAKE2B c7f12c9b8f53a9031844e123b8ef6d723e0099be028c5cfba03143fb8b3c7269768ade99d3ef3b4b82c0b36756bf8e82971a3f70c0f5735891eb77a78a6d9512 SHA512 2a9ed6777e5e4d60a393d5a1b21b44ea3fa90fb791aeafda8bbb4ca8b55c7e8161cd5a275fd14bf968a22537cede099dbd419d1a3c5edebe85fdb82501c4de90 EBUILD qiskit-aer-0.11.2-r1.ebuild 3034 BLAKE2B 259fd84cda2e9a4ae2d7ad425f49a1fabc3330537616e9b23e6e0493fae7bc55252039a5eaaba3cb731cae293c5f43af87a124521baa6ab226ff157f96c179e4 SHA512 2c2e457ba55c25762158b5ad37878484ec857eb0445456472d279ba6a5ac9d2fd771b4e654ef72b5901f28b3b1f96eeaabfe86e0ca3a09f5dea38d9fee256f6c diff --git a/dev-python/qiskit-aer/files/qiskit-aer-0.12.0-wheel-dep.patch b/dev-python/qiskit-aer/files/qiskit-aer-0.12.0-wheel-dep.patch deleted file mode 100644 index 49645db8626d..000000000000 --- a/dev-python/qiskit-aer/files/qiskit-aer-0.12.0-wheel-dep.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://github.com/Qiskit/qiskit-aer/pull/1741 - -From 5bf744a9fc033aee2eb448e2595f8e35734982e3 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Fri, 10 Mar 2023 04:56:34 +0000 -Subject: [PATCH] Remove redundant wheel dep from pyproject.toml - -Remove the redundant `wheel` dependency, as it is added by the backend automatically. - -Listing it explicitly in the documentation was a historical mistake and has been fixed since, -see: [pypa/setuptools@f7d30a9](https://github.com/pypa/setuptools/commit/f7d30a9529378cf69054b5176249e5457aaf640a). ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -1,7 +1,6 @@ - [build-system] - requires = [ - "setuptools", -- "wheel", - "conan<2.0.0", - "scikit-build>=0.11.0", - "cmake!=3.17.1,!=3.17.0", - -- cgit v1.2.3