commit: 9fdf880d46973c46aef9d7b32385928b78ed31dd Author: Nowa Ammerlaan <nowa <AT> gentoo <DOT> org> AuthorDate: Tue Feb 3 09:54:12 2026 +0000 Commit: Nowa Ammerlaan <nowa <AT> gentoo <DOT> org> CommitDate: Tue Feb 3 09:54:48 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fdf880d
dev-python/pyside: add 6.10.2 drop more references to the IMPORT_PREFIX Closes: https://bugs.gentoo.org/968711 Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org> dev-python/pyside/Manifest | 1 + .../pyside/{pyside-6.9999.ebuild => pyside-6.10.2.ebuild} | 11 ++++++++--- dev-python/pyside/pyside-6.9999.ebuild | 11 ++++++++--- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dev-python/pyside/Manifest b/dev-python/pyside/Manifest index aedd234a2366..aeef8aa5568d 100644 --- a/dev-python/pyside/Manifest +++ b/dev-python/pyside/Manifest @@ -1 +1,2 @@ DIST pyside-setup-everywhere-src-6.10.1.tar.xz 17746968 BLAKE2B c81f838285454731541600dd72bf2c46c993447eb78689267b50233d0417ae5a250e690aa55dfcd6e0d692cee4ccdd4e5c70f2e4cd989545ab3cb91eb8cd81be SHA512 fef31a1d39362d09c8e4c4621090851d42dc4566f2bd813361da64eed8af25a8bd9cf770dea2a26f9e00420ae19eb57ec2f5db11c1d86f39d26b6e8f7ebf6d21 +DIST pyside-setup-everywhere-src-6.10.2.tar.xz 17877708 BLAKE2B 67be6ef1aaadf36a6e8083f808b8f0e47256ac714f73660cb026ef977676928ae3a16b887fd6f31a343fa5d957b945ce0fc6249aa904d84c7e5a8e320502c2d3 SHA512 363b448fe1a304aea09e095aad9f1ecbe2798f0b0e046ca509e918fdc3e8e6a788928a84f2837ad6c75ea79ce37ec38aaff761ddf323bf8e264304ea3d54ceb4 diff --git a/dev-python/pyside/pyside-6.9999.ebuild b/dev-python/pyside/pyside-6.10.2.ebuild similarity index 96% copy from dev-python/pyside/pyside-6.9999.ebuild copy to dev-python/pyside/pyside-6.10.2.ebuild index a41840fe0744..f6701517a922 100644 --- a/dev-python/pyside/pyside-6.9999.ebuild +++ b/dev-python/pyside/pyside-6.10.2.ebuild @@ -521,12 +521,17 @@ python_compile() { cp "${BUILD_DIR}/install/usr/lib/pkgconfig/"pyside6{,-${EPYTHON}}.pc || die fi + # _IMPORT_PREFIX breaks on split-usr/merged-usr plus weird random issues. + # These are not duplicates, the generated files are somehow different on + # different systems. sed \ - -e "s~/lib/libshiboken6\.cpython~/$(get_libdir)/libshiboken6\.cpython~g" \ + -e "s~\${_IMPORT_PREFIX}/lib/libshiboken6\.cpython~/usr/$(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~\${_IMPORT_PREFIX}/bin/shiboken6~/usr/bin/shiboken6~g" \ + -e "s~\${_IMPORT_PREFIX}/shiboken6_generator/shiboken6~/usr/bin/shiboken6~g" \ + -e "s~\${_IMPORT_PREFIX}/lib/libpyside6\.cpython~/usr/$(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~\${_IMPORT_PREFIX}/lib/libpyside6qml\.cpython~/usr/$(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" \ diff --git a/dev-python/pyside/pyside-6.9999.ebuild b/dev-python/pyside/pyside-6.9999.ebuild index a41840fe0744..f6701517a922 100644 --- a/dev-python/pyside/pyside-6.9999.ebuild +++ b/dev-python/pyside/pyside-6.9999.ebuild @@ -521,12 +521,17 @@ python_compile() { cp "${BUILD_DIR}/install/usr/lib/pkgconfig/"pyside6{,-${EPYTHON}}.pc || die fi + # _IMPORT_PREFIX breaks on split-usr/merged-usr plus weird random issues. + # These are not duplicates, the generated files are somehow different on + # different systems. sed \ - -e "s~/lib/libshiboken6\.cpython~/$(get_libdir)/libshiboken6\.cpython~g" \ + -e "s~\${_IMPORT_PREFIX}/lib/libshiboken6\.cpython~/usr/$(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~\${_IMPORT_PREFIX}/bin/shiboken6~/usr/bin/shiboken6~g" \ + -e "s~\${_IMPORT_PREFIX}/shiboken6_generator/shiboken6~/usr/bin/shiboken6~g" \ + -e "s~\${_IMPORT_PREFIX}/lib/libpyside6\.cpython~/usr/$(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~\${_IMPORT_PREFIX}/lib/libpyside6qml\.cpython~/usr/$(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" \
