gentoo auto-resync : 18:04:2024 - 12:04:39

3 files changed, 2 insertions, 252 deletions

diff --git a/dev-python/pyside6/Manifest b/dev-python/pyside6/Manifest
index e1eb59628b8e..ee35ac48da11 100644
--- a/dev-python/pyside6/Manifest
+++ b/dev-python/pyside6/Manifest
@@ -1,7 +1,5 @@
 AUX pyside6-6.3.1-no-strip.patch 953 BLAKE2B f88bac603a584213a864fcfc7c528f1d236ebdbfb653c3877316cd0b95c30c2f7288b1c81c6a90a3e4228536da4aa63552991fefa952f450b0b852b3e2aed94a SHA512 2920075a26fc059bdebc8eb5fa7c15de74729b7f8d1eb59197f7426afa7a65f1f78a8ebb76e946b2dfaf5817dbf090744bafaed2f2156f2d1548c2932a7ce61a
 AUX pyside6-6.6.0-no-qtexampleicons.patch 221 BLAKE2B d45b4ebcd780a0151b793b5b21f5d7599ee5c427372ef19f518ac1c94306938178b0bfb603d9755aae9bddc4c31c35bb4648617c793f8e399f0f8dcce0d1f3bb SHA512 1da97be74142402454ef5384c58d2b2a792fea53b4155d7b5ede6d145496b45e4fd56723f8f7716150c2bba448ce816c6740059d7d38ae53d5cdf7c38c4acd7b
-DIST pyside-setup-everywhere-src-6.6.2.tar.xz 13975896 BLAKE2B b4572e58613e5446692e8c4cef28156fd0126ecda0c6334652ce49c6c7ce4614dbf2400c693addaa38e9b6cca9e331b9fe84c83ddb26e7014b8603afe2c54ad6 SHA512 1d23d27a4cbe74434ec5d391172416d324b4c92181401444821b456b4e27dabbdb3dcaad685a22b62c09f750555a4e626bbb6406a2fbde1cf4ec5c8bbb64cda5
 DIST pyside-setup-everywhere-src-6.7.0.tar.xz 14382456 BLAKE2B 607e496cdeb7e55166b4f0dc15662a8792c7d8925856e8edbb927dfdc33342d158f430e3433d3d4a78ea33740e333fb2422ea1f4332408c3c6214f92d31bdd0d SHA512 7801d564d8d359edec431dc0e6f170538b9fc6f834cb7ab8eff41c1989bffb619c446d4d62d65db2a5b7592c0bff5d450d42de2797726658fe1a8f53df8a4c14
-EBUILD pyside6-6.6.2-r1.ebuild 10205 BLAKE2B 7478e09d29a1b506ea81370cbd3ccf8718068824aca2019bf3da3b9f299a9cc231f8e39990e76c331646eec39478cb64da279bc39438e6995a5090479f7fd4e2 SHA512 15d44a498751f0f674ce844d08fcfdfb82ebb4ca56c794996f31e824aed2ae54989cc20781b8780870a630b446e3b3df23afdc9f2b4b999049c015519ff393d9
-EBUILD pyside6-6.7.0.ebuild 10170 BLAKE2B adabcd02d063c0f42801d3b8b2ca88b313231431e5c836f7a54a33ed923efe2efb8e19718b0b9d356d0ee5e30cf9d416ef40790f5c4b464e56c232e87909138d SHA512 e925b05802ef60dcb973d8c95e3faf5ca630e423ab4dd46cf22ec5ce237ab415acd303062c152b1d29ca36b475c46dd3f2ccf2ba551c1caa5ac05fe32eb7030f
+EBUILD pyside6-6.7.0.ebuild 10169 BLAKE2B c87fb84f29ad6004f98971ab6e67cab50368d337ef5aaca034f64c40fda422e7f359d636b9482b1896bb225b0fd540e54fd85ddfd2eec6c0dc3a7e762ac1c1a2 SHA512 c2a22f5f2765521fe5fe9f2e17ac1485dcba0f985e2c89503f558fc75c40e17f7a8a23dfe8b5bd786b0e2177127b6eddaf24913d1eda0d69d1b6fab44be21763
 MISC metadata.xml 2370 BLAKE2B 4135d3d10c96b39c55d9609a096a62a638c2c2e4f15c8b097631baaec111e4c197584f66db8d6151b25404cf51de7b3254c3c853ce6ba0e5c832d4dcb59936f0 SHA512 3ef85f4d14c69cf9fbccd62056e806ac3afbc49ee4ab31652b51bed3582d492d631d2c1370fa59af6ed6a8c32cb337108f9f2bd5dd7feb4a7402a046b9bb0ceb
diff --git a/dev-python/pyside6/pyside6-6.6.2-r1.ebuild b/dev-python/pyside6/pyside6-6.6.2-r1.ebuild
deleted file mode 100644
index 2acf60cc8c25..000000000000
--- a/dev-python/pyside6/pyside6-6.6.2-r1.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2024 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} )
-
-LLVM_COMPAT=( {15..17} )
-
-inherit cmake llvm-r1 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}-${PV}/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},${LLVM_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? ( =dev-qt/qtbase-${QT_PV}[ssl] )
-	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}
-	$(llvm_gen_dep '
-		sys-devel/clang:${LLVM_SLOT}
-		sys-devel/llvm:${LLVM_SLOT}
-	')
-	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"
-	# References files not present in our dev-qt/qtbase
-	"${FILESDIR}/${PN}-6.6.0-no-qtexampleicons.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
-}
diff --git a/dev-python/pyside6/pyside6-6.7.0.ebuild b/dev-python/pyside6/pyside6-6.7.0.ebuild
index 12bf25538fbe..7b434f1e8db9 100644
--- a/dev-python/pyside6/pyside6-6.7.0.ebuild
+++ b/dev-python/pyside6/pyside6-6.7.0.ebuild
@@ -39,7 +39,7 @@ S="${WORKDIR}/${MY_PN}-${PV}/sources/pyside6"
 # x11extras (for X)
 LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="
 	3d bluetooth charts +concurrent +dbus designer gles2-only +gui help location
 	multimedia +network network-auth nfc positioning +opengl pdfium positioning