From c99c2410831577bef101e22948e954f85f56cba1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 3 Oct 2023 17:49:12 +0100 Subject: gentoo auto-resync : 03:10:2023 - 17:49:12 --- dev-python/Manifest.gz | Bin 267322 -> 267313 bytes dev-python/pyside2-tools/Manifest | 2 +- .../pyside2-tools/pyside2-tools-5.15.10.ebuild | 2 +- dev-python/pyside2/Manifest | 2 +- dev-python/pyside2/pyside2-5.15.10-r1.ebuild | 226 +++++++++++++++++++++ dev-python/pyside2/pyside2-5.15.10.ebuild | 226 --------------------- dev-python/pyside6-tools/Manifest | 2 - .../pyside6-tools/pyside6-tools-6.5.1.1.ebuild | 64 ------ dev-python/pyside6/Manifest | 4 +- dev-python/pyside6/pyside6-6.5.1.1-r1.ebuild | 223 -------------------- dev-python/pyside6/pyside6-6.5.2-r1.ebuild | 223 -------------------- dev-python/pyside6/pyside6-6.5.2-r2.ebuild | 223 ++++++++++++++++++++ dev-python/shiboken2/Manifest | 4 +- dev-python/shiboken2/shiboken2-5.15.10-r1.ebuild | 173 ++++++++++++++++ dev-python/shiboken2/shiboken2-5.15.10.ebuild | 173 ---------------- dev-python/shiboken2/shiboken2-5.15.9.ebuild | 175 ---------------- dev-python/shiboken6/Manifest | 4 +- dev-python/shiboken6/shiboken6-6.5.1.1.ebuild | 169 --------------- dev-python/shiboken6/shiboken6-6.5.2-r1.ebuild | 169 +++++++++++++++ dev-python/shiboken6/shiboken6-6.5.2.ebuild | 169 --------------- dev-python/widgetsnbextension/Manifest | 4 +- .../widgetsnbextension-4.0.8.ebuild | 4 + .../widgetsnbextension-4.0.9.ebuild | 4 + 23 files changed, 807 insertions(+), 1438 deletions(-) create mode 100644 dev-python/pyside2/pyside2-5.15.10-r1.ebuild delete mode 100644 dev-python/pyside2/pyside2-5.15.10.ebuild delete mode 100644 dev-python/pyside6-tools/pyside6-tools-6.5.1.1.ebuild delete mode 100644 dev-python/pyside6/pyside6-6.5.1.1-r1.ebuild delete mode 100644 dev-python/pyside6/pyside6-6.5.2-r1.ebuild create mode 100644 dev-python/pyside6/pyside6-6.5.2-r2.ebuild create mode 100644 dev-python/shiboken2/shiboken2-5.15.10-r1.ebuild delete mode 100644 dev-python/shiboken2/shiboken2-5.15.10.ebuild delete mode 100644 dev-python/shiboken2/shiboken2-5.15.9.ebuild delete mode 100644 dev-python/shiboken6/shiboken6-6.5.1.1.ebuild create mode 100644 dev-python/shiboken6/shiboken6-6.5.2-r1.ebuild delete mode 100644 dev-python/shiboken6/shiboken6-6.5.2.ebuild (limited to 'dev-python') diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz index 4ad80ea7900b..f5b6ae17d4f6 100644 Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ diff --git a/dev-python/pyside2-tools/Manifest b/dev-python/pyside2-tools/Manifest index ebdbb2f5a544..821697acc895 100644 --- a/dev-python/pyside2-tools/Manifest +++ b/dev-python/pyside2-tools/Manifest @@ -1,4 +1,4 @@ AUX pyside2-tools-5.15.1-dont-install-tools.patch 1782 BLAKE2B a9a1c3cb8d1e6feabbc752bb4bf0af30b645736b9895fe96063dc4a9d5668866523e567f723693b17c6da4101d28713cfa6ad8adadb78e6bb99756d7c69244a2 SHA512 c8b17db89f42a52f4191dda953d7228eafcafd6afb6d7b70527cef090ffd1f073970010a817bede941de10b4e40e41d35fb99b74091baeea6d237c08eb7f225f DIST pyside-setup-opensource-src-5.15.10.tar.xz 3583764 BLAKE2B 7e19e8f8460582012d3fec09ac99f826298cbfcd0887339c2adababb7a21bfc67a2918e91858888e89eca0a6f780929b2a7fa70c28d72ece24b7ea939ca76f56 SHA512 dc548ab870fcc5cc637de1bcb2f428527c650287fdb3720a3ade4638cc0bb12bc4a1ed87e7f6a4ec730a26742e08ceec806bcac6af91c7a01ddc0ce7980a79d2 -EBUILD pyside2-tools-5.15.10.ebuild 1660 BLAKE2B 83fb0df297d0bf9280fa338d5a3ac635eeb2be2eb6015b0653cfd314cb58b2dc95945f4bb93f39a4577ce8c86aefa95b1dc97e246f153f0c27180b69abb1ad15 SHA512 d4ab2877124ac95b86fbaa906d571ff21d5410efd4a78f791785cd7afc8dc776236b133b40428405c7bc8f2545188599d3ad8146a880a7c35d6ff73be405da04 +EBUILD pyside2-tools-5.15.10.ebuild 1661 BLAKE2B bd0332d0e204e18b9ed20b867de3ba7b061c3d2e5dd2a8c75cd54f9ddd1f683a5dbcb7807adec6ddcb5e09c40cfd0856840cd19830fd93b6576c870cd7edb2f5 SHA512 42966f0de37d0bebed199f36ddf57660a15d49e37d7745bac3ce2a9c82706475fca8a55267648871131dea369601ea1ba74f6e79d53f5e81ec50cad578241887 MISC metadata.xml 402 BLAKE2B 28348df442d189eadb56e04dfda71c1d5a56868aae85611a7d77ecdc7651e34ce02563c8da1270aad55758e2dd4301de44434e0bbdb010ef484e240068602ede SHA512 a54866110e38c24d67d60286c64b63dc0b537c55eb201b84b9173b47710b6e8a840d9072ca46fbef969bf481e43e1d8824b20655d7fe6b300cfd5333c3f74a41 diff --git a/dev-python/pyside2-tools/pyside2-tools-5.15.10.ebuild b/dev-python/pyside2-tools/pyside2-tools-5.15.10.ebuild index 160635935c8f..24d169ccfa4f 100644 --- a/dev-python/pyside2-tools/pyside2-tools-5.15.10.ebuild +++ b/dev-python/pyside2-tools/pyside2-tools-5.15.10.ebuild @@ -5,7 +5,7 @@ EAPI=8 # TODO: Add PyPy once officially supported. See also: # https://bugreports.qt.io/browse/PYSIDE-535 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) CMAKE_IN_SOURCE_BUILD=1 inherit cmake python-r1 diff --git a/dev-python/pyside2/Manifest b/dev-python/pyside2/Manifest index 199d411229d9..9ae4ac50ba6d 100644 --- a/dev-python/pyside2/Manifest +++ b/dev-python/pyside2/Manifest @@ -2,5 +2,5 @@ AUX pyside2-5.15.2-python310.patch 508 BLAKE2B bdfc33975d1dd0c9eb73d1bae3ec2aff8 AUX pyside2-5.15.2-python311-fixups.patch 1962 BLAKE2B 37d91352ea09eaef6d36c600165e4fea74145b0fa05620e739254d3983acc501455154fc51ce3448aa4f60a00cd377f0896cb3dc14f1a921d6948dc53c500784 SHA512 39e999c80ed2717eaf59b47c12e64208d1b54d3d61daacf7a8ebeb4586f3b7312dd5db3fc53d4d2f3c426d80729e5d655e9b612153c704b40b7d261ddd57e580 AUX pyside2-5.15.2-python311.patch 1777 BLAKE2B 1afa7c39755c4f91b4b4c951f59e1a3190f924d8b20cf2140ad5342c2fa046ff7e6bec540bea9d7652116894e0cb7f5fa5ea73067212ca5b631382e7139d7786 SHA512 b88f300e4944cbb9adc8ac887e263e74e088a1b291000c86f6677a01241939e612fa5eebba3807fb2318477e68de241914832cc92ed0470726804d3098486120 DIST pyside-setup-opensource-src-5.15.10.tar.xz 3583764 BLAKE2B 7e19e8f8460582012d3fec09ac99f826298cbfcd0887339c2adababb7a21bfc67a2918e91858888e89eca0a6f780929b2a7fa70c28d72ece24b7ea939ca76f56 SHA512 dc548ab870fcc5cc637de1bcb2f428527c650287fdb3720a3ade4638cc0bb12bc4a1ed87e7f6a4ec730a26742e08ceec806bcac6af91c7a01ddc0ce7980a79d2 -EBUILD pyside2-5.15.10.ebuild 9274 BLAKE2B 14b6ec4a40726c64dba1ae6d99572b017330c13d89159dc5941eabd96e32e59009da3efa15f502f78666d38cc2d0cb999a847d387ef3c72f1ed2f4388ac09b1c SHA512 e803850f23bbe725519fc0e85ef1b9577cb149163a255cb5f0cad605fec52ea5f68f362ae64b44ad426abc60252c05f414ef10313764c1d82f5803b5ad783696 +EBUILD pyside2-5.15.10-r1.ebuild 9275 BLAKE2B 2f6ff6c538d47c96e213778fccc079d4b7bc7dca31acba9056226418c2d0ddc9e174b7eaca19a96c61c072208f51922516883bb3d4e3aebc4c4a06e4e4feac2d SHA512 170fdf246cf08af5e34fef18bddb0db7fc1e7d3c8820705a16dd25f5be8faa57fdf4ce960d3a28e4510e6ce622d00edcd15ba436078f03899457c00a10ee9cd3 MISC metadata.xml 2255 BLAKE2B 00982d17109b327ce063f5ba53474603cc73ffb013268ec9f6b751a73792a790f56de285291e70ad12147c27ba97b516be1318df312483d67d72509f8e8d8655 SHA512 830f9510f5e141422cbbab356d34a34b631f948eea14bcc96badbef65ce10f56c648748edc4ddf06be77b1c597a7d12d4552bde122937eb4cda01b304a3193c7 diff --git a/dev-python/pyside2/pyside2-5.15.10-r1.ebuild b/dev-python/pyside2/pyside2-5.15.10-r1.ebuild new file mode 100644 index 000000000000..953d87b2799a --- /dev/null +++ b/dev-python/pyside2/pyside2-5.15.10-r1.ebuild @@ -0,0 +1,226 @@ +# 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 "PySide2/QtGui/CMakeLists.txt" and +# "PySide2/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_P=pyside-setup-opensource-src-${PV} + +DESCRIPTION="Python bindings for the Qt framework" +HOMEPAGE="https://wiki.qt.io/PySide2" +SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz" +S="${WORKDIR}/${MY_P}/sources/pyside2" + +# See "sources/pyside2/PySide2/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 ~arm arm64 ~riscv x86" +IUSE=" + 3d charts +concurrent datavis designer gles2-only +gui help location + multimedia +network positioning +printsupport qml quick script scripttools + scxml sensors speech +sql svg test +testlib webchannel webengine websockets + +widgets +x11extras xml xmlpatterns +" + +# Manually reextract these requirements on version bumps by running the +# following one-liners from within "${S}": +# $ grep 'set.*_deps' PySide2/Qt*/CMakeLists.txt +# $ cat /lib64/cmake/Qt5*/Qt5*.cmake | grep -i DEPENDENCIES +# Note that the "designer" USE flag corresponds to the "Qt5UiTools" module. +REQUIRED_USE="${PYTHON_REQUIRED_USE} + 3d? ( gui network ) + charts? ( gui widgets ) + datavis? ( gui ) + designer? ( gui widgets xml ) + gles2-only? ( gui ) + help? ( gui sql widgets ) + location? ( gui network positioning quick ) + multimedia? ( gui network widgets ) + printsupport? ( gui widgets ) + qml? ( gui network ) + quick? ( gui network qml widgets network ) + scripttools? ( gui script widgets ) + speech? ( multimedia ) + sql? ( widgets ) + svg? ( widgets ) + testlib? ( widgets ) + webchannel? ( qml ) + webengine? ( + gui network positioning quick qml + widgets? ( printsupport network webchannel ) + ) + websockets? ( network ) + widgets? ( gui ) + x11extras? ( 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-3)*:5" + +RDEPEND="${PYTHON_DEPS} + ~dev-python/shiboken2-${PV}[${PYTHON_USEDEP}] + =dev-qt/qtcore-${QT_PV} + =dev-qt/qtopengl-${QT_PV}[gles2-only=] + =dev-qt/qtserialport-${QT_PV} + 3d? ( =dev-qt/qt3d-${QT_PV}[qml?,gles2-only=] ) + charts? ( =dev-qt/qtcharts-${QT_PV}[qml?] ) + concurrent? ( =dev-qt/qtconcurrent-${QT_PV} ) + datavis? ( =dev-qt/qtdatavis3d-${QT_PV}[qml?,gles2-only=] ) + designer? ( =dev-qt/designer-${QT_PV} ) + gui? ( =dev-qt/qtgui-${QT_PV}[jpeg,gles2-only=] ) + help? ( =dev-qt/qthelp-${QT_PV} ) + location? ( =dev-qt/qtlocation-${QT_PV} ) + multimedia? ( =dev-qt/qtmultimedia-${QT_PV}[qml?,gles2-only=,widgets?] ) + network? ( =dev-qt/qtnetwork-${QT_PV} ) + positioning? ( =dev-qt/qtpositioning-${QT_PV}[qml?] ) + printsupport? ( =dev-qt/qtprintsupport-${QT_PV}[gles2-only=] ) + qml? ( =dev-qt/qtdeclarative-${QT_PV}[widgets?] ) + quick? ( + =dev-qt/qtdeclarative-${QT_PV}[widgets?] + =dev-qt/qtquickcontrols2-${QT_PV}[widgets?] + ) + script? ( =dev-qt/qtscript-${QT_PV}[scripttools?] ) + scxml? ( =dev-qt/qtscxml-${QT_PV} ) + sensors? ( =dev-qt/qtsensors-${QT_PV}[qml?] ) + speech? ( =dev-qt/qtspeech-${QT_PV} ) + sql? ( =dev-qt/qtsql-${QT_PV} ) + svg? ( =dev-qt/qtsvg-${QT_PV} ) + testlib? ( =dev-qt/qttest-${QT_PV} ) + webchannel? ( =dev-qt/qtwebchannel-${QT_PV}[qml] ) + webengine? ( =dev-qt/qtwebengine-${QT_PV}[alsa,widgets?] ) + websockets? ( =dev-qt/qtwebsockets-${QT_PV}[qml?] ) + widgets? ( =dev-qt/qtwidgets-${QT_PV}[gles2-only=] ) + x11extras? ( =dev-qt/qtx11extras-${QT_PV} ) + xml? ( =dev-qt/qtxml-${QT_PV} ) + xmlpatterns? ( =dev-qt/qtxmlpatterns-${QT_PV}[qml?] ) +" +DEPEND="${RDEPEND} + test? ( x11-misc/xvfb-run ) +" + +PATCHES=( + "${FILESDIR}/${PN}-5.15.2-python310.patch" + "${FILESDIR}/${PN}-5.15.2-python311.patch" + "${FILESDIR}/${PN}-5.15.2-python311-fixups.patch" +) + +src_configure() { + # See COLLECT_MODULE_IF_FOUND macros in CMakeLists.txt + local mycmakeargs=( + -DBUILD_TESTS=$(usex test) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DAnimation=$(usex !3d) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DCore=$(usex !3d) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DExtras=$(usex !3d) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DInput=$(usex !3d) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DLogic=$(usex !3d) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DRender=$(usex !3d) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Charts=$(usex !charts) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Concurrent=$(usex !concurrent) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5DataVisualization=$(usex !datavis) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=$(usex !designer) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Gui=$(usex !gui) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Help=$(usex !help) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Location=$(usex !location) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Multimedia=$(usex !multimedia) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5MultimediaWidgets=$(usex !multimedia yes $(usex !widgets)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Network=$(usex !network) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Positioning=$(usex !positioning) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5PrintSupport=$(usex !printsupport) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Qml=$(usex !qml) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Quick=$(usex !quick) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5QuickControls2=$(usex !quick) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5QuickWidgets=$(usex !quick yes $(usex !widgets)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Script=$(usex !script) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5ScriptTools=$(usex !scripttools) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Scxml=$(usex !scxml) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sensors=$(usex !sensors) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5TextToSpeech=$(usex !speech) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sql=$(usex !sql) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Svg=$(usex !svg) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Test=$(usex !testlib) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5UiTools=$(usex !designer) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebChannel=$(usex !webchannel) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngine=$(usex !webengine) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineCore=$(usex !webengine) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets=$(usex !webengine yes $(usex !widgets)) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebSockets=$(usex !websockets) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=$(usex !widgets) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras=$(usex !x11extras) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Xml=$(usex !xml) + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5XmlPatterns=$(usex !xmlpatterns) + ) + + pyside2_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 pyside2_configure +} + +src_compile() { + python_foreach_impl cmake_src_compile +} + +src_test() { + local -x PYTHONDONTWRITEBYTECODE + python_foreach_impl virtx cmake_src_test +} + +src_install() { + pyside2_install() { + cmake_src_install + python_optimize + + # Uniquify the shiboken2 pkgconfig dependency in the PySide2 pkgconfig + # file for the current Python target. See also: + # https://github.com/leycec/raiagent/issues/73 + sed -i -e 's~^Requires: shiboken2$~&-'${EPYTHON}'~' \ + "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}.pc || die + + # Uniquify the PySide2 pkgconfig file for the current Python target, + # preserving an unversioned "pyside2.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 pyside2_install + + # CMakeLists.txt installs a "PySide2Targets-gentoo.cmake" file forcing + # downstream consumers (e.g., pyside2-tools) to target one + # "libpyside2-*.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~pyside2-python[[:digit:]]\+\.[[:digit:]]\+~pyside2${PYTHON_CONFIG_SUFFIX}~g' \ + "${ED}/usr/$(get_libdir)"/cmake/PySide2*/PySide2Targets-${CMAKE_BUILD_TYPE,,}.cmake || die +} diff --git a/dev-python/pyside2/pyside2-5.15.10.ebuild b/dev-python/pyside2/pyside2-5.15.10.ebuild deleted file mode 100644 index 3319ffae4898..000000000000 --- a/dev-python/pyside2/pyside2-5.15.10.ebuild +++ /dev/null @@ -1,226 +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 "PySide2/QtGui/CMakeLists.txt" and -# "PySide2/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_P=pyside-setup-opensource-src-${PV} - -DESCRIPTION="Python bindings for the Qt framework" -HOMEPAGE="https://wiki.qt.io/PySide2" -SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz" -S="${WORKDIR}/${MY_P}/sources/pyside2" - -# See "sources/pyside2/PySide2/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 ~arm arm64 ~riscv x86" -IUSE=" - 3d charts +concurrent datavis designer gles2-only +gui help location - multimedia +network positioning +printsupport qml quick script scripttools - scxml sensors speech +sql svg test +testlib webchannel webengine websockets - +widgets +x11extras xml xmlpatterns -" - -# Manually reextract these requirements on version bumps by running the -# following one-liners from within "${S}": -# $ grep 'set.*_deps' PySide2/Qt*/CMakeLists.txt -# $ cat /lib64/cmake/Qt5*/Qt5*.cmake | grep -i DEPENDENCIES -# Note that the "designer" USE flag corresponds to the "Qt5UiTools" module. -REQUIRED_USE="${PYTHON_REQUIRED_USE} - 3d? ( gui network ) - charts? ( gui widgets ) - datavis? ( gui ) - designer? ( gui widgets xml ) - gles2-only? ( gui ) - help? ( gui sql widgets ) - location? ( gui network positioning quick ) - multimedia? ( gui network widgets ) - printsupport? ( gui widgets ) - qml? ( gui network ) - quick? ( gui network qml widgets network ) - scripttools? ( gui script widgets ) - speech? ( multimedia ) - sql? ( widgets ) - svg? ( widgets ) - testlib? ( widgets ) - webchannel? ( qml ) - webengine? ( - gui network positioning quick qml - widgets? ( printsupport network webchannel ) - ) - websockets? ( network ) - widgets? ( gui ) - x11extras? ( 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)*:5" - -RDEPEND="${PYTHON_DEPS} - ~dev-python/shiboken2-${PV}[${PYTHON_USEDEP}] - =dev-qt/qtcore-${QT_PV} - =dev-qt/qtopengl-${QT_PV}[gles2-only=] - =dev-qt/qtserialport-${QT_PV} - 3d? ( =dev-qt/qt3d-${QT_PV}[qml?,gles2-only=] ) - charts? ( =dev-qt/qtcharts-${QT_PV}[qml?] ) - concurrent? ( =dev-qt/qtconcurrent-${QT_PV} ) - datavis? ( =dev-qt/qtdatavis3d-${QT_PV}[qml?,gles2-only=] ) - designer? ( =dev-qt/designer-${QT_PV} ) - gui? ( =dev-qt/qtgui-${QT_PV}[jpeg,gles2-only=] ) - help? ( =dev-qt/qthelp-${QT_PV} ) - location? ( =dev-qt/qtlocation-${QT_PV} ) - multimedia? ( =dev-qt/qtmultimedia-${QT_PV}[qml?,gles2-only=,widgets?] ) - network? ( =dev-qt/qtnetwork-${QT_PV} ) - positioning? ( =dev-qt/qtpositioning-${QT_PV}[qml?] ) - printsupport? ( =dev-qt/qtprintsupport-${QT_PV}[gles2-only=] ) - qml? ( =dev-qt/qtdeclarative-${QT_PV}[widgets?] ) - quick? ( - =dev-qt/qtdeclarative-${QT_PV}[widgets?] - =dev-qt/qtquickcontrols2-${QT_PV}[widgets?] - ) - script? ( =dev-qt/qtscript-${QT_PV}[scripttools?] ) - scxml? ( =dev-qt/qtscxml-${QT_PV} ) - sensors? ( =dev-qt/qtsensors-${QT_PV}[qml?] ) - speech? ( =dev-qt/qtspeech-${QT_PV} ) - sql? ( =dev-qt/qtsql-${QT_PV} ) - svg? ( =dev-qt/qtsvg-${QT_PV} ) - testlib? ( =dev-qt/qttest-${QT_PV} ) - webchannel? ( =dev-qt/qtwebchannel-${QT_PV}[qml] ) - webengine? ( =dev-qt/qtwebengine-${QT_PV}[alsa,widgets?] ) - websockets? ( =dev-qt/qtwebsockets-${QT_PV}[qml?] ) - widgets? ( =dev-qt/qtwidgets-${QT_PV}[gles2-only=] ) - x11extras? ( =dev-qt/qtx11extras-${QT_PV} ) - xml? ( =dev-qt/qtxml-${QT_PV} ) - xmlpatterns? ( =dev-qt/qtxmlpatterns-${QT_PV}[qml?] ) -" -DEPEND="${RDEPEND} - test? ( x11-misc/xvfb-run ) -" - -PATCHES=( - "${FILESDIR}/${PN}-5.15.2-python310.patch" - "${FILESDIR}/${PN}-5.15.2-python311.patch" - "${FILESDIR}/${PN}-5.15.2-python311-fixups.patch" -) - -src_configure() { - # See COLLECT_MODULE_IF_FOUND macros in CMakeLists.txt - local mycmakeargs=( - -DBUILD_TESTS=$(usex test) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DAnimation=$(usex !3d) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DCore=$(usex !3d) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DExtras=$(usex !3d) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DInput=$(usex !3d) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DLogic=$(usex !3d) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt53DRender=$(usex !3d) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Charts=$(usex !charts) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Concurrent=$(usex !concurrent) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5DataVisualization=$(usex !datavis) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Designer=$(usex !designer) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Gui=$(usex !gui) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Help=$(usex !help) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Location=$(usex !location) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Multimedia=$(usex !multimedia) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5MultimediaWidgets=$(usex !multimedia yes $(usex !widgets)) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Network=$(usex !network) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Positioning=$(usex !positioning) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5PrintSupport=$(usex !printsupport) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Qml=$(usex !qml) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Quick=$(usex !quick) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5QuickControls2=$(usex !quick) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5QuickWidgets=$(usex !quick yes $(usex !widgets)) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Script=$(usex !script) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5ScriptTools=$(usex !scripttools) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Scxml=$(usex !scxml) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sensors=$(usex !sensors) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5TextToSpeech=$(usex !speech) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Sql=$(usex !sql) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Svg=$(usex !svg) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Test=$(usex !testlib) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5UiTools=$(usex !designer) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebChannel=$(usex !webchannel) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngine=$(usex !webengine) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineCore=$(usex !webengine) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets=$(usex !webengine yes $(usex !widgets)) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebSockets=$(usex !websockets) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=$(usex !widgets) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5X11Extras=$(usex !x11extras) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Xml=$(usex !xml) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt5XmlPatterns=$(usex !xmlpatterns) - ) - - pyside2_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 pyside2_configure -} - -src_compile() { - python_foreach_impl cmake_src_compile -} - -src_test() { - local -x PYTHONDONTWRITEBYTECODE - python_foreach_impl virtx cmake_src_test -} - -src_install() { - pyside2_install() { - cmake_src_install - python_optimize - - # Uniquify the shiboken2 pkgconfig dependency in the PySide2 pkgconfig - # file for the current Python target. See also: - # https://github.com/leycec/raiagent/issues/73 - sed -i -e 's~^Requires: shiboken2$~&-'${EPYTHON}'~' \ - "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}.pc || die - - # Uniquify the PySide2 pkgconfig file for the current Python target, - # preserving an unversioned "pyside2.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 pyside2_install - - # CMakeLists.txt installs a "PySide2Targets-gentoo.cmake" file forcing - # downstream consumers (e.g., pyside2-tools) to target one - # "libpyside2-*.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~pyside2-python[[:digit:]]\+\.[[:digit:]]\+~pyside2${PYTHON_CONFIG_SUFFIX}~g' \ - "${ED}/usr/$(get_libdir)"/cmake/PySide2*/PySide2Targets-${CMAKE_BUILD_TYPE,,}.cmake || die -} diff --git a/dev-python/pyside6-tools/Manifest b/dev-python/pyside6-tools/Manifest index d71facd529e6..242a46be20a9 100644 --- a/dev-python/pyside6-tools/Manifest +++ b/dev-python/pyside6-tools/Manifest @@ -1,5 +1,3 @@ -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-tools-6.5.1.1.ebuild 1380 BLAKE2B 7924867247c00a4e0e0457a14d9979be11e1ad17fb6c0195da46dbead27083ff570867cafb177843cbcadad553e3734a9d8320b4a5bb8834edc0228e013fdada SHA512 10388c9f9372fd8cb3d5ebc676919570b374eefe6bd246f8b2c32d4ef08d84ffc5336c3e3b4b0a2d6c7394955e7d0286707b29de1bb930154ef1db8176adae5c EBUILD pyside6-tools-6.5.2.ebuild 1381 BLAKE2B 3cc72a8fb39ed8608af3519ce915576ca1c50ed436a8e2fd9e6d8966ce54ff8ecbe3bdfab04368c713c7ea390354c26d6e34103145e2b7451a88f71c78d9c3de SHA512 c8d33463faab4d3eb172105b9108688120bc3d13170b93540b7cdeeed77a284959581c92264b1b2615d4d2ac94ff38fab2117776e161059fda7ead322ed3e461 MISC metadata.xml 402 BLAKE2B 28348df442d189eadb56e04dfda71c1d5a56868aae85611a7d77ecdc7651e34ce02563c8da1270aad55758e2dd4301de44434e0bbdb010ef484e240068602ede SHA512 a54866110e38c24d67d60286c64b63dc0b537c55eb201b84b9173b47710b6e8a840d9072ca46fbef969bf481e43e1d8824b20655d7fe6b300cfd5333c3f74a41 diff --git a/dev-python/pyside6-tools/pyside6-tools-6.5.1.1.ebuild b/dev-python/pyside6-tools/pyside6-tools-6.5.1.1.ebuild deleted file mode 100644 index ed40d74f1f17..000000000000 --- a/dev-python/pyside6-tools/pyside6-tools-6.5.1.1.ebuild +++ /dev/null @@ -1,64 +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} ) -CMAKE_IN_SOURCE_BUILD=1 - -inherit cmake python-r1 - -MY_PN="pyside-setup-everywhere-src" - -DESCRIPTION="PySide development tools (pyside6-lupdate with support for Python)" -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/pyside-tools" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - ~dev-python/pyside6-${PV}[${PYTHON_USEDEP}] -" -DEPEND="${RDEPEND}" - -src_prepare() { - cmake_src_prepare - - python_copy_sources -} - -src_configure() { - pyside-tools_configure() { - local mycmakeargs=( - # the tools conflict with tools from Qt - -DNO_QT_TOOLS=yes - ) - CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_configure - } - - python_foreach_impl pyside-tools_configure -} - -src_compile() { - pyside-tools_compile() { - CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_compile - } - - python_foreach_impl pyside-tools_compile -} - -src_install() { - pyside-tools_install() { - python_doexe "${BUILD_DIR}/"*.py - } - - python_foreach_impl pyside-tools_install - - einstalldocs -} diff --git a/dev-python/pyside6/Manifest b/dev-python/pyside6/Manifest index ddd02b0f85e0..9e9493d9b784 100644 --- a/dev-python/pyside6/Manifest +++ b/dev-python/pyside6/Manifest @@ -1,7 +1,5 @@ AUX pyside6-6.3.1-fix-designer-plugin-install-location.patch 685 BLAKE2B 2f3b3873f4f1f46b737ae85467798b25fd1634a15a391cd7fa04a1c391a56cd57a68ec4f98b51460cd805fc75cc0ee50b9addc4a757520429f6b7e66101ed609 SHA512 76ca097b42b47d3b290966fe805b1b4f58e04ab05d8e5420dfa1014e3399452a0326d964d2304068c78a6a82bcea2883d5c9e6a51b383a7f96a7520cfebdfcad 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-r1.ebuild 9152 BLAKE2B 79b2ee1b8eafe65739b737884d9a808d5ddfc628a4bc0b0718d5bf4c770ae4a1fd047db7263afcafaeeb8fcabedc2a29dd01c98e9a42bb8e3afea3cb15a10667 SHA512 3dedfd17078fa257780d6c98ee4e0309289405464dd0122a56e022d34a35ddf6bedebedf948ef84dbdc5189c8ca194c60b00bd30e052259130db9caf4b1a3768 -EBUILD pyside6-6.5.2-r1.ebuild 9153 BLAKE2B 7d20a0ffa884a78874a0286d04cdaf7a9f99ee7fce764bec70112258af95e4789f39d48bdf7b763be747aefaf1c048478c5c1953dc5037807b70463d6a635842 SHA512 78009ea97d6d3fabef2a6dd3209d6159a234ebbfe899dfb746e610c739f29e02d631bbbd92384c618b96bcf2aa2b3d305d0d445eb17e2c0edf2ca88fec932a02 +EBUILD pyside6-6.5.2-r2.ebuild 9153 BLAKE2B 88cd300638d7cd02bea5bcccd674871fcc4a5c77cea93b8c78a25ce1e5f98b5b34c3db2d05f86360aeedacea2c4e2372c619bc3d8ae83fdd013b74d345e8cc4b SHA512 ba6ca1aef3aa44f6bcd40f53e0b3f2788905d85bcb067b2cdc46eedfdfacd40aea34e02581c86d38a7176ee1d36b8b140fb158523a1f76fe6257f85cf896cf99 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 deleted file mode 100644 index e428854ccd9b..000000000000 --- a/dev-python/pyside6/pyside6-6.5.1.1-r1.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 deleted file mode 100644 index 09ab09ce3ed7..000000000000 --- a/dev-python/pyside6/pyside6-6.5.2-r1.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/pyside6/pyside6-6.5.2-r2.ebuild b/dev-python/pyside6/pyside6-6.5.2-r2.ebuild new file mode 100644 index 000000000000..5d11103e1115 --- /dev/null +++ b/dev-python/pyside6/pyside6-6.5.2-r2.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-3)*: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/shiboken2/Manifest b/dev-python/shiboken2/Manifest index d484e2674482..c787d2ca1620 100644 --- a/dev-python/shiboken2/Manifest +++ b/dev-python/shiboken2/Manifest @@ -5,7 +5,5 @@ AUX shiboken2-5.15.5-python311-3.patch 2363 BLAKE2B 84521be2008dda0fc9398dac2c6e AUX shiboken2-5.15.6-fix-pyside2-compile.patch 422 BLAKE2B bdb66c4ef26fccf4b9f4bc4586fb7ffdd8dfed80bf6315a70c86882f98250e42235ff27265b6c3a4e65e8dd7b233b61201a33808985ffb50e929bc8b5deb864f SHA512 4f608eb93fb72f81a9327699b14d4451261831f5079fac12aa88ce17ac30fc846bd9b461b8f6a4780727507b388f675a116f55ef1c240ced33d941315af4d21c AUX shiboken2-5.15.8-py-limited-api.patch 527 BLAKE2B a27886393ff917dbf3b1318d44d998e574e87ce79dbcc694dedb2dc9da7c173c87b40eb8d6296d2f1f7d6bd3ccffa2e5ae9a11e97a2f4e436d4902b2a447513c SHA512 579b88892e05b2e313f14adebaf62e399fd3f9981955e15a762196ca405b0dccc254edfd941727f777ea97709272475c8df239991d2aa7491e200c61dd66a583 DIST pyside-setup-opensource-src-5.15.10.tar.xz 3583764 BLAKE2B 7e19e8f8460582012d3fec09ac99f826298cbfcd0887339c2adababb7a21bfc67a2918e91858888e89eca0a6f780929b2a7fa70c28d72ece24b7ea939ca76f56 SHA512 dc548ab870fcc5cc637de1bcb2f428527c650287fdb3720a3ade4638cc0bb12bc4a1ed87e7f6a4ec730a26742e08ceec806bcac6af91c7a01ddc0ce7980a79d2 -DIST pyside-setup-opensource-src-5.15.9.tar.xz 3581660 BLAKE2B 65d5317f9ea55385bbe093cf43c214655effd877feed6409acc4f6f65768dcde8c94c4f29157f8d7dcb36d442c649290764706834885b08ecf9934b383b3e2a4 SHA512 cc63d64b909f1fd98b64a0bba61b278b1a5b60059168287546ee36204ede2df4317eb4ce5638a268d387e6db40fec203631fc4a48e4116a6b4a30d675bf876d3 -EBUILD shiboken2-5.15.10.ebuild 6638 BLAKE2B 2c20092ad24ef8cefaeb2e18cfc19ff6eee8f378aa1bdecdbf9ed7f3b4b7f5dfd6acfa3372ab3273a17eb5ca7b6215e8040a9929a66a7a9b1df172e1e1564a09 SHA512 93df9d784ffd1a7bcb87c13b058b5c38964e1465a1aeb64406d32bd1570991038886bf693f9d886c06f8fcf7dbdc74aae2817d75f82b6c951f3c0ba2cf43bc1e -EBUILD shiboken2-5.15.9.ebuild 6734 BLAKE2B c73908fb4de247c194658d413b65bba5de8e5b165381e968a55ec86bbfd752049f6f435ab464b5202830ffae75b27a5ef408c23aca2026c04426e0f741469436 SHA512 80931441a77a052ba4bb549b8ec1213ae793dcdc3bd721a90fb4cf7bb3804e881a1beebac1781144093201959e44d9e0ff5aea8a1a65fc15912e97df499040ca +EBUILD shiboken2-5.15.10-r1.ebuild 6639 BLAKE2B 1ac931d3282c9343a77af12b222d35d60c8ad0b97093a1feb251428de074ffb573a286c21a7f3d554d121d8638ba0e3ecfc8d642da5cba9c6d759f5c1c792f39 SHA512 a6f50ccce960181a5829802099c061edd9f6ae431b683fdfe945fbcb21ab3f74b3c04abe752e90c9f5a67f46339f20ecfcfb1583d80c90c44bed4bc116c58e3c MISC metadata.xml 730 BLAKE2B 803b825adb9fcd4379b1e3fba57d6b1916a81ced12f3b3c7d3ddcd68a0c03e85fcf31d5b07a70deebe073f267fe93a0529f7ffb4b1a9508a2223894883044f3b SHA512 5a462077fee2bd3ac87ab79274be0a718fd9b273fca4946d2d2734cefdf5817e6b4dc478a828b3bc783c63e64a62a6662b482d61eefe57386c15f9703a57fb24 diff --git a/dev-python/shiboken2/shiboken2-5.15.10-r1.ebuild b/dev-python/shiboken2/shiboken2-5.15.10-r1.ebuild new file mode 100644 index 000000000000..b47b73c5ae04 --- /dev/null +++ b/dev-python/shiboken2/shiboken2-5.15.10-r1.ebuild @@ -0,0 +1,173 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# TODO: Split the "/usr/bin/shiboken2" binding generator from the +# "/usr/lib64/libshiboken2-*.so" family of shared libraries. The former +# requires everything (including Clang) at runtime; the latter only requires +# Qt and Python at runtime. Note that "pip" separates these two as well. See: +# https://doc.qt.io/qtforpython/shiboken2/faq.html#is-there-any-runtime-dependency-on-the-generated-binding +# Once split, the PySide2 ebuild should be revised to require +# "/usr/bin/shiboken2" at build time and "libshiboken2-*.so" at runtime. +# TODO: Add PyPy once officially supported. See also: +# https://bugreports.qt.io/browse/PYSIDE-535 +PYTHON_COMPAT=( python3_{10..11} ) + +inherit cmake llvm python-r1 toolchain-funcs + +MY_P=pyside-setup-opensource-src-${PV} + +DESCRIPTION="Python binding generator for C++ libraries" +HOMEPAGE="https://wiki.qt.io/PySide2" +SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz" +S="${WORKDIR}/${MY_P}/sources/shiboken2" + +# The "sources/shiboken2/libshiboken" directory is triple-licensed under the +# GPL v2, v3+, and LGPL v3. All remaining files are licensed under the GPL v3 +# with version 1.0 of a Qt-specific exception enabling shiboken2 output to be +# arbitrarily relicensed. (TODO) +LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3" +SLOT="0" +KEYWORDS="amd64 ~arm arm64 ~riscv x86" +IUSE="+docstrings numpy test vulkan" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# Tests fail pretty bad and I'm not fixing them right now +RESTRICT="test" + +# Minimal supported version of Qt. +QT_PV="$(ver_cut 1-3)*:5" + +# Since Clang is required at both build- and runtime, BDEPEND is omitted here. +LLVM_MAX_SLOT=15 +RDEPEND="${PYTHON_DEPS} + =dev-qt/qtcore-${QT_PV} + =dev-libs/libxml2-2.6.32 + >=dev-libs/libxslt-1.1.19 + =dev-qt/qtxml-${QT_PV} + =dev-qt/qtxmlpatterns-${QT_PV} + ) + numpy? ( dev-python/numpy[${PYTHON_USEDEP}] ) + vulkan? ( dev-util/vulkan-headers ) +" +DEPEND="${RDEPEND} + test? ( =dev-qt/qttest-${QT_PV} ) +" + +DOCS=( AUTHORS ) + +PATCHES=( + "${FILESDIR}"/${PN}-5.15.5-python311-1.patch + "${FILESDIR}"/${PN}-5.15.5-python311-2.patch + "${FILESDIR}"/${PN}-5.15.5-python311-3.patch + "${FILESDIR}"/${PN}-5.15.5-add-numpy-1.23-compatibility.patch +) + +# Ensure the path returned by get_llvm_prefix() contains clang as well. +llvm_check_deps() { + has_version "sys-devel/clang:${LLVM_SLOT}" +} + +src_prepare() { + # TODO: File upstream issue requesting a sane way to disable NumPy support. + if ! use numpy; then + sed -i -e '/\bprint(os\.path\.realpath(numpy))/d' \ + libshiboken/CMakeLists.txt || die + fi + + # Shiboken2 assumes Vulkan headers live under either "$VULKAN_SDK/include" + # or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan". + if use vulkan; then + sed -i -e "s~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral(\"${EPREFIX}/usr/include/vulkan\"), HeaderType::System});~" \ + ApiExtractor/clangparser/compilersupport.cpp || die + fi + + # Shiboken2 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/" + # subdirectory provides Clang builtin includes (e.g., "stddef.h") for the + # currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is + # the largest version specifier that exists under the "/usr/lib/clang/" + # subdirectory. This assumption is false in edge cases, including when + # users downgrade from newer Clang versions but fail to remove those + # versions with "emerge --depclean". See also: + # https://github.com/leycec/raiagent/issues/85 + # + # Sadly, the clang-* family of functions exported by the "toolchain-funcs" + # eclass are defective, returning nonsensical placeholder strings if the + # end user has *NOT* explicitly configured their C++ compiler to be Clang. + # PySide2 does *NOT* care whether the end user has done so or not, as + # PySide2 unconditionally requires Clang in either case. See also: + # https://bugs.gentoo.org/619490 + sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'$(CPP=clang clang-fullversion)'/include"))~' \ + ApiExtractor/clangparser/compilersupport.cpp || die + + cmake_src_prepare +} + +src_configure() { + # Minimal tests for now, 2 failing with the extended version + # FIXME Subscripted generics cannot be used with class and instance checks + local mycmakeargs=( + -DBUILD_TESTS=$(usex test) + -DDISABLE_DOCSTRINGS=$(usex !docstrings) + ) + + shiboken2_configure() { + local mycmakeargs=( + "${mycmakeargs[@]}" + -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" + -DPYTHON_EXECUTABLE="${PYTHON}" + -DUSE_PYTHON_VERSION="${EPYTHON#python}" + ) + # CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable. + local -x LLVM_INSTALL_DIR="$(get_llvm_prefix "${LLVM_MAX_SLOT}")" + cmake_src_configure + } + python_foreach_impl shiboken2_configure +} + +src_compile() { + python_foreach_impl cmake_src_compile +} + +src_test() { + python_foreach_impl cmake_src_test +} + +src_install() { + shiboken2_install() { + cmake_src_install + python_optimize + + # Uniquify the "shiboken2" executable for the current Python target, + # preserving an unversioned "shiboken2" file arbitrarily associated + # with the last Python target. + cp "${ED}"/usr/bin/${PN}{,-${EPYTHON}} || die + + # Uniquify the Shiboken2 pkgconfig file for the current Python target, + # preserving an unversioned "shiboken2.pc" file arbitrarily associated + # with the last Python target. See also: + # https://github.com/leycec/raiagent/issues/73 + cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die + } + python_foreach_impl shiboken2_install + + # CMakeLists.txt installs a "Shiboken2Targets-gentoo.cmake" file forcing + # downstream consumers (e.g., PySide2) to target one "libshiboken2-*.so" + # library and one "shiboken2" executable 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~shiboken2-python[[:digit:]]\+\.[[:digit:]]\+~shiboken2${PYTHON_CONFIG_SUFFIX}~g' \ + -e 's~/bin/shiboken2~/bin/shiboken2${PYTHON_CONFIG_SUFFIX}~g' \ + "${ED}/usr/$(get_libdir)"/cmake/Shiboken2*/Shiboken2Targets-${CMAKE_BUILD_TYPE,,}.cmake || die + + # Remove the broken "shiboken_tool.py" script. By inspection, this script + # reduces to a noop. Moreover, this script raises the following exception: + # FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin/../shiboken_tool.py': '/usr/bin/../shiboken_tool.py' + rm "${ED}"/usr/bin/shiboken_tool.py || die +} diff --git a/dev-python/shiboken2/shiboken2-5.15.10.ebuild b/dev-python/shiboken2/shiboken2-5.15.10.ebuild deleted file mode 100644 index 0a971215217a..000000000000 --- a/dev-python/shiboken2/shiboken2-5.15.10.ebuild +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# TODO: Split the "/usr/bin/shiboken2" binding generator from the -# "/usr/lib64/libshiboken2-*.so" family of shared libraries. The former -# requires everything (including Clang) at runtime; the latter only requires -# Qt and Python at runtime. Note that "pip" separates these two as well. See: -# https://doc.qt.io/qtforpython/shiboken2/faq.html#is-there-any-runtime-dependency-on-the-generated-binding -# Once split, the PySide2 ebuild should be revised to require -# "/usr/bin/shiboken2" at build time and "libshiboken2-*.so" at runtime. -# TODO: Add PyPy once officially supported. See also: -# https://bugreports.qt.io/browse/PYSIDE-535 -PYTHON_COMPAT=( python3_{9..11} ) - -inherit cmake llvm python-r1 toolchain-funcs - -MY_P=pyside-setup-opensource-src-${PV} - -DESCRIPTION="Python binding generator for C++ libraries" -HOMEPAGE="https://wiki.qt.io/PySide2" -SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz" -S="${WORKDIR}/${MY_P}/sources/shiboken2" - -# The "sources/shiboken2/libshiboken" directory is triple-licensed under the -# GPL v2, v3+, and LGPL v3. All remaining files are licensed under the GPL v3 -# with version 1.0 of a Qt-specific exception enabling shiboken2 output to be -# arbitrarily relicensed. (TODO) -LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 ~riscv x86" -IUSE="+docstrings numpy test vulkan" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# 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)*:5" - -# Since Clang is required at both build- and runtime, BDEPEND is omitted here. -LLVM_MAX_SLOT=15 -RDEPEND="${PYTHON_DEPS} - =dev-qt/qtcore-${QT_PV} - =dev-libs/libxml2-2.6.32 - >=dev-libs/libxslt-1.1.19 - =dev-qt/qtxml-${QT_PV} - =dev-qt/qtxmlpatterns-${QT_PV} - ) - numpy? ( dev-python/numpy[${PYTHON_USEDEP}] ) - vulkan? ( dev-util/vulkan-headers ) -" -DEPEND="${RDEPEND} - test? ( =dev-qt/qttest-${QT_PV} ) -" - -DOCS=( AUTHORS ) - -PATCHES=( - "${FILESDIR}"/${PN}-5.15.5-python311-1.patch - "${FILESDIR}"/${PN}-5.15.5-python311-2.patch - "${FILESDIR}"/${PN}-5.15.5-python311-3.patch - "${FILESDIR}"/${PN}-5.15.5-add-numpy-1.23-compatibility.patch -) - -# Ensure the path returned by get_llvm_prefix() contains clang as well. -llvm_check_deps() { - has_version "sys-devel/clang:${LLVM_SLOT}" -} - -src_prepare() { - # TODO: File upstream issue requesting a sane way to disable NumPy support. - if ! use numpy; then - sed -i -e '/\bprint(os\.path\.realpath(numpy))/d' \ - libshiboken/CMakeLists.txt || die - fi - - # Shiboken2 assumes Vulkan headers live under either "$VULKAN_SDK/include" - # or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan". - if use vulkan; then - sed -i -e "s~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral(\"${EPREFIX}/usr/include/vulkan\"), HeaderType::System});~" \ - ApiExtractor/clangparser/compilersupport.cpp || die - fi - - # Shiboken2 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/" - # subdirectory provides Clang builtin includes (e.g., "stddef.h") for the - # currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is - # the largest version specifier that exists under the "/usr/lib/clang/" - # subdirectory. This assumption is false in edge cases, including when - # users downgrade from newer Clang versions but fail to remove those - # versions with "emerge --depclean". See also: - # https://github.com/leycec/raiagent/issues/85 - # - # Sadly, the clang-* family of functions exported by the "toolchain-funcs" - # eclass are defective, returning nonsensical placeholder strings if the - # end user has *NOT* explicitly configured their C++ compiler to be Clang. - # PySide2 does *NOT* care whether the end user has done so or not, as - # PySide2 unconditionally requires Clang in either case. See also: - # https://bugs.gentoo.org/619490 - sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'$(CPP=clang clang-fullversion)'/include"))~' \ - ApiExtractor/clangparser/compilersupport.cpp || die - - cmake_src_prepare -} - -src_configure() { - # Minimal tests for now, 2 failing with the extended version - # FIXME Subscripted generics cannot be used with class and instance checks - local mycmakeargs=( - -DBUILD_TESTS=$(usex test) - -DDISABLE_DOCSTRINGS=$(usex !docstrings) - ) - - shiboken2_configure() { - local mycmakeargs=( - "${mycmakeargs[@]}" - -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" - -DPYTHON_EXECUTABLE="${PYTHON}" - -DUSE_PYTHON_VERSION="${EPYTHON#python}" - ) - # CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable. - local -x LLVM_INSTALL_DIR="$(get_llvm_prefix "${LLVM_MAX_SLOT}")" - cmake_src_configure - } - python_foreach_impl shiboken2_configure -} - -src_compile() { - python_foreach_impl cmake_src_compile -} - -src_test() { - python_foreach_impl cmake_src_test -} - -src_install() { - shiboken2_install() { - cmake_src_install - python_optimize - - # Uniquify the "shiboken2" executable for the current Python target, - # preserving an unversioned "shiboken2" file arbitrarily associated - # with the last Python target. - cp "${ED}"/usr/bin/${PN}{,-${EPYTHON}} || die - - # Uniquify the Shiboken2 pkgconfig file for the current Python target, - # preserving an unversioned "shiboken2.pc" file arbitrarily associated - # with the last Python target. See also: - # https://github.com/leycec/raiagent/issues/73 - cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die - } - python_foreach_impl shiboken2_install - - # CMakeLists.txt installs a "Shiboken2Targets-gentoo.cmake" file forcing - # downstream consumers (e.g., PySide2) to target one "libshiboken2-*.so" - # library and one "shiboken2" executable 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~shiboken2-python[[:digit:]]\+\.[[:digit:]]\+~shiboken2${PYTHON_CONFIG_SUFFIX}~g' \ - -e 's~/bin/shiboken2~/bin/shiboken2${PYTHON_CONFIG_SUFFIX}~g' \ - "${ED}/usr/$(get_libdir)"/cmake/Shiboken2*/Shiboken2Targets-${CMAKE_BUILD_TYPE,,}.cmake || die - - # Remove the broken "shiboken_tool.py" script. By inspection, this script - # reduces to a noop. Moreover, this script raises the following exception: - # FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin/../shiboken_tool.py': '/usr/bin/../shiboken_tool.py' - rm "${ED}"/usr/bin/shiboken_tool.py || die -} diff --git a/dev-python/shiboken2/shiboken2-5.15.9.ebuild b/dev-python/shiboken2/shiboken2-5.15.9.ebuild deleted file mode 100644 index 8fb400960db9..000000000000 --- a/dev-python/shiboken2/shiboken2-5.15.9.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# TODO: Split the "/usr/bin/shiboken2" binding generator from the -# "/usr/lib64/libshiboken2-*.so" family of shared libraries. The former -# requires everything (including Clang) at runtime; the latter only requires -# Qt and Python at runtime. Note that "pip" separates these two as well. See: -# https://doc.qt.io/qtforpython/shiboken2/faq.html#is-there-any-runtime-dependency-on-the-generated-binding -# Once split, the PySide2 ebuild should be revised to require -# "/usr/bin/shiboken2" at build time and "libshiboken2-*.so" at runtime. -# TODO: Add PyPy once officially supported. See also: -# https://bugreports.qt.io/browse/PYSIDE-535 -PYTHON_COMPAT=( python3_{9..11} ) - -inherit cmake llvm python-r1 toolchain-funcs - -MY_P=pyside-setup-opensource-src-${PV} - -DESCRIPTION="Python binding generator for C++ libraries" -HOMEPAGE="https://wiki.qt.io/PySide2" -SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz" -S="${WORKDIR}/${MY_P}/sources/shiboken2" - -# The "sources/shiboken2/libshiboken" directory is triple-licensed under the -# GPL v2, v3+, and LGPL v3. All remaining files are licensed under the GPL v3 -# with version 1.0 of a Qt-specific exception enabling shiboken2 output to be -# arbitrarily relicensed. (TODO) -LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3" -SLOT="0" -KEYWORDS="amd64 ~arm arm64 x86" -IUSE="+docstrings numpy test vulkan" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# 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)*:5" - -# Since Clang is required at both build- and runtime, BDEPEND is omitted here. -LLVM_MAX_SLOT=15 -RDEPEND="${PYTHON_DEPS} - =dev-qt/qtcore-${QT_PV} - =dev-libs/libxml2-2.6.32 - >=dev-libs/libxslt-1.1.19 - =dev-qt/qtxml-${QT_PV} - =dev-qt/qtxmlpatterns-${QT_PV} - ) - numpy? ( dev-python/numpy[${PYTHON_USEDEP}] ) - vulkan? ( dev-util/vulkan-headers ) -" -DEPEND="${RDEPEND} - test? ( =dev-qt/qttest-${QT_PV} ) -" - -DOCS=( AUTHORS ) - -PATCHES=( - "${FILESDIR}"/${PN}-5.15.5-python311-1.patch - "${FILESDIR}"/${PN}-5.15.5-python311-2.patch - "${FILESDIR}"/${PN}-5.15.5-python311-3.patch - "${FILESDIR}"/${PN}-5.15.6-fix-pyside2-compile.patch - "${FILESDIR}"/${PN}-5.15.8-py-limited-api.patch - "${FILESDIR}"/${PN}-5.15.5-add-numpy-1.23-compatibility.patch -) - -# Ensure the path returned by get_llvm_prefix() contains clang as well. -llvm_check_deps() { - has_version "sys-devel/clang:${LLVM_SLOT}" -} - -src_prepare() { - # TODO: File upstream issue requesting a sane way to disable NumPy support. - if ! use numpy; then - sed -i -e '/\bprint(os\.path\.realpath(numpy))/d' \ - libshiboken/CMakeLists.txt || die - fi - - # Shiboken2 assumes Vulkan headers live under either "$VULKAN_SDK/include" - # or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan". - if use vulkan; then - sed -i -e "s~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral(\"${EPREFIX}/usr/include/vulkan\"), HeaderType::System});~" \ - ApiExtractor/clangparser/compilersupport.cpp || die - fi - - # Shiboken2 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/" - # subdirectory provides Clang builtin includes (e.g., "stddef.h") for the - # currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is - # the largest version specifier that exists under the "/usr/lib/clang/" - # subdirectory. This assumption is false in edge cases, including when - # users downgrade from newer Clang versions but fail to remove those - # versions with "emerge --depclean". See also: - # https://github.com/leycec/raiagent/issues/85 - # - # Sadly, the clang-* family of functions exported by the "toolchain-funcs" - # eclass are defective, returning nonsensical placeholder strings if the - # end user has *NOT* explicitly configured their C++ compiler to be Clang. - # PySide2 does *NOT* care whether the end user has done so or not, as - # PySide2 unconditionally requires Clang in either case. See also: - # https://bugs.gentoo.org/619490 - sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'$(CPP=clang clang-fullversion)'/include"))~' \ - ApiExtractor/clangparser/compilersupport.cpp || die - - cmake_src_prepare -} - -src_configure() { - # Minimal tests for now, 2 failing with the extended version - # FIXME Subscripted generics cannot be used with class and instance checks - local mycmakeargs=( - -DBUILD_TESTS=$(usex test) - -DDISABLE_DOCSTRINGS=$(usex !docstrings) - ) - - shiboken2_configure() { - local mycmakeargs=( - "${mycmakeargs[@]}" - -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" - -DPYTHON_EXECUTABLE="${PYTHON}" - -DUSE_PYTHON_VERSION="${EPYTHON#python}" - ) - # CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable. - local -x LLVM_INSTALL_DIR="$(get_llvm_prefix "${LLVM_MAX_SLOT}")" - cmake_src_configure - } - python_foreach_impl shiboken2_configure -} - -src_compile() { - python_foreach_impl cmake_src_compile -} - -src_test() { - python_foreach_impl cmake_src_test -} - -src_install() { - shiboken2_install() { - cmake_src_install - python_optimize - - # Uniquify the "shiboken2" executable for the current Python target, - # preserving an unversioned "shiboken2" file arbitrarily associated - # with the last Python target. - cp "${ED}"/usr/bin/${PN}{,-${EPYTHON}} || die - - # Uniquify the Shiboken2 pkgconfig file for the current Python target, - # preserving an unversioned "shiboken2.pc" file arbitrarily associated - # with the last Python target. See also: - # https://github.com/leycec/raiagent/issues/73 - cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die - } - python_foreach_impl shiboken2_install - - # CMakeLists.txt installs a "Shiboken2Targets-gentoo.cmake" file forcing - # downstream consumers (e.g., PySide2) to target one "libshiboken2-*.so" - # library and one "shiboken2" executable 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~shiboken2-python[[:digit:]]\+\.[[:digit:]]\+~shiboken2${PYTHON_CONFIG_SUFFIX}~g' \ - -e 's~/bin/shiboken2~/bin/shiboken2${PYTHON_CONFIG_SUFFIX}~g' \ - "${ED}/usr/$(get_libdir)"/cmake/Shiboken2*/Shiboken2Targets-${CMAKE_BUILD_TYPE,,}.cmake || die - - # Remove the broken "shiboken_tool.py" script. By inspection, this script - # reduces to a noop. Moreover, this script raises the following exception: - # FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin/../shiboken_tool.py': '/usr/bin/../shiboken_tool.py' - rm "${ED}"/usr/bin/shiboken_tool.py || die -} diff --git a/dev-python/shiboken6/Manifest b/dev-python/shiboken6/Manifest index aeeae568111d..dd1817a0fbfa 100644 --- a/dev-python/shiboken6/Manifest +++ b/dev-python/shiboken6/Manifest @@ -1,6 +1,4 @@ AUX shiboken6-6.3.1-no-strip.patch 1001 BLAKE2B c486f9423d4934c2305e8f3109f017dbebd568573469a2fced8da895fbc61ef07a80e0d1c846e7a57988801d6ec4be05b86b46a8039e6702d667129a899fc137 SHA512 1f3e5b082a978e3ab8d8f4d9a5a0a661b8c063e2ece0221440abe342fbd45d566a384d588dbf00a1e469687f82da3728cd53e35d02077ce6a748d3747de3cec2 -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 shiboken6-6.5.1.1.ebuild 6471 BLAKE2B 62b8a64ee17d0ccfb4605e5f85e6d272090df69834daf51621921b622cc0d74dff442690989b90f68f88a87f35d4b5aa437c54402ba83b6ab8253aec07b29d85 SHA512 d0943869d958a5ae80c40b4f0dfa2f519c310b38865c66b8246bd203ee570d8465359075bbdc0fff4e98f6c0158752f5432d817f1f36ef38785f2fbf140c0e5c -EBUILD shiboken6-6.5.2.ebuild 6472 BLAKE2B c985f564bb9449d66031d2cc2a2cc8c91e5f598cb28c5e22417caabab525f67dbf9e03459e2e798423529a427f782c41a609cb5d2d1a36238094f34d2bc35333 SHA512 3d96663ded62ec5217f15d1a4ee2acba59d8bd4db78f248148751af3519da8f9214652b1e93742f2ef28fa2166b8b689bc60b4aa49ccc712c734c5a4c23f2336 +EBUILD shiboken6-6.5.2-r1.ebuild 6472 BLAKE2B 941e5fbbe728e590719d65618586650fe201a7b02ebda541b7fea81112507a49949af580211055d6b72be368ff927c3fc5de0cd861b9091a62be5e1199ac4942 SHA512 c96c683e68499bc1795589fdc816fbef0feeaa9ec05b12861edf4dfb010420ab101ee6c64f1ba63be6a1eda8b4d25e1ffcd56a46c76bc6b25db989518f2e5cbf MISC metadata.xml 730 BLAKE2B 33e7e589d02ec0517e134aa50407ecb97c6800be3ab7b69174d65776f62c1f25c2b2209d51299d9e0110b5f5e9322ee2c0b43dc89e6b12c40ea322ca9bc8eb3f SHA512 cc4ecdd9bc86ce59c2027c6f87307d32bd76d5d2cd8c07edb6c60cc5317ea52a96136c7597a179d75f1632db2999300d8b8f0567679ba3fc562804774fcdcc98 diff --git a/dev-python/shiboken6/shiboken6-6.5.1.1.ebuild b/dev-python/shiboken6/shiboken6-6.5.1.1.ebuild deleted file mode 100644 index d7d5a598c11e..000000000000 --- a/dev-python/shiboken6/shiboken6-6.5.1.1.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# TODO: Split the "/usr/bin/shiboken6" binding generator from the -# "/usr/lib64/libshiboken6-*.so" family of shared libraries. The former -# requires everything (including Clang) at runtime; the latter only requires -# Qt and Python at runtime. Note that "pip" separates these two as well. See: -# https://doc.qt.io/qtforpython/shiboken6/faq.html#is-there-any-runtime-dependency-on-the-generated-binding -# Once split, the PySide6 ebuild should be revised to require -# "/usr/bin/shiboken6" at build time and "libshiboken6-*.so" at runtime. -# TODO: Add PyPy once officially supported. See also: -# https://bugreports.qt.io/browse/PYSIDE-535 -PYTHON_COMPAT=( python3_{9..11} ) - -inherit cmake llvm python-r1 toolchain-funcs - -MY_PN="pyside-setup-everywhere-src" - -DESCRIPTION="Python binding generator for C++ libraries" -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/shiboken6" - -# The "sources/shiboken6/libshiboken" directory is triple-licensed under the -# GPL v2, v3+, and LGPL v3. All remaining files are licensed under the GPL v3 -# with version 1.0 of a Qt-specific exception enabling shiboken6 output to be -# arbitrarily relicensed. (TODO) -LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+docstrings numpy test vulkan" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# 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" - -# Since Clang is required at both build- and runtime, BDEPEND is omitted here. -LLVM_MAX_SLOT=15 -RDEPEND="${PYTHON_DEPS} - =dev-qt/qtbase-${QT_PV} - =dev-libs/libxml2-2.6.32 - >=dev-libs/libxslt-1.1.19 - ) - numpy? ( dev-python/numpy[${PYTHON_USEDEP}] ) - vulkan? ( dev-util/vulkan-headers ) -" -DEPEND="${RDEPEND} - test? ( =dev-qt/qtbase-${QT_PV}[gui] ) -" -# testlib is toggled by the gui flag on qtbase - -DOCS=( AUTHORS ) - -PATCHES=( - "${FILESDIR}/${PN}-6.3.1-no-strip.patch" -) - -# Ensure the path returned by get_llvm_prefix() contains clang as well. -llvm_check_deps() { - has_version "sys-devel/clang:${LLVM_SLOT}" -} - -src_prepare() { - # TODO: File upstream issue requesting a sane way to disable NumPy support. - if ! use numpy; then - sed -i -e '/\bprint(os\.path\.realpath(numpy))/d' \ - libshiboken/CMakeLists.txt || die - fi - - # Shiboken6 assumes Vulkan headers live under either "$VULKAN_SDK/include" - # or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan". - if use vulkan; then - sed -i -e "s~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral(\"${EPREFIX}/usr/include/vulkan\"), HeaderType::System});~" \ - ApiExtractor/clangparser/compilersupport.cpp || die - fi - - # Shiboken6 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/" - # subdirectory provides Clang builtin includes (e.g., "stddef.h") for the - # currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is - # the largest version specifier that exists under the "/usr/lib/clang/" - # subdirectory. This assumption is false in edge cases, including when - # users downgrade from newer Clang versions but fail to remove those - # versions with "emerge --depclean". See also: - # https://github.com/leycec/raiagent/issues/85 - # - # Sadly, the clang-* family of functions exported by the "toolchain-funcs" - # eclass are defective, returning nonsensical placeholder strings if the - # end user has *NOT* explicitly configured their C++ compiler to be Clang. - # PySide6 does *NOT* care whether the end user has done so or not, as - # PySide6 unconditionally requires Clang in either case. See also: - # https://bugs.gentoo.org/619490 - sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'$(CPP=clang clang-fullversion)'/include"))~' \ - ApiExtractor/clangparser/compilersupport.cpp || die - - cmake_src_prepare -} - -src_configure() { - # Minimal tests for now, 2 failing with the extended version - # FIXME Subscripted generics cannot be used with class and instance checks - local mycmakeargs=( - -DBUILD_TESTS=$(usex test) - -DDISABLE_DOCSTRINGS=$(usex !docstrings) - ) - - shiboken6_configure() { - local mycmakeargs=( - "${mycmakeargs[@]}" - -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" - -DPYTHON_EXECUTABLE="${PYTHON}" - -DUSE_PYTHON_VERSION="${EPYTHON#python}" - ) - # CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable. - local -x LLVM_INSTALL_DIR="$(get_llvm_prefix "${LLVM_MAX_SLOT}")" - cmake_src_configure - } - python_foreach_impl shiboken6_configure -} - -src_compile() { - python_foreach_impl cmake_src_compile -} - -src_test() { - python_foreach_impl cmake_src_test -} - -src_install() { - shiboken6_install() { - cmake_src_install - python_optimize - - # Uniquify the "shiboken6" executable for the current Python target, - # preserving an unversioned "shiboken6" file arbitrarily associated - # with the last Python target. - cp "${ED}"/usr/bin/${PN}{,-${EPYTHON}} || die - - # Uniquify the Shiboken6 pkgconfig file for the current Python target, - # preserving an unversioned "shiboken6.pc" file arbitrarily associated - # with the last Python target. See also: - # https://github.com/leycec/raiagent/issues/73 - cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die - } - python_foreach_impl shiboken6_install - - # CMakeLists.txt installs a "Shiboken6Targets-gentoo.cmake" file forcing - # downstream consumers (e.g., PySide6) to target one "libshiboken6-*.so" - # library and one "shiboken6" executable 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~shiboken6-python[[:digit:]]\+\.[[:digit:]]\+~shiboken6${PYTHON_CONFIG_SUFFIX}~g' \ - -e 's~/bin/shiboken6~/bin/shiboken6${PYTHON_CONFIG_SUFFIX}~g' \ - "${ED}/usr/$(get_libdir)"/cmake/Shiboken6/Shiboken6Targets-${CMAKE_BUILD_TYPE,,}.cmake || die - - # Remove the broken "shiboken_tool.py" script. By inspection, this script - # reduces to a noop. Moreover, this script raises the following exception: - # FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin/../shiboken_tool.py': '/usr/bin/../shiboken_tool.py' - rm "${ED}"/usr/bin/shiboken_tool.py || die -} diff --git a/dev-python/shiboken6/shiboken6-6.5.2-r1.ebuild b/dev-python/shiboken6/shiboken6-6.5.2-r1.ebuild new file mode 100644 index 000000000000..365771516fcd --- /dev/null +++ b/dev-python/shiboken6/shiboken6-6.5.2-r1.ebuild @@ -0,0 +1,169 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# TODO: Split the "/usr/bin/shiboken6" binding generator from the +# "/usr/lib64/libshiboken6-*.so" family of shared libraries. The former +# requires everything (including Clang) at runtime; the latter only requires +# Qt and Python at runtime. Note that "pip" separates these two as well. See: +# https://doc.qt.io/qtforpython/shiboken6/faq.html#is-there-any-runtime-dependency-on-the-generated-binding +# Once split, the PySide6 ebuild should be revised to require +# "/usr/bin/shiboken6" at build time and "libshiboken6-*.so" at runtime. +# TODO: Add PyPy once officially supported. See also: +# https://bugreports.qt.io/browse/PYSIDE-535 +PYTHON_COMPAT=( python3_{10..11} ) + +inherit cmake llvm python-r1 toolchain-funcs + +MY_PN="pyside-setup-everywhere-src" + +DESCRIPTION="Python binding generator for C++ libraries" +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/shiboken6" + +# The "sources/shiboken6/libshiboken" directory is triple-licensed under the +# GPL v2, v3+, and LGPL v3. All remaining files are licensed under the GPL v3 +# with version 1.0 of a Qt-specific exception enabling shiboken6 output to be +# arbitrarily relicensed. (TODO) +LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="+docstrings numpy test vulkan" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# Tests fail pretty bad and I'm not fixing them right now +RESTRICT="test" + +# Minimal supported version of Qt. +QT_PV="$(ver_cut 1-3)*:6" + +# Since Clang is required at both build- and runtime, BDEPEND is omitted here. +LLVM_MAX_SLOT=15 +RDEPEND="${PYTHON_DEPS} + =dev-qt/qtbase-${QT_PV} + =dev-libs/libxml2-2.6.32 + >=dev-libs/libxslt-1.1.19 + ) + numpy? ( dev-python/numpy[${PYTHON_USEDEP}] ) + vulkan? ( dev-util/vulkan-headers ) +" +DEPEND="${RDEPEND} + test? ( =dev-qt/qtbase-${QT_PV}[gui] ) +" +# testlib is toggled by the gui flag on qtbase + +DOCS=( AUTHORS ) + +PATCHES=( + "${FILESDIR}/${PN}-6.3.1-no-strip.patch" +) + +# Ensure the path returned by get_llvm_prefix() contains clang as well. +llvm_check_deps() { + has_version "sys-devel/clang:${LLVM_SLOT}" +} + +src_prepare() { + # TODO: File upstream issue requesting a sane way to disable NumPy support. + if ! use numpy; then + sed -i -e '/\bprint(os\.path\.realpath(numpy))/d' \ + libshiboken/CMakeLists.txt || die + fi + + # Shiboken6 assumes Vulkan headers live under either "$VULKAN_SDK/include" + # or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan". + if use vulkan; then + sed -i -e "s~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral(\"${EPREFIX}/usr/include/vulkan\"), HeaderType::System});~" \ + ApiExtractor/clangparser/compilersupport.cpp || die + fi + + # Shiboken6 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/" + # subdirectory provides Clang builtin includes (e.g., "stddef.h") for the + # currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is + # the largest version specifier that exists under the "/usr/lib/clang/" + # subdirectory. This assumption is false in edge cases, including when + # users downgrade from newer Clang versions but fail to remove those + # versions with "emerge --depclean". See also: + # https://github.com/leycec/raiagent/issues/85 + # + # Sadly, the clang-* family of functions exported by the "toolchain-funcs" + # eclass are defective, returning nonsensical placeholder strings if the + # end user has *NOT* explicitly configured their C++ compiler to be Clang. + # PySide6 does *NOT* care whether the end user has done so or not, as + # PySide6 unconditionally requires Clang in either case. See also: + # https://bugs.gentoo.org/619490 + sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'$(CPP=clang clang-fullversion)'/include"))~' \ + ApiExtractor/clangparser/compilersupport.cpp || die + + cmake_src_prepare +} + +src_configure() { + # Minimal tests for now, 2 failing with the extended version + # FIXME Subscripted generics cannot be used with class and instance checks + local mycmakeargs=( + -DBUILD_TESTS=$(usex test) + -DDISABLE_DOCSTRINGS=$(usex !docstrings) + ) + + shiboken6_configure() { + local mycmakeargs=( + "${mycmakeargs[@]}" + -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" + -DPYTHON_EXECUTABLE="${PYTHON}" + -DUSE_PYTHON_VERSION="${EPYTHON#python}" + ) + # CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable. + local -x LLVM_INSTALL_DIR="$(get_llvm_prefix "${LLVM_MAX_SLOT}")" + cmake_src_configure + } + python_foreach_impl shiboken6_configure +} + +src_compile() { + python_foreach_impl cmake_src_compile +} + +src_test() { + python_foreach_impl cmake_src_test +} + +src_install() { + shiboken6_install() { + cmake_src_install + python_optimize + + # Uniquify the "shiboken6" executable for the current Python target, + # preserving an unversioned "shiboken6" file arbitrarily associated + # with the last Python target. + cp "${ED}"/usr/bin/${PN}{,-${EPYTHON}} || die + + # Uniquify the Shiboken6 pkgconfig file for the current Python target, + # preserving an unversioned "shiboken6.pc" file arbitrarily associated + # with the last Python target. See also: + # https://github.com/leycec/raiagent/issues/73 + cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die + } + python_foreach_impl shiboken6_install + + # CMakeLists.txt installs a "Shiboken6Targets-gentoo.cmake" file forcing + # downstream consumers (e.g., PySide6) to target one "libshiboken6-*.so" + # library and one "shiboken6" executable 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~shiboken6-python[[:digit:]]\+\.[[:digit:]]\+~shiboken6${PYTHON_CONFIG_SUFFIX}~g' \ + -e 's~/bin/shiboken6~/bin/shiboken6${PYTHON_CONFIG_SUFFIX}~g' \ + "${ED}/usr/$(get_libdir)"/cmake/Shiboken6/Shiboken6Targets-${CMAKE_BUILD_TYPE,,}.cmake || die + + # Remove the broken "shiboken_tool.py" script. By inspection, this script + # reduces to a noop. Moreover, this script raises the following exception: + # FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin/../shiboken_tool.py': '/usr/bin/../shiboken_tool.py' + rm "${ED}"/usr/bin/shiboken_tool.py || die +} diff --git a/dev-python/shiboken6/shiboken6-6.5.2.ebuild b/dev-python/shiboken6/shiboken6-6.5.2.ebuild deleted file mode 100644 index b5ec49a76c68..000000000000 --- a/dev-python/shiboken6/shiboken6-6.5.2.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# TODO: Split the "/usr/bin/shiboken6" binding generator from the -# "/usr/lib64/libshiboken6-*.so" family of shared libraries. The former -# requires everything (including Clang) at runtime; the latter only requires -# Qt and Python at runtime. Note that "pip" separates these two as well. See: -# https://doc.qt.io/qtforpython/shiboken6/faq.html#is-there-any-runtime-dependency-on-the-generated-binding -# Once split, the PySide6 ebuild should be revised to require -# "/usr/bin/shiboken6" at build time and "libshiboken6-*.so" at runtime. -# TODO: Add PyPy once officially supported. See also: -# https://bugreports.qt.io/browse/PYSIDE-535 -PYTHON_COMPAT=( python3_{10..11} ) - -inherit cmake llvm python-r1 toolchain-funcs - -MY_PN="pyside-setup-everywhere-src" - -DESCRIPTION="Python binding generator for C++ libraries" -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/shiboken6" - -# The "sources/shiboken6/libshiboken" directory is triple-licensed under the -# GPL v2, v3+, and LGPL v3. All remaining files are licensed under the GPL v3 -# with version 1.0 of a Qt-specific exception enabling shiboken6 output to be -# arbitrarily relicensed. (TODO) -LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+docstrings numpy test vulkan" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# 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" - -# Since Clang is required at both build- and runtime, BDEPEND is omitted here. -LLVM_MAX_SLOT=15 -RDEPEND="${PYTHON_DEPS} - =dev-qt/qtbase-${QT_PV} - =dev-libs/libxml2-2.6.32 - >=dev-libs/libxslt-1.1.19 - ) - numpy? ( dev-python/numpy[${PYTHON_USEDEP}] ) - vulkan? ( dev-util/vulkan-headers ) -" -DEPEND="${RDEPEND} - test? ( =dev-qt/qtbase-${QT_PV}[gui] ) -" -# testlib is toggled by the gui flag on qtbase - -DOCS=( AUTHORS ) - -PATCHES=( - "${FILESDIR}/${PN}-6.3.1-no-strip.patch" -) - -# Ensure the path returned by get_llvm_prefix() contains clang as well. -llvm_check_deps() { - has_version "sys-devel/clang:${LLVM_SLOT}" -} - -src_prepare() { - # TODO: File upstream issue requesting a sane way to disable NumPy support. - if ! use numpy; then - sed -i -e '/\bprint(os\.path\.realpath(numpy))/d' \ - libshiboken/CMakeLists.txt || die - fi - - # Shiboken6 assumes Vulkan headers live under either "$VULKAN_SDK/include" - # or "$VK_SDK_PATH/include" rather than "${EPREFIX}/usr/include/vulkan". - if use vulkan; then - sed -i -e "s~\bdetectVulkan(&headerPaths);~headerPaths.append(HeaderPath{QByteArrayLiteral(\"${EPREFIX}/usr/include/vulkan\"), HeaderType::System});~" \ - ApiExtractor/clangparser/compilersupport.cpp || die - fi - - # Shiboken6 assumes the "/usr/lib/clang/${CLANG_NEWEST_VERSION}/include/" - # subdirectory provides Clang builtin includes (e.g., "stddef.h") for the - # currently installed version of Clang, where ${CLANG_NEWEST_VERSION} is - # the largest version specifier that exists under the "/usr/lib/clang/" - # subdirectory. This assumption is false in edge cases, including when - # users downgrade from newer Clang versions but fail to remove those - # versions with "emerge --depclean". See also: - # https://github.com/leycec/raiagent/issues/85 - # - # Sadly, the clang-* family of functions exported by the "toolchain-funcs" - # eclass are defective, returning nonsensical placeholder strings if the - # end user has *NOT* explicitly configured their C++ compiler to be Clang. - # PySide6 does *NOT* care whether the end user has done so or not, as - # PySide6 unconditionally requires Clang in either case. See also: - # https://bugs.gentoo.org/619490 - sed -i -e 's~(findClangBuiltInIncludesDir())~(QStringLiteral("'"${EPREFIX}"'/usr/lib/clang/'$(CPP=clang clang-fullversion)'/include"))~' \ - ApiExtractor/clangparser/compilersupport.cpp || die - - cmake_src_prepare -} - -src_configure() { - # Minimal tests for now, 2 failing with the extended version - # FIXME Subscripted generics cannot be used with class and instance checks - local mycmakeargs=( - -DBUILD_TESTS=$(usex test) - -DDISABLE_DOCSTRINGS=$(usex !docstrings) - ) - - shiboken6_configure() { - local mycmakeargs=( - "${mycmakeargs[@]}" - -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" - -DPYTHON_EXECUTABLE="${PYTHON}" - -DUSE_PYTHON_VERSION="${EPYTHON#python}" - ) - # CMakeLists.txt expects LLVM_INSTALL_DIR as an environment variable. - local -x LLVM_INSTALL_DIR="$(get_llvm_prefix "${LLVM_MAX_SLOT}")" - cmake_src_configure - } - python_foreach_impl shiboken6_configure -} - -src_compile() { - python_foreach_impl cmake_src_compile -} - -src_test() { - python_foreach_impl cmake_src_test -} - -src_install() { - shiboken6_install() { - cmake_src_install - python_optimize - - # Uniquify the "shiboken6" executable for the current Python target, - # preserving an unversioned "shiboken6" file arbitrarily associated - # with the last Python target. - cp "${ED}"/usr/bin/${PN}{,-${EPYTHON}} || die - - # Uniquify the Shiboken6 pkgconfig file for the current Python target, - # preserving an unversioned "shiboken6.pc" file arbitrarily associated - # with the last Python target. See also: - # https://github.com/leycec/raiagent/issues/73 - cp "${ED}/usr/$(get_libdir)"/pkgconfig/${PN}{,-${EPYTHON}}.pc || die - } - python_foreach_impl shiboken6_install - - # CMakeLists.txt installs a "Shiboken6Targets-gentoo.cmake" file forcing - # downstream consumers (e.g., PySide6) to target one "libshiboken6-*.so" - # library and one "shiboken6" executable 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~shiboken6-python[[:digit:]]\+\.[[:digit:]]\+~shiboken6${PYTHON_CONFIG_SUFFIX}~g' \ - -e 's~/bin/shiboken6~/bin/shiboken6${PYTHON_CONFIG_SUFFIX}~g' \ - "${ED}/usr/$(get_libdir)"/cmake/Shiboken6/Shiboken6Targets-${CMAKE_BUILD_TYPE,,}.cmake || die - - # Remove the broken "shiboken_tool.py" script. By inspection, this script - # reduces to a noop. Moreover, this script raises the following exception: - # FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin/../shiboken_tool.py': '/usr/bin/../shiboken_tool.py' - rm "${ED}"/usr/bin/shiboken_tool.py || die -} diff --git a/dev-python/widgetsnbextension/Manifest b/dev-python/widgetsnbextension/Manifest index e01bb1bae125..e5711af6af71 100644 --- a/dev-python/widgetsnbextension/Manifest +++ b/dev-python/widgetsnbextension/Manifest @@ -1,5 +1,5 @@ DIST widgetsnbextension-4.0.8.tar.gz 1147105 BLAKE2B 295d3bde4197f029c037510eb8579f48fec1d3ccf3a13f54dc900a35fb427dd89324fb65e71b8017770ecb3d9a5b947e06825ee79ed3881bc501fb504b3213e5 SHA512 66d74b213bde9427917c113f6861551f44578e614c3b004b520d765d5d7946f696b719f6383028034164dded2b063f58a0a16aec1152eac125bd7a6ae8dab391 DIST widgetsnbextension-4.0.9.tar.gz 1146830 BLAKE2B 4c4cb7aca3b8ffe45fbb00d296474ca889cc4124d9f96c618b3cc5212a119335866a0e5a246bc5ab69287b4929ce8b88a01eb176b7361d60655e5a7dc5e16df0 SHA512 0fb0949fa7dcd7846d16175541f674a3f159ae436ce5c0e4bb74dcad89d944681a9d6473a6d3282aa2525f25c5215195bad57de6b7cd9ef04c549b9f3e76c8b4 -EBUILD widgetsnbextension-4.0.8.ebuild 627 BLAKE2B 9e8c9bd9337435efa5674323b98f00cb7066862d8e640eed41e951cf963f401bf8d6dba3c138bd26dcae1e4631916737efcfe4db57f5bc6c6ee9f4267e35ba47 SHA512 4461900c42176193756177ea266312bdd747059d4fec6f5ee414d588af37d4bd8bc3cda7b76fee96898838c7b3da8dab12d33b60fb6883def916377643a772f6 -EBUILD widgetsnbextension-4.0.9.ebuild 635 BLAKE2B fa1fe3fbc3be097ee03bf212956ec9bab0af221998bc3ba26923f8d02c28c5b81646d036e3410c9bcc03b1a81060c9252a8f7f0e2c7ce2c23b70bf2eed1b9ee3 SHA512 b66c4dbeb69f2bb60059fdf31cb56c6e21a6d70448cde766b68ccb92ce367e18f0326fa80613c4e8a4047cb3994b30e411c4ae245c4d91ef6f2cfa78c12410b0 +EBUILD widgetsnbextension-4.0.8.ebuild 688 BLAKE2B aa3ba4d2df772540fd0461d67331a3a9dd4bafb728a9948cbb33bea22856328cc9620723df0c60dd077197eac548d66ac96c3d6428d1d0a118883d25af28ca0e SHA512 7cf4423ac2d8dba778450b1b6bef6bdb5149edae512ae5a741c2482e645974737e7476afb526fa480dc2399393f76a7a5dc8d048790d3eac2162259c8ea1edcf +EBUILD widgetsnbextension-4.0.9.ebuild 696 BLAKE2B 14c852db193ce43f634796dab0ba75d55f23ff5d31c699ff5e42e93f4ead152bb2aeca8dd66d366f1f4bfdaa7ed3a714c5f29d5f311880d4c9be20171eaf7724 SHA512 5310c460ee597fa58ff91c484459d48826dd010624cc3b2957793fb91baea8a8d426ee936e1f4a5c51fbe4b18b1a606f8a6ca650c29d363c3a39574e9570b28c MISC metadata.xml 545 BLAKE2B 5127e5910c792643b4594231c8c04ebd2db8bb3f0d12f41d33642126970f8ff36f60503bd0bf7c5863b39a4ea4358f1b0ae786653d2c086a49d5305a879a0f66 SHA512 fa7da731b4f342572c0c284c7e03a521dcf754160223016fa77890e8de0bf05b65fca0bd096ba65e303dc034473654dfe5e9b5d2a556f0e2bdc861e24d462cf1 diff --git a/dev-python/widgetsnbextension/widgetsnbextension-4.0.8.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-4.0.8.ebuild index 4b0e57c8be64..ba299544b22c 100644 --- a/dev-python/widgetsnbextension/widgetsnbextension-4.0.8.ebuild +++ b/dev-python/widgetsnbextension/widgetsnbextension-4.0.8.ebuild @@ -19,6 +19,10 @@ LICENSE="BSD" SLOT="0" KEYWORDS="amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +BDEPEND=" + dev-python/jupyter-packaging[${PYTHON_USEDEP}] +" + RDEPEND=" dev-python/notebook[${PYTHON_USEDEP}] " diff --git a/dev-python/widgetsnbextension/widgetsnbextension-4.0.9.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-4.0.9.ebuild index cf43c5c961b1..633f9b5dc4f4 100644 --- a/dev-python/widgetsnbextension/widgetsnbextension-4.0.9.ebuild +++ b/dev-python/widgetsnbextension/widgetsnbextension-4.0.9.ebuild @@ -19,6 +19,10 @@ LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +BDEPEND=" + dev-python/jupyter-packaging[${PYTHON_USEDEP}] +" + RDEPEND=" dev-python/notebook[${PYTHON_USEDEP}] " -- cgit v1.2.3