commit: 6b7aac298427f4e2991836dd6be0e873092bda92 Author: Nowa Ammerlaan <nowa <AT> gentoo <DOT> org> AuthorDate: Sun Apr 6 09:48:21 2025 +0000 Commit: Nowa Ammerlaan <nowa <AT> gentoo <DOT> org> CommitDate: Sun Apr 6 09:48:30 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b7aac29
dev-python/pyside: account for different name if debug enabled Closes: https://bugs.gentoo.org/953250 Signed-off-by: Nowa Ammerlaan <nowa <AT> gentoo.org> dev-python/pyside/pyside-6.8.2-r1.ebuild | 6 +++--- dev-python/pyside/pyside-6.8.3.ebuild | 6 +++--- dev-python/pyside/pyside-6.9.0.ebuild | 6 +++--- dev-python/pyside/pyside-6.9.9999.ebuild | 6 +++--- dev-python/pyside/pyside-6.9999.ebuild | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dev-python/pyside/pyside-6.8.2-r1.ebuild b/dev-python/pyside/pyside-6.8.2-r1.ebuild index 6eadff3a3747..7bc07e7840e1 100644 --- a/dev-python/pyside/pyside-6.8.2-r1.ebuild +++ b/dev-python/pyside/pyside-6.8.2-r1.ebuild @@ -363,8 +363,8 @@ python_compile() { distutils-r1_python_compile # The build system uses its own build dir, find the name of this dir. - local pyside_build_dir=$(find "${BUILD_DIR}/build$((${#DISTUTILS_WHEELS[@]}-1))" -maxdepth 1 -type d -name 'qfp-*' -printf "%f\n") - export BUILD_ID=${pyside_build_dir#qfp-py${EPYTHON#python}-qt$(ver_cut 1-3)-} + local pyside_build_dir=$(find "${BUILD_DIR}/build$((${#DISTUTILS_WHEELS[@]}-1))" -maxdepth 1 -type d -name 'qfp*-py*-qt*-*' -printf "%f\n") + export BUILD_ID=${pyside_build_dir#qfp$(usev debug d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-} DISTUTILS_ARGS=( "${MAIN_DISTUTILS_ARGS[@]}" @@ -494,7 +494,7 @@ python_compile() { python_test() { # Otherwise it picks the last built directory breaking assumption for multi target builds mkdir -p build_history/9999-99-99_999999/ || die - local pyside_build_dir=qfp-py${EPYTHON#python}-qt$(ver_cut 1-3)-${BUILD_ID} + local pyside_build_dir=qfp$(usev debug d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-${BUILD_ID} echo "$(ls -d "${BUILD_DIR}"/build*/${pyside_build_dir}/build | sort -V | tail -n 1)" > build_history/9999-99-99_999999/build_dir.txt || die echo "${pyside_build_dir}" >> build_history/9999-99-99_999999/build_dir.txt || die diff --git a/dev-python/pyside/pyside-6.8.3.ebuild b/dev-python/pyside/pyside-6.8.3.ebuild index 5e583ba3e82d..af3a5d98a266 100644 --- a/dev-python/pyside/pyside-6.8.3.ebuild +++ b/dev-python/pyside/pyside-6.8.3.ebuild @@ -361,8 +361,8 @@ python_compile() { distutils-r1_python_compile # The build system uses its own build dir, find the name of this dir. - local pyside_build_dir=$(find "${BUILD_DIR}/build$((${#DISTUTILS_WHEELS[@]}-1))" -maxdepth 1 -type d -name 'qfp-*' -printf "%f\n") - export BUILD_ID=${pyside_build_dir#qfp-py${EPYTHON#python}-qt$(ver_cut 1-3)-} + local pyside_build_dir=$(find "${BUILD_DIR}/build$((${#DISTUTILS_WHEELS[@]}-1))" -maxdepth 1 -type d -name 'qfp*-py*-qt*-*' -printf "%f\n") + export BUILD_ID=${pyside_build_dir#qfp$(usev debug d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-} DISTUTILS_ARGS=( "${MAIN_DISTUTILS_ARGS[@]}" @@ -492,7 +492,7 @@ python_compile() { python_test() { # Otherwise it picks the last built directory breaking assumption for multi target builds mkdir -p build_history/9999-99-99_999999/ || die - local pyside_build_dir=qfp-py${EPYTHON#python}-qt$(ver_cut 1-3)-${BUILD_ID} + local pyside_build_dir=qfp$(usev debug d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-${BUILD_ID} echo "$(ls -d "${BUILD_DIR}"/build*/${pyside_build_dir}/build | sort -V | tail -n 1)" > build_history/9999-99-99_999999/build_dir.txt || die echo "${pyside_build_dir}" >> build_history/9999-99-99_999999/build_dir.txt || die diff --git a/dev-python/pyside/pyside-6.9.0.ebuild b/dev-python/pyside/pyside-6.9.0.ebuild index 5e583ba3e82d..af3a5d98a266 100644 --- a/dev-python/pyside/pyside-6.9.0.ebuild +++ b/dev-python/pyside/pyside-6.9.0.ebuild @@ -361,8 +361,8 @@ python_compile() { distutils-r1_python_compile # The build system uses its own build dir, find the name of this dir. - local pyside_build_dir=$(find "${BUILD_DIR}/build$((${#DISTUTILS_WHEELS[@]}-1))" -maxdepth 1 -type d -name 'qfp-*' -printf "%f\n") - export BUILD_ID=${pyside_build_dir#qfp-py${EPYTHON#python}-qt$(ver_cut 1-3)-} + local pyside_build_dir=$(find "${BUILD_DIR}/build$((${#DISTUTILS_WHEELS[@]}-1))" -maxdepth 1 -type d -name 'qfp*-py*-qt*-*' -printf "%f\n") + export BUILD_ID=${pyside_build_dir#qfp$(usev debug d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-} DISTUTILS_ARGS=( "${MAIN_DISTUTILS_ARGS[@]}" @@ -492,7 +492,7 @@ python_compile() { python_test() { # Otherwise it picks the last built directory breaking assumption for multi target builds mkdir -p build_history/9999-99-99_999999/ || die - local pyside_build_dir=qfp-py${EPYTHON#python}-qt$(ver_cut 1-3)-${BUILD_ID} + local pyside_build_dir=qfp$(usev debug d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-${BUILD_ID} echo "$(ls -d "${BUILD_DIR}"/build*/${pyside_build_dir}/build | sort -V | tail -n 1)" > build_history/9999-99-99_999999/build_dir.txt || die echo "${pyside_build_dir}" >> build_history/9999-99-99_999999/build_dir.txt || die diff --git a/dev-python/pyside/pyside-6.9.9999.ebuild b/dev-python/pyside/pyside-6.9.9999.ebuild index 5e583ba3e82d..af3a5d98a266 100644 --- a/dev-python/pyside/pyside-6.9.9999.ebuild +++ b/dev-python/pyside/pyside-6.9.9999.ebuild @@ -361,8 +361,8 @@ python_compile() { distutils-r1_python_compile # The build system uses its own build dir, find the name of this dir. - local pyside_build_dir=$(find "${BUILD_DIR}/build$((${#DISTUTILS_WHEELS[@]}-1))" -maxdepth 1 -type d -name 'qfp-*' -printf "%f\n") - export BUILD_ID=${pyside_build_dir#qfp-py${EPYTHON#python}-qt$(ver_cut 1-3)-} + local pyside_build_dir=$(find "${BUILD_DIR}/build$((${#DISTUTILS_WHEELS[@]}-1))" -maxdepth 1 -type d -name 'qfp*-py*-qt*-*' -printf "%f\n") + export BUILD_ID=${pyside_build_dir#qfp$(usev debug d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-} DISTUTILS_ARGS=( "${MAIN_DISTUTILS_ARGS[@]}" @@ -492,7 +492,7 @@ python_compile() { python_test() { # Otherwise it picks the last built directory breaking assumption for multi target builds mkdir -p build_history/9999-99-99_999999/ || die - local pyside_build_dir=qfp-py${EPYTHON#python}-qt$(ver_cut 1-3)-${BUILD_ID} + local pyside_build_dir=qfp$(usev debug d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-${BUILD_ID} echo "$(ls -d "${BUILD_DIR}"/build*/${pyside_build_dir}/build | sort -V | tail -n 1)" > build_history/9999-99-99_999999/build_dir.txt || die echo "${pyside_build_dir}" >> build_history/9999-99-99_999999/build_dir.txt || die diff --git a/dev-python/pyside/pyside-6.9999.ebuild b/dev-python/pyside/pyside-6.9999.ebuild index 5e583ba3e82d..af3a5d98a266 100644 --- a/dev-python/pyside/pyside-6.9999.ebuild +++ b/dev-python/pyside/pyside-6.9999.ebuild @@ -361,8 +361,8 @@ python_compile() { distutils-r1_python_compile # The build system uses its own build dir, find the name of this dir. - local pyside_build_dir=$(find "${BUILD_DIR}/build$((${#DISTUTILS_WHEELS[@]}-1))" -maxdepth 1 -type d -name 'qfp-*' -printf "%f\n") - export BUILD_ID=${pyside_build_dir#qfp-py${EPYTHON#python}-qt$(ver_cut 1-3)-} + local pyside_build_dir=$(find "${BUILD_DIR}/build$((${#DISTUTILS_WHEELS[@]}-1))" -maxdepth 1 -type d -name 'qfp*-py*-qt*-*' -printf "%f\n") + export BUILD_ID=${pyside_build_dir#qfp$(usev debug d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-} DISTUTILS_ARGS=( "${MAIN_DISTUTILS_ARGS[@]}" @@ -492,7 +492,7 @@ python_compile() { python_test() { # Otherwise it picks the last built directory breaking assumption for multi target builds mkdir -p build_history/9999-99-99_999999/ || die - local pyside_build_dir=qfp-py${EPYTHON#python}-qt$(ver_cut 1-3)-${BUILD_ID} + local pyside_build_dir=qfp$(usev debug d)-py${EPYTHON#python}-qt$(ver_cut 1-3)-${BUILD_ID} echo "$(ls -d "${BUILD_DIR}"/build*/${pyside_build_dir}/build | sort -V | tail -n 1)" > build_history/9999-99-99_999999/build_dir.txt || die echo "${pyside_build_dir}" >> build_history/9999-99-99_999999/build_dir.txt || die
