gentoo auto-resync : 26:10:2023 - 20:41:49

3 files changed, 54 insertions, 15 deletions

diff --git a/dev-python/pyside2-tools/Manifest b/dev-python/pyside2-tools/Manifest
index 698a99b7920c..84839c518267 100644
--- a/dev-python/pyside2-tools/Manifest
+++ b/dev-python/pyside2-tools/Manifest
@@ -1,6 +1,7 @@
 AUX pyside2-tools-5.15.1-dont-install-tools.patch 1782 BLAKE2B a9a1c3cb8d1e6feabbc752bb4bf0af30b645736b9895fe96063dc4a9d5668866523e567f723693b17c6da4101d28713cfa6ad8adadb78e6bb99756d7c69244a2 SHA512 c8b17db89f42a52f4191dda953d7228eafcafd6afb6d7b70527cef090ffd1f073970010a817bede941de10b4e40e41d35fb99b74091baeea6d237c08eb7f225f
+AUX pyside2-tools-5.15.11-no-copy-uic.patch 1343 BLAKE2B dbabe4c0a46b0f3ccb160df34626258154efaa69554507b87e0cebe638c93b9abc6d3cf6d72f0c90833d21646e9b44a2ea0bbebeb2f11f92a748adf4f9663277 SHA512 4dbc2bbca3c16aafeeba8d2384d15dd28d7f8611027850293f165af37f9cf0ba17b1617cee06125c2e37edb011ecdeb00feb84edb8cf6c901b9e32b6d9cba639
 DIST pyside-setup-opensource-src-5.15.10.tar.xz 3583764 BLAKE2B 7e19e8f8460582012d3fec09ac99f826298cbfcd0887339c2adababb7a21bfc67a2918e91858888e89eca0a6f780929b2a7fa70c28d72ece24b7ea939ca76f56 SHA512 dc548ab870fcc5cc637de1bcb2f428527c650287fdb3720a3ade4638cc0bb12bc4a1ed87e7f6a4ec730a26742e08ceec806bcac6af91c7a01ddc0ce7980a79d2
 DIST pyside-setup-opensource-src-5.15.11.tar.xz 3584760 BLAKE2B c4d60439a218451eb0c505031524fe1e30a117b7e89a28b5cd7518c193a8d2de01a5db8cb3acdd97c81da6dddff99f786c6c763427f78cdd0af4031122ac2d24 SHA512 377b3f6a793313cf7f5bea0dcef6630bac32d79b247e213d0b1b719805b35692aa8dd9a8896c75c6266f05af38809f574051d64b1a2f958a48c90167feccfb91
 EBUILD pyside2-tools-5.15.10.ebuild 1661 BLAKE2B bd0332d0e204e18b9ed20b867de3ba7b061c3d2e5dd2a8c75cd54f9ddd1f683a5dbcb7807adec6ddcb5e09c40cfd0856840cd19830fd93b6576c870cd7edb2f5 SHA512 42966f0de37d0bebed199f36ddf57660a15d49e37d7745bac3ce2a9c82706475fca8a55267648871131dea369601ea1ba74f6e79d53f5e81ec50cad578241887
-EBUILD pyside2-tools-5.15.11.ebuild 1664 BLAKE2B 40a98b1fb247f233937459e6493461fe980175be7c58e182084498d249bac3ec20fa7902d818d6855ce81cd23650ebfd9f07d04b1ad7a4afec37d16635265b28 SHA512 26d59ccf1ea740c99e79aa1c4c7e409e01585b2295cb6c0375c45647ab23d3a08a03d810be94c2385467238e7b57743dd9fa83ebc041b8f9b395526571e0298f
+EBUILD pyside2-tools-5.15.11-r1.ebuild 1596 BLAKE2B db667f2d15b0cda2f5a5a191cd0c19111a7151186aad1961d723c6d64ccdf350326eea254391a66b561824e2edc84165a97e9480c6aa4a1be6e95a888a084204 SHA512 9d994cdc8ab30516a87acd333d787caac07d279a077970e4463287e0fd3f2435391c475fa1bbcf18daf45c2af09fff0e4c65f9a399d60c8e7c319daf5c0009fb
 MISC metadata.xml 402 BLAKE2B 28348df442d189eadb56e04dfda71c1d5a56868aae85611a7d77ecdc7651e34ce02563c8da1270aad55758e2dd4301de44434e0bbdb010ef484e240068602ede SHA512 a54866110e38c24d67d60286c64b63dc0b537c55eb201b84b9173b47710b6e8a840d9072ca46fbef969bf481e43e1d8824b20655d7fe6b300cfd5333c3f74a41
diff --git a/dev-python/pyside2-tools/files/pyside2-tools-5.15.11-no-copy-uic.patch b/dev-python/pyside2-tools/files/pyside2-tools-5.15.11-no-copy-uic.patch
new file mode 100644
index 000000000000..90bc53c90d89
--- /dev/null
+++ b/dev-python/pyside2-tools/files/pyside2-tools-5.15.11-no-copy-uic.patch
@@ -0,0 +1,43 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 20a5e19..575c1df 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -55,38 +55,6 @@ else()
+     set(DESIGNER_PATH "${TOOLS_PATH}/designer${EXE_EXT}")
+ endif()
+ 
+-install(FILES "${UIC_PATH}"
+-        DESTINATION bin
+-        PERMISSIONS
+-        OWNER_EXECUTE OWNER_WRITE OWNER_READ
+-        GROUP_EXECUTE GROUP_READ
+-        WORLD_EXECUTE WORLD_READ)
+-
+-install(FILES "${RCC_PATH}"
+-        DESTINATION bin
+-        PERMISSIONS
+-        OWNER_EXECUTE OWNER_WRITE OWNER_READ
+-        GROUP_EXECUTE GROUP_READ
+-        WORLD_EXECUTE WORLD_READ)
+-
+-if (EXISTS ${DESIGNER_PATH})
+-    if (APPLE)
+-        install(DIRECTORY "${DESIGNER_PATH}"
+-                DESTINATION bin
+-                FILE_PERMISSIONS
+-                OWNER_EXECUTE OWNER_WRITE OWNER_READ
+-                GROUP_EXECUTE GROUP_READ
+-                WORLD_EXECUTE WORLD_READ)
+-    else()
+-        install(FILES "${DESIGNER_PATH}"
+-                DESTINATION bin
+-                PERMISSIONS
+-                OWNER_EXECUTE OWNER_WRITE OWNER_READ
+-                GROUP_EXECUTE GROUP_READ
+-                WORLD_EXECUTE WORLD_READ)
+-    endif()
+-endif()
+-
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake"
+                "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+                IMMEDIATE @ONLY)
diff --git a/dev-python/pyside2-tools/pyside2-tools-5.15.11.ebuild b/dev-python/pyside2-tools/pyside2-tools-5.15.11-r1.ebuild
index 5d7bb774f990..b95967aad0ea 100644
--- a/dev-python/pyside2-tools/pyside2-tools-5.15.11.ebuild
+++ b/dev-python/pyside2-tools/pyside2-tools-5.15.11-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..11} )
-CMAKE_IN_SOURCE_BUILD=1
 
 inherit cmake python-r1
 
@@ -27,11 +26,9 @@ RDEPEND="${PYTHON_DEPS}
 "
 DEPEND="${RDEPEND}"
 
-DOCS=( README.md )
-
 # the tools conflict with tools from QT
 PATCHES=(
-	"${FILESDIR}/${PN}-5.15.1-dont-install-tools.patch"
+	"${FILESDIR}/${PN}-5.15.11-no-copy-uic.patch"
 )
 
 src_prepare() {
@@ -41,17 +38,12 @@ src_prepare() {
 }
 
 src_configure() {
-	# The tests are only related to the tools that we don't install
-	local mycmakeargs=(
-		-DBUILD_TESTS=OFF
-	)
-
 	pyside-tools_configure() {
 		local mycmakeargs=(
-			"${mycmakeargs[@]}"
+			-DBUILD_TESTS=OFF
 			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
 		)
-		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_configure
+		cmake_src_configure
 	}
 
 	python_foreach_impl pyside-tools_configure
@@ -59,7 +51,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
@@ -67,11 +59,14 @@ src_compile() {
 
 src_install() {
 	pyside-tools_install() {
-		python_doexe "${BUILD_DIR}/pylupdate/pyside2-lupdate"
+		# This replicates the contents of the PySide6 pypi wheel
+		DESTDIR="${BUILD_DIR}" cmake_build install
+		dobin "${BUILD_DIR}/usr/bin/pyside2-lupdate"
+		python_moduleinto PySide2/scripts
+		python_domodule "${BUILD_DIR}/usr/bin/pyside_tool.py"
 	}
 
 	python_foreach_impl pyside-tools_install
 
-	doman pylupdate/pyside2-lupdate.1
 	einstalldocs
 }