From deccfe2bdd338428eae4b20985414c044e831a83 Mon Sep 17 00:00:00 2001 From: Nowa Ammerlaan Date: Fri, 9 Jan 2026 12:30:46 +0100 Subject: [PATCH] dev-python/pyside: fix freecad build on split-usr The _IMPORT_PREFIX resolves incorrectly on split-usr, so lets forget about that and just hardcode the path where we symlink the libs. Closes: https://bugs.gentoo.org/968219 Signed-off-by: Nowa Ammerlaan --- .../{pyside-6.10.1-r4.ebuild => pyside-6.10.1-r5.ebuild} | 6 +++--- dev-python/pyside/pyside-6.9999.ebuild | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) rename dev-python/pyside/{pyside-6.10.1-r4.ebuild => pyside-6.10.1-r5.ebuild} (98%) diff --git a/dev-python/pyside/pyside-6.10.1-r4.ebuild b/dev-python/pyside/pyside-6.10.1-r5.ebuild similarity index 98% rename from dev-python/pyside/pyside-6.10.1-r4.ebuild rename to dev-python/pyside/pyside-6.10.1-r5.ebuild index c4fee8bd178ed..9fdaba2b6f0ea 100644 --- a/dev-python/pyside/pyside-6.10.1-r4.ebuild +++ b/dev-python/pyside/pyside-6.10.1-r5.ebuild @@ -523,11 +523,11 @@ python_compile() { sed \ -e "s~/lib/libshiboken6\.cpython~/$(get_libdir)/libshiboken6\.cpython~g" \ - -e "s~/shiboken6/libshiboken6\.cpython~/$(get_libdir)/libshiboken6\.cpython~g" \ + -e "s~\${_IMPORT_PREFIX}/shiboken6/libshiboken6\.cpython~/usr/$(get_libdir)/libshiboken6\.cpython~g" \ -e "s~/lib/libpyside6\.cpython~/$(get_libdir)/libpyside6\.cpython~g" \ - -e "s~/PySide6/libpyside6\.cpython~/$(get_libdir)/libpyside6\.cpython~g" \ + -e "s~\${_IMPORT_PREFIX}/PySide6/libpyside6\.cpython~/usr/$(get_libdir)/libpyside6\.cpython~g" \ -e "s~/lib/libpyside6qml\.cpython~/$(get_libdir)/libpyside6qml\.cpython~g" \ - -e "s~/PySide6/libpyside6qml\.cpython~/$(get_libdir)/libpyside6qml\.cpython~g" \ + -e "s~\${_IMPORT_PREFIX}/PySide6/libpyside6qml\.cpython~/usr/$(get_libdir)/libpyside6qml\.cpython~g" \ -e "s~libshiboken6\.cpython.*\.so\.$(ver_cut 1-3)~libshiboken6\${PYTHON_CONFIG_SUFFIX}\.so\.$(ver_cut 1-2)~g" \ -e "s~libpyside6\.cpython.*\.so\.$(ver_cut 1-3)~libpyside6\${PYTHON_CONFIG_SUFFIX}\.so\.$(ver_cut 1-2)~g" \ -e "s~libpyside6qml\.cpython.*\.so\.$(ver_cut 1-3)~libpyside6qml\${PYTHON_CONFIG_SUFFIX}\.so\.$(ver_cut 1-2)~g" \ diff --git a/dev-python/pyside/pyside-6.9999.ebuild b/dev-python/pyside/pyside-6.9999.ebuild index 7363dbf1e6d34..a41840fe0744c 100644 --- a/dev-python/pyside/pyside-6.9999.ebuild +++ b/dev-python/pyside/pyside-6.9999.ebuild @@ -523,11 +523,11 @@ python_compile() { sed \ -e "s~/lib/libshiboken6\.cpython~/$(get_libdir)/libshiboken6\.cpython~g" \ - -e "s~/shiboken6/libshiboken6\.cpython~/$(get_libdir)/libshiboken6\.cpython~g" \ + -e "s~\${_IMPORT_PREFIX}/shiboken6/libshiboken6\.cpython~/usr/$(get_libdir)/libshiboken6\.cpython~g" \ -e "s~/lib/libpyside6\.cpython~/$(get_libdir)/libpyside6\.cpython~g" \ - -e "s~/PySide6/libpyside6\.cpython~/$(get_libdir)/libpyside6\.cpython~g" \ + -e "s~\${_IMPORT_PREFIX}/PySide6/libpyside6\.cpython~/usr/$(get_libdir)/libpyside6\.cpython~g" \ -e "s~/lib/libpyside6qml\.cpython~/$(get_libdir)/libpyside6qml\.cpython~g" \ - -e "s~/PySide6/libpyside6qml\.cpython~/$(get_libdir)/libpyside6qml\.cpython~g" \ + -e "s~\${_IMPORT_PREFIX}/PySide6/libpyside6qml\.cpython~/usr/$(get_libdir)/libpyside6qml\.cpython~g" \ -e "s~libshiboken6\.cpython.*\.so\.$(ver_cut 1-3)~libshiboken6\${PYTHON_CONFIG_SUFFIX}\.so\.$(ver_cut 1-2)~g" \ -e "s~libpyside6\.cpython.*\.so\.$(ver_cut 1-3)~libpyside6\${PYTHON_CONFIG_SUFFIX}\.so\.$(ver_cut 1-2)~g" \ -e "s~libpyside6qml\.cpython.*\.so\.$(ver_cut 1-3)~libpyside6qml\${PYTHON_CONFIG_SUFFIX}\.so\.$(ver_cut 1-2)~g" \