gentoo auto-resync : 26:10:2023 - 02:47:53

4 files changed, 11 insertions, 139 deletions

diff --git a/dev-python/pyside6-tools/Manifest b/dev-python/pyside6-tools/Manifest
index a4082b0e74e6..77bbd193d7f4 100644
--- a/dev-python/pyside6-tools/Manifest
+++ b/dev-python/pyside6-tools/Manifest
@@ -1,7 +1,3 @@
-DIST pyside-setup-everywhere-src-6.5.2.tar.xz 13576204 BLAKE2B 3e1d62e6d877140137896552184c8fe56fd62056a1ea506ab474256ee0e2f16d3e10ddb84965602650bb466f3563555c3c344698b6877a45f9130d1e919aba21 SHA512 ca677645579fc6b82285dd6c294909ca5e91a8c8efbc53bd103aff64e3ef89eff67820bfc9100cf50f043015d41c49d4ff86b3008f02505941a09bd54621f403
-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
-EBUILD pyside6-tools-6.5.2.ebuild 1381 BLAKE2B 3cc72a8fb39ed8608af3519ce915576ca1c50ed436a8e2fd9e6d8966ce54ff8ecbe3bdfab04368c713c7ea390354c26d6e34103145e2b7451a88f71c78d9c3de SHA512 c8d33463faab4d3eb172105b9108688120bc3d13170b93540b7cdeeed77a284959581c92264b1b2615d4d2ac94ff38fab2117776e161059fda7ead322ed3e461
-EBUILD pyside6-tools-6.5.3.ebuild 1381 BLAKE2B 3cc72a8fb39ed8608af3519ce915576ca1c50ed436a8e2fd9e6d8966ce54ff8ecbe3bdfab04368c713c7ea390354c26d6e34103145e2b7451a88f71c78d9c3de SHA512 c8d33463faab4d3eb172105b9108688120bc3d13170b93540b7cdeeed77a284959581c92264b1b2615d4d2ac94ff38fab2117776e161059fda7ead322ed3e461
-EBUILD pyside6-tools-6.6.0.ebuild 1381 BLAKE2B aeabec315141112e2b566845e9c87a0d19b2c9320b46166bbcece8c5225d1522261d73082bd94b5af8e807ff6fb8211c9bfabc8aeb9e407b8c0237eb28fce412 SHA512 be30a49e3cc19e5b1b7135b6e3863c8f116f53a87fa69fc1e34a86756c2fd06d43ce629763c53b7e64d5e4f9d1b1bb26df8904f00d05ba08c435eab8bf386983
+EBUILD pyside6-tools-6.6.0-r1.ebuild 1583 BLAKE2B 0ab5532d01f3f64003df97280cd6757399d3d48f02a654ce8d41fd4724d4089e0d480a37cf671a934bbf5f7e8f717faa8b66d96227b4fafa0daa61d4736471c1 SHA512 bc8e314aa6c8489aefcc63b0bfaf6107da956c3723122b31e6ce761c9f00c41c0bc51254b0e46d68ed763dec5e4bec2c8074390f878862fa3c5a17ec3fed61a2
 MISC metadata.xml 402 BLAKE2B 28348df442d189eadb56e04dfda71c1d5a56868aae85611a7d77ecdc7651e34ce02563c8da1270aad55758e2dd4301de44434e0bbdb010ef484e240068602ede SHA512 a54866110e38c24d67d60286c64b63dc0b537c55eb201b84b9173b47710b6e8a840d9072ca46fbef969bf481e43e1d8824b20655d7fe6b300cfd5333c3f74a41
diff --git a/dev-python/pyside6-tools/pyside6-tools-6.5.2.ebuild b/dev-python/pyside6-tools/pyside6-tools-6.5.2.ebuild
deleted file mode 100644
index c79229966af6..000000000000
--- a/dev-python/pyside6-tools/pyside6-tools-6.5.2.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_{10..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-tools/pyside6-tools-6.5.3.ebuild b/dev-python/pyside6-tools/pyside6-tools-6.5.3.ebuild
deleted file mode 100644
index c79229966af6..000000000000
--- a/dev-python/pyside6-tools/pyside6-tools-6.5.3.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_{10..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-tools/pyside6-tools-6.6.0.ebuild b/dev-python/pyside6-tools/pyside6-tools-6.6.0-r1.ebuild
index 572a8161f4d1..a1f2d6f625f6 100644
--- a/dev-python/pyside6-tools/pyside6-tools-6.6.0.ebuild
+++ b/dev-python/pyside6-tools/pyside6-tools-6.6.0-r1.ebuild
@@ -6,7 +6,6 @@ EAPI=8
 # TODO: Add PyPy once officially supported. See also:
 #     https://bugreports.qt.io/browse/PYSIDE-535
 PYTHON_COMPAT=( python3_{10..12} )
-CMAKE_IN_SOURCE_BUILD=1
 
 inherit cmake python-r1
 
@@ -23,7 +22,7 @@ KEYWORDS="~amd64"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
-	~dev-python/pyside6-${PV}[${PYTHON_USEDEP}]
+	~dev-python/pyside6-${PV}[quick,${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
 
@@ -36,10 +35,10 @@ src_prepare() {
 src_configure() {
 	pyside-tools_configure() {
 		local mycmakeargs=(
-			# the tools conflict with tools from Qt
+			# If this is enabled cmake just makes copies of /lib64/qt6/bin/*
 			-DNO_QT_TOOLS=yes
 		)
-		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_configure
+		cmake_src_configure
 	}
 
 	python_foreach_impl pyside-tools_configure
@@ -47,7 +46,7 @@ src_configure() {
 
 src_compile() {
 	pyside-tools_compile() {
-		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_compile
+		cmake_src_compile
 	}
 
 	python_foreach_impl pyside-tools_compile
@@ -55,7 +54,12 @@ src_compile() {
 
 src_install() {
 	pyside-tools_install() {
-		python_doexe "${BUILD_DIR}/"*.py
+		# This replicates the contents of the PySide6 pypi wheel
+		DESTDIR="${BUILD_DIR}" cmake_build install
+		cp __init__.py "${BUILD_DIR}/usr/bin" || die
+		rm -r  "${BUILD_DIR}/usr/bin/qtpy2cpp_lib/tests" || die
+		python_moduleinto PySide6/scripts
+		python_domodule "${BUILD_DIR}/usr/bin/."
 	}
 
 	python_foreach_impl pyside-tools_install