From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 35C7B15801B for ; Sat, 8 Apr 2023 06:08:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ECE77E0817; Sat, 8 Apr 2023 06:08:09 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9F756E07FE for ; Sat, 8 Apr 2023 06:08:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A66D9340FF6 for ; Sat, 8 Apr 2023 06:08:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 30647A31 for ; Sat, 8 Apr 2023 06:08:06 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1680934071.3e52c841c4298bba776c9389b2d445462ff199bd.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pyside6/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pyside6/Manifest dev-python/pyside6/pyside6-6.4.2-r1.ebuild X-VCS-Directories: dev-python/pyside6/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 3e52c841c4298bba776c9389b2d445462ff199bd X-VCS-Branch: master Date: Sat, 8 Apr 2023 06:08:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bb922eb5-08a4-49fd-8517-bf6fb674cb0d X-Archives-Hash: 3c84025b1a5b72b0044dd155a69cf203 commit: 3e52c841c4298bba776c9389b2d445462ff199bd Author: Michał Górny gentoo org> AuthorDate: Sat Apr 8 06:02:09 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Apr 8 06:07:51 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e52c841 dev-python/pyside6: Remove old Signed-off-by: Michał Górny gentoo.org> dev-python/pyside6/Manifest | 1 - dev-python/pyside6/pyside6-6.4.2-r1.ebuild | 223 ----------------------------- 2 files changed, 224 deletions(-) diff --git a/dev-python/pyside6/Manifest b/dev-python/pyside6/Manifest index 4626254b1a9d..7b370b18da6c 100644 --- a/dev-python/pyside6/Manifest +++ b/dev-python/pyside6/Manifest @@ -1,2 +1 @@ DIST pyside-setup-everywhere-src-6.4.3.tar.xz 8789448 BLAKE2B d9083bd636d3ccf2636b58385fffbc1499db0cbd80e199581e68a440c01b16acd440d7fdbaf41d8b4caa9974d31e457372ed7a80f1525929777d2265fe1297fe SHA512 cc8051d52240b9aca531e3163523274334bfa339f2815ed46c4b4d09be2419f1f4cc6ebfc1e591658b5caccf840f8791333ea119c72a1e53591f1d8ca2e08baa -DIST pyside-setup-opensource-src-6.4.2.tar.xz 8759528 BLAKE2B cc1a18e9dc81eb02bbfffd38816da68f053337f94c485fdd2f99488ae7ade2e899be1d98518def8f39a4eeaeaff6018ff09402bfe55b3484d78d8c4d9796b4e7 SHA512 129ea420000fceef9726fab9e0320e8286a34aa0855fc4bd369adc0020b76909b3a5ac8c3fa622b73da1561b39dcaeb8ac121f634918e2c0460a9ebaccb0f659 diff --git a/dev-python/pyside6/pyside6-6.4.2-r1.ebuild b/dev-python/pyside6/pyside6-6.4.2-r1.ebuild deleted file mode 100644 index 55aee68d1d8a..000000000000 --- a/dev-python/pyside6/pyside6-6.4.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_{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_P=pyside-setup-opensource-src-${PV} - -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_P}.tar.xz" -S="${WORKDIR}/${MY_P}/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-${PV}/PySide6Targets-${CMAKE_BUILD_TYPE,,}.cmake" || die -}