[gentoo-commits] repo/gentoo:master commit in: dev-python/pyside6-tools/

["Andrew Ammerlaan" <andrewammerlaan@gentoo.org>]

commit:     bc139b269e3ccd66f17509cc1a1c2f9415f5f677
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 25 19:59:53 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Oct 25 20:04:59 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc139b26

dev-python/pyside6-tools: correctly install the scripts

None of these should be called directly, they are supposed to be
imported via pyside_tool.py.

This matches the install layout of the pypi wheel. There are also
some wrappers installed in the pypi wheel but they don't appear to
be very useful.

Bug: https://bugs.gentoo.org/916213
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 ...-tools-6.6.0.ebuild => pyside6-tools-6.6.0-r1.ebuild} | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

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
similarity index 71%
rename from dev-python/pyside6-tools/pyside6-tools-6.6.0.ebuild
rename to 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