gentoo auto-resync : 23:08:2022 - 14:44:46

6 files changed, 23 insertions, 60 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 6518aaf11597..8b51f278db15 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/pyside6-tools/Manifest b/dev-python/pyside6-tools/Manifest
index 828dc407f293..39c156c9dc0a 100644
--- a/dev-python/pyside6-tools/Manifest
+++ b/dev-python/pyside6-tools/Manifest
@@ -1,4 +1,3 @@
-AUX pyside2-tools-5.15.1-dont-install-tools.patch 1782 BLAKE2B a9a1c3cb8d1e6feabbc752bb4bf0af30b645736b9895fe96063dc4a9d5668866523e567f723693b17c6da4101d28713cfa6ad8adadb78e6bb99756d7c69244a2 SHA512 c8b17db89f42a52f4191dda953d7228eafcafd6afb6d7b70527cef090ffd1f073970010a817bede941de10b4e40e41d35fb99b74091baeea6d237c08eb7f225f
 DIST pyside-setup-opensource-src-6.3.1.tar.xz 7685896 BLAKE2B 66eb9ced1899fabea2be1b6471fcaa3eca4c74e989e7eab47dc44db623eb6242a713e1e7c7e2a6daad36994d3766cf7adc79e3601bfc3908a051fdc97b52522f SHA512 81751fa9e2c492ceae42b3cb1f871d3f95f56cc07c382f02574899f3eab8db52453b0b636e63d53e0d2195f1686a01ad2bee20953aa0a8237719ec06d2b6e321
 EBUILD pyside6-tools-6.3.1.ebuild 1361 BLAKE2B 3f66578d716c3c2cdbb06884c70111dcc100587ba297e234897a2e75932f7112892b5ebb4d565349f7a83421ba0ea1f9b8eb26daef8ed5c8e920dd4ceab63c5f SHA512 61d6e9460d267120ffcbb2c3f3d514599a8d36c0a86e933953fc184419ab913fef5dc184fcea189ee0cc79f0736d9f1a2aed2570c675bce7e8f62fa011d3bbd8
 MISC metadata.xml 402 BLAKE2B 28348df442d189eadb56e04dfda71c1d5a56868aae85611a7d77ecdc7651e34ce02563c8da1270aad55758e2dd4301de44434e0bbdb010ef484e240068602ede SHA512 a54866110e38c24d67d60286c64b63dc0b537c55eb201b84b9173b47710b6e8a840d9072ca46fbef969bf481e43e1d8824b20655d7fe6b300cfd5333c3f74a41
diff --git a/dev-python/pyside6-tools/files/pyside2-tools-5.15.1-dont-install-tools.patch b/dev-python/pyside6-tools/files/pyside2-tools-5.15.1-dont-install-tools.patch
deleted file mode 100644
index 60de6aa07ee7..000000000000
--- a/dev-python/pyside6-tools/files/pyside2-tools-5.15.1-dont-install-tools.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-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)
-@@ -113,14 +81,6 @@ endif()
- 
- add_subdirectory(pylupdate)
- 
--# pyside2-rcc, pyside2-uic, pyside2-designer, shiboken and pyside2-lupdate entrypoints
--install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pyside_tool.py
--        DESTINATION bin
--        PERMISSIONS
--        OWNER_EXECUTE OWNER_WRITE OWNER_READ
--        GROUP_EXECUTE GROUP_READ
--        WORLD_EXECUTE WORLD_READ)
--
- if (BUILD_TESTS)
-     enable_testing()
-     add_subdirectory(tests)
diff --git a/dev-python/pyside6/Manifest b/dev-python/pyside6/Manifest
index 46ba66891f95..ec5d184e8404 100644
--- a/dev-python/pyside6/Manifest
+++ b/dev-python/pyside6/Manifest
@@ -1,4 +1,5 @@
+AUX pyside6-6.3.1-fix-designer-plugin-install-location.patch 685 BLAKE2B 2f3b3873f4f1f46b737ae85467798b25fd1634a15a391cd7fa04a1c391a56cd57a68ec4f98b51460cd805fc75cc0ee50b9addc4a757520429f6b7e66101ed609 SHA512 76ca097b42b47d3b290966fe805b1b4f58e04ab05d8e5420dfa1014e3399452a0326d964d2304068c78a6a82bcea2883d5c9e6a51b383a7f96a7520cfebdfcad
 AUX pyside6-6.3.1-no-strip.patch 953 BLAKE2B f88bac603a584213a864fcfc7c528f1d236ebdbfb653c3877316cd0b95c30c2f7288b1c81c6a90a3e4228536da4aa63552991fefa952f450b0b852b3e2aed94a SHA512 2920075a26fc059bdebc8eb5fa7c15de74729b7f8d1eb59197f7426afa7a65f1f78a8ebb76e946b2dfaf5817dbf090744bafaed2f2156f2d1548c2932a7ce61a
 DIST pyside-setup-opensource-src-6.3.1.tar.xz 7685896 BLAKE2B 66eb9ced1899fabea2be1b6471fcaa3eca4c74e989e7eab47dc44db623eb6242a713e1e7c7e2a6daad36994d3766cf7adc79e3601bfc3908a051fdc97b52522f SHA512 81751fa9e2c492ceae42b3cb1f871d3f95f56cc07c382f02574899f3eab8db52453b0b636e63d53e0d2195f1686a01ad2bee20953aa0a8237719ec06d2b6e321
-EBUILD pyside6-6.3.1.ebuild 8562 BLAKE2B a7e78b58f0c8ab2c933ad666923dbc16a92aad841339c3747f3f2c9437a00e8ca26b33d258363d8ade803bffb85438ca4e9099e8b0715c5eacb5f8d5a1637878 SHA512 76fd97aee5cb1e0ee7de80400f62c0151793191fb6938de4f5bcbdc0bacd2e7ee9dc4b0611509fb091a2d6a79e3d2677d4fb925236a252a44b806c374eec4779
+EBUILD pyside6-6.3.1-r1.ebuild 8721 BLAKE2B 3cec280d81552ef79cab4a9cf6db9ed3094e8fcb0124f176a442b376eca0c7472f840dbf8f8e69ae75bcd8f8875670316ece890326bb0adf381c7ffbb7009b18 SHA512 e687e65c52e73a3bbeca8a3377de45c949682f87f71023ec0e544bf2879804b4221b39a0743dc0edc63ea06960961743a628b49038ab49bd307ffc999daadad6
 MISC metadata.xml 1717 BLAKE2B 9bacda544318b48fc7b97139e22f95c2b3f9a5bc29ad4660db9ead6a89859e16eebbcc2d54d5a2639f7a1d458fcf2b39ef9eb846589cffc1d111b256678e3777 SHA512 7b18d2124bd99d77715d1ce44d2a154799d5055fef4734b06e159d73b598ef8065c0f18076fe7ff4bc59f2b995ccd7eaa125aae1fa5fc726da79c7c3f3873c3c
diff --git a/dev-python/pyside6/files/pyside6-6.3.1-fix-designer-plugin-install-location.patch b/dev-python/pyside6/files/pyside6-6.3.1-fix-designer-plugin-install-location.patch
new file mode 100644
index 000000000000..b7d1c2b31553
--- /dev/null
+++ b/dev-python/pyside6/files/pyside6-6.3.1-fix-designer-plugin-install-location.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/865363
+
+From 109d7bbec01870f8e944a9cde09d3e2f70e13e0d Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Mon, 22 Aug 2022 07:10:35 +0200
+Subject: [PATCH] fix designer plugin install location
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/plugins/designer/CMakeLists.txt
++++ b/plugins/designer/CMakeLists.txt
+@@ -53,4 +53,4 @@ target_link_libraries(PySidePlugin PRIVATE
+                       Qt::Widgets
+                       ${SHIBOKEN_PYTHON_LIBRARIES})
+ 
+-install(TARGETS PySidePlugin LIBRARY DESTINATION "plugins/designer")
++install(TARGETS PySidePlugin LIBRARY DESTINATION "lib${LIB_SUFFIX}/qt6/plugins/designer")
diff --git a/dev-python/pyside6/pyside6-6.3.1.ebuild b/dev-python/pyside6/pyside6-6.3.1-r1.ebuild
index 09cbf24f7b1e..a94b8db45b4b 100644
--- a/dev-python/pyside6/pyside6-6.3.1.ebuild
+++ b/dev-python/pyside6/pyside6-6.3.1-r1.ebuild
@@ -98,6 +98,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/${P}-no-strip.patch"
+	"${FILESDIR}/${P}-fix-designer-plugin-install-location.patch"
 )
 
 src_configure() {
@@ -153,6 +154,10 @@ src_configure() {
 		-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() {