From 05644e4ce4886d97a712fcdca7d4144a7ced4191 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 12 Dec 2023 23:32:21 +0000 Subject: gentoo auto-resync : 12:12:2023 - 23:32:21 --- dev-python/pyside6/Manifest | 3 - .../pyside6-6.6.0-fix-qtasyncio-install-dir.patch | 10 - dev-python/pyside6/pyside6-6.6.0-r1.ebuild | 245 --------------------- 3 files changed, 258 deletions(-) delete mode 100644 dev-python/pyside6/files/pyside6-6.6.0-fix-qtasyncio-install-dir.patch delete mode 100644 dev-python/pyside6/pyside6-6.6.0-r1.ebuild (limited to 'dev-python/pyside6') diff --git a/dev-python/pyside6/Manifest b/dev-python/pyside6/Manifest index f63e9d0d5f93..5315ef3d7243 100644 --- a/dev-python/pyside6/Manifest +++ b/dev-python/pyside6/Manifest @@ -1,11 +1,8 @@ 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 -AUX pyside6-6.6.0-fix-qtasyncio-install-dir.patch 489 BLAKE2B 9b3bd8af6176d9d5470bf2f43f2a84d074fe8baf8cc60dc4f2fd1ca521a5cbc4936a5da6e76605e86dbff7e409a7a63dcb42d5e652ca7255c056ba426ad29ad0 SHA512 acb2f9296a393c311060347efb45d2a5c3e03dde83d996720b6ed50e4e7a24ee6c1ccb8cd046fbcece8cb46e5ae2c1beaa32712202ab0098871689c0888ea252 AUX pyside6-6.6.0-no-qtexampleicons.patch 221 BLAKE2B d45b4ebcd780a0151b793b5b21f5d7599ee5c427372ef19f518ac1c94306938178b0bfb603d9755aae9bddc4c31c35bb4648617c793f8e399f0f8dcce0d1f3bb SHA512 1da97be74142402454ef5384c58d2b2a792fea53b4155d7b5ede6d145496b45e4fd56723f8f7716150c2bba448ce816c6740059d7d38ae53d5cdf7c38c4acd7b DIST pyside-setup-everywhere-src-6.5.3.tar.xz 13577208 BLAKE2B 7a26302d17163e3fd7478571d99116d7eec01ee3ce369c58870fed565258419f8c6cdf88b4cd2b9b48a21ab1e40d5b85ed912e3cd2210cf22707da88c42ad277 SHA512 3fbcc0bb340d5b02616df061d1c1bf08494db5d35297db47ebb2f965efd347bf8412236bb43952b65b787d08d29adf5998cd92c3ff359f728a9006e07a278519 -DIST pyside-setup-everywhere-src-6.6.0.tar.xz 14054860 BLAKE2B 3d01707796c8711de6c5bfc39bb677ee1f5c24014f8f61d9cccb5ec58982e9765e69b0a623e93276f1336975cf18a228d8397f6c8fce051875962e25ba64ac2f SHA512 58463e9b08ee6264d05293d25aa6e41b091016489abf513fc8303e5cccde26af1a24bf9520a94fad4fdc679bf367eb8c6b3d84a21c6c175dd1382cd1ca32b8ae DIST pyside-setup-everywhere-src-6.6.1.tar.xz 13887704 BLAKE2B 14a75cb6d20dced9b1edf79b8bb40ce44ecb7642f45743e59bc2d55b3e6fa5a742a0a0e5712b8f8cd4d908cc0f5103ac823390db968f42d0782818242c6f77e5 SHA512 3516f3e4595f1ba4ebbc680c5a94f9f939e04c0a3257720ebdd7ed12307bb007d1c73824029f51ec71c41a335268f34834250a5e87b3c4356d9e0a6f1d6b1f71 EBUILD pyside6-6.5.3.ebuild 9222 BLAKE2B d25102cfaa39004455472d64873f8ff55494ed97fd5f9d34bef2da67eadddfb2b78f827f7b6babfc819deee0b1ce570f1202a3299812b2fe1701f05c02c23a71 SHA512 14a6ff64be79c6519167fd803d7d9a3fc195a871d807d1c27a0d072c4295f94e5debb894164d02df827c18bd3f3b9f0aa55c4d304e732de46208c00bdc34bcda -EBUILD pyside6-6.6.0-r1.ebuild 10329 BLAKE2B e3c38bcff050b6ffb89d5b7826f4f43d5217abce50f84d210b714cd1876aaf8be0eca7a5c7c3f0dcb4e75486521ed0cc8a7f5aabca60230c5c4c9146a43c1f24 SHA512 5c60cdece1381c66554aa0087e4a57879e033e514d249eb8a17e8ab6ff66cb94453e02623ece2bc83944b5a6131e7d942a4a294bf6d8d77a5150cb7d89d798e4 EBUILD pyside6-6.6.1.ebuild 10030 BLAKE2B 8c35a91c4ad27220cf193360068163e33e9bb025ea61d4f31ec72df3a66c9b29ad2e852a4c1f129e2c92f538e8a22a670c644652f2c23168dce3144b3c17a590 SHA512 d5ac7de3dd8061329018057066f2d671f3a256b31d32b9c73971bc44367c950216c50a826fa909b0427b0c625206037aa9e9f2d003756b816a04793b2f9acf93 MISC metadata.xml 2370 BLAKE2B 4135d3d10c96b39c55d9609a096a62a638c2c2e4f15c8b097631baaec111e4c197584f66db8d6151b25404cf51de7b3254c3c853ce6ba0e5c832d4dcb59936f0 SHA512 3ef85f4d14c69cf9fbccd62056e806ac3afbc49ee4ab31652b51bed3582d492d631d2c1370fa59af6ed6a8c32cb337108f9f2bd5dd7feb4a7402a046b9bb0ceb diff --git a/dev-python/pyside6/files/pyside6-6.6.0-fix-qtasyncio-install-dir.patch b/dev-python/pyside6/files/pyside6-6.6.0-fix-qtasyncio-install-dir.patch deleted file mode 100644 index 066d2d7af774..000000000000 --- a/dev-python/pyside6/files/pyside6-6.6.0-fix-qtasyncio-install-dir.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/PySide6/CMakeLists.txt b/PySide6/CMakeLists.txt -index e24fdb682..37b7a6c9c 100644 ---- a/PySide6/CMakeLists.txt -+++ b/PySide6/CMakeLists.txt -@@ -111,4 +111,4 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pyside6_global.h - DESTINATION include/${BINDING_NAME}${pyside6_SUFFIX}) - - install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/QtAsyncio" -- DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") -+ DESTINATION "${PYTHON_SITE_PACKAGES}/${BINDING_NAME}${pyside6_SUFFIX}") diff --git a/dev-python/pyside6/pyside6-6.6.0-r1.ebuild b/dev-python/pyside6/pyside6-6.6.0-r1.ebuild deleted file mode 100644 index 34186ac1320b..000000000000 --- a/dev-python/pyside6/pyside6-6.6.0-r1.ebuild +++ /dev/null @@ -1,245 +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..12} ) - -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-2)/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=" - 3d bluetooth charts +concurrent +dbus designer gles2-only +gui help location - multimedia +network network-auth nfc positioning +opengl pdfium positioning - +printsupport qml quick quick3d serialport scxml sensors spatialaudio speech - +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} - 3d? ( gui network ) - charts? ( gui widgets ) - designer? ( widgets ) - gles2-only? ( gui ) - gui? ( dbus opengl ) - help? ( network sql widgets ) - location? ( gui network positioning quick ) - multimedia? ( gui network ) - network-auth? ( network ) - opengl? ( gui ) - pdfium? ( gui ) - printsupport? ( widgets ) - qml? ( network ) - quick? ( gui network opengl qml ) - quick3d? ( gui network opengl qml quick ) - spatialaudio? ( multimedia ) - speech? ( multimedia ) - 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?] - 3d? ( =dev-qt/qt3d-${QT_PV}[qml?,gles2-only=] ) - bluetooth? ( =dev-qt/qtconnectivity-${QT_PV}[bluetooth] ) - 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] ) - location? ( =dev-qt/qtlocation-${QT_PV} ) - multimedia? ( =dev-qt/qtmultimedia-${QT_PV} ) - network-auth? ( =dev-qt/qtnetworkauth-${QT_PV} ) - nfc? ( =dev-qt/qtconnectivity-${QT_PV}[nfc] ) - pdfium? ( =dev-qt/qtwebengine-${QT_PV}[pdfium(-),widgets?] ) - 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} ) - scxml? ( =dev-qt/qtscxml-${QT_PV} ) - sensors? ( =dev-qt/qtsensors-${QT_PV}[qml?] ) - speech? ( =dev-qt/qtspeech-${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}[alsa,widgets?] - =dev-qt/qtwebengine-${QT_PV}[pulseaudio,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" - # References files not present in our dev-qt/qtbase - "${FILESDIR}/${PN}-6.6.0-no-qtexampleicons.patch" - # Borrowed from Arch - # https://gitlab.archlinux.org/archlinux/packaging/packages/pyside6/-/blob/38e02ae70a1ae4c71e25ca483fcc7225da2acdee/fix-install-dir.patch - "${FILESDIR}/${PN}-6.6.0-fix-qtasyncio-install-dir.patch" -) - -src_configure() { - # See collect_module_if_found macros in PySideHelpers.cmake - local mycmakeargs=( - -DBUILD_TESTS=$(usex test) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DAnimation=$(usex !3d) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DCore=$(usex !3d) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DExtras=$(usex !3d) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DInput=$(usex !3d) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DLogic=$(usex !3d) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt63DRender=$(usex !3d) - #-DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=yes - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Bluetooth=$(usex !bluetooth) - -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=$(usex !location) - -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=$(usex !nfc) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGL=$(usex !opengl) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6OpenGLWidgets=$(usex !opengl yes $(usex !widgets)) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Pdf=$(usex !pdfium) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6PdfWidgets=$(usex !pdfium yes $(usex !widgets)) - -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=$(usex !scxml) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6Sensors=$(usex !sensors) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6SerialPort=$(usex !serialport) - -DCMAKE_DISABLE_FIND_PACKAGE_Qt6SpatialAudio=$(usex !spatialaudio) - -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=$(usex !speech) - -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 -} -- cgit v1.2.3