From 417ef5d7c7bd36af15766ab14554600fbe7daed7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 1 Feb 2025 22:43:06 +0000 Subject: gentoo auto-resync : 01:02:2025 - 22:43:06 --- eclass/Manifest.gz | Bin 40194 -> 40198 bytes eclass/llvm.org.eclass | 3 +++ eclass/qt6-build.eclass | 29 +++++++++++++++++------ eclass/tests/autotools_eaclocal_amflags.sh | 0 eclass/tests/cargo-bench.sh | 0 eclass/tests/dist-kernel-utils.sh | 0 eclass/tests/eapi8-dosym.sh | 0 eclass/tests/eapi9-pipestatus.sh | 0 eclass/tests/edo.sh | 0 eclass/tests/estack_eshopts.sh | 0 eclass/tests/estack_estack.sh | 0 eclass/tests/estack_evar.sh | 0 eclass/tests/flag-o-matic.sh | 0 eclass/tests/git-r3_GIT_DIR.sh | 0 eclass/tests/git-r3_subrepos.sh | 0 eclass/tests/linux-info_get_running_version.sh | 0 eclass/tests/llvm-r1.sh | 0 eclass/tests/llvm-r2.sh | 0 eclass/tests/llvm-utils.sh | 0 eclass/tests/llvm.sh | 0 eclass/tests/multilib.sh | 0 eclass/tests/multiprocessing_makeopts_jobs.sh | 0 eclass/tests/multiprocessing_makeopts_loadavg.sh | 0 eclass/tests/pypi-bench.sh | 0 eclass/tests/pypi.sh | 0 eclass/tests/python-utils-bench.sh | 0 eclass/tests/python-utils-r1.sh | 0 eclass/tests/qmail.sh | 0 eclass/tests/rebar_fix_include_path.sh | 0 eclass/tests/rebar_remove_deps.sh | 0 eclass/tests/rebar_set_vsn.sh | 0 eclass/tests/savedconfig.sh | 0 eclass/tests/systemd.sh | 0 eclass/tests/toolchain-funcs.sh | 0 eclass/tests/toolchain.sh | 0 eclass/tests/unpacker.sh | 0 eclass/tests/verify-sig.sh | 0 eclass/tests/version-funcs.sh | 0 eclass/tests/zig-utils.sh | 0 39 files changed, 25 insertions(+), 7 deletions(-) mode change 100755 => 100644 eclass/tests/autotools_eaclocal_amflags.sh mode change 100755 => 100644 eclass/tests/cargo-bench.sh mode change 100755 => 100644 eclass/tests/dist-kernel-utils.sh mode change 100755 => 100644 eclass/tests/eapi8-dosym.sh mode change 100755 => 100644 eclass/tests/eapi9-pipestatus.sh mode change 100755 => 100644 eclass/tests/edo.sh mode change 100755 => 100644 eclass/tests/estack_eshopts.sh mode change 100755 => 100644 eclass/tests/estack_estack.sh mode change 100755 => 100644 eclass/tests/estack_evar.sh mode change 100755 => 100644 eclass/tests/flag-o-matic.sh mode change 100755 => 100644 eclass/tests/git-r3_GIT_DIR.sh mode change 100755 => 100644 eclass/tests/git-r3_subrepos.sh mode change 100755 => 100644 eclass/tests/linux-info_get_running_version.sh mode change 100755 => 100644 eclass/tests/llvm-r1.sh mode change 100755 => 100644 eclass/tests/llvm-r2.sh mode change 100755 => 100644 eclass/tests/llvm-utils.sh mode change 100755 => 100644 eclass/tests/llvm.sh mode change 100755 => 100644 eclass/tests/multilib.sh mode change 100755 => 100644 eclass/tests/multiprocessing_makeopts_jobs.sh mode change 100755 => 100644 eclass/tests/multiprocessing_makeopts_loadavg.sh mode change 100755 => 100644 eclass/tests/pypi-bench.sh mode change 100755 => 100644 eclass/tests/pypi.sh mode change 100755 => 100644 eclass/tests/python-utils-bench.sh mode change 100755 => 100644 eclass/tests/python-utils-r1.sh mode change 100755 => 100644 eclass/tests/qmail.sh mode change 100755 => 100644 eclass/tests/rebar_fix_include_path.sh mode change 100755 => 100644 eclass/tests/rebar_remove_deps.sh mode change 100755 => 100644 eclass/tests/rebar_set_vsn.sh mode change 100755 => 100644 eclass/tests/savedconfig.sh mode change 100755 => 100644 eclass/tests/systemd.sh mode change 100755 => 100644 eclass/tests/toolchain-funcs.sh mode change 100755 => 100644 eclass/tests/toolchain.sh mode change 100755 => 100644 eclass/tests/unpacker.sh mode change 100755 => 100644 eclass/tests/verify-sig.sh mode change 100755 => 100644 eclass/tests/version-funcs.sh mode change 100755 => 100644 eclass/tests/zig-utils.sh (limited to 'eclass') diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz index 5032756b4e7a..caa98fff9871 100644 Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass index 348bea3dd1db..f9704aceeb2a 100644 --- a/eclass/llvm.org.eclass +++ b/eclass/llvm.org.eclass @@ -72,6 +72,9 @@ if [[ -z ${_LLVM_SOURCE_TYPE+1} ]]; then _LLVM_SOURCE_TYPE=snapshot case ${PV} in + 21.0.0_pre20250201) + EGIT_COMMIT=bfa7edcc6652bdb37d53e0cec64926aab3f280eb + ;; 20.0.0_pre20250125) EGIT_COMMIT=1f26ac10ca1bef40a80be8f81a6f109713bc586f ;; diff --git a/eclass/qt6-build.eclass b/eclass/qt6-build.eclass index 31bdf1e01167..ae23f4e9bd82 100644 --- a/eclass/qt6-build.eclass +++ b/eclass/qt6-build.eclass @@ -234,18 +234,33 @@ _qt6-build_create_user_facing_links() { # even if no links (empty), if missing will assume that it is an error [[ ${PN} == qttranslations ]] && return - # loop and match using paths (upstream suggests `xargs ln -s < ${links}` - # but, for what it is worth, that will fail if paths have spaces) + # TODO: drop when <6.8.3 is gone, unneeded version with relative paths + if ver_test -lt 6.8.3; then + local link + while IFS= read -r link; do + if [[ -z ${link} ]]; then + continue + elif [[ ${link} =~ ^("${QT6_PREFIX}"/.+)\ ("${QT6_PREFIX}"/bin/.+) ]] + then + dosym -r "${BASH_REMATCH[1]#"${EPREFIX}"}" \ + "${BASH_REMATCH[2]#"${EPREFIX}"}" + else + die "unrecognized user_facing_tool_links.txt line: ${link}" + fi + done < "${BUILD_DIR}"/user_facing_tool_links.txt || die + + return + fi + local link while IFS= read -r link; do if [[ -z ${link} ]]; then continue - elif [[ ${link} =~ ^("${QT6_PREFIX}"/.+)\ ("${QT6_PREFIX}"/bin/.+) ]] - then - dosym -r "${BASH_REMATCH[1]#"${EPREFIX}"}" \ - "${BASH_REMATCH[2]#"${EPREFIX}"}" + elif [[ ${link} =~ (../[^ ]+)\ (bin/.+) ]]; then + dosym "${BASH_REMATCH[1]}" \ + "${QT6_PREFIX#"${EPREFIX}"}/${BASH_REMATCH[2]}" else - die "unrecognized line '${link}' in '${links}'" + die "unrecognized user_facing_tool_links.txt line: ${link}" fi done < "${BUILD_DIR}"/user_facing_tool_links.txt || die } diff --git a/eclass/tests/autotools_eaclocal_amflags.sh b/eclass/tests/autotools_eaclocal_amflags.sh old mode 100755 new mode 100644 diff --git a/eclass/tests/cargo-bench.sh b/eclass/tests/cargo-bench.sh old mode 100755 new mode 100644 diff --git a/eclass/tests/dist-kernel-utils.sh b/eclass/tests/dist-kernel-utils.sh old mode 100755 new mode 100644 diff --git a/eclass/tests/eapi8-dosym.sh b/eclass/tests/eapi8-dosym.sh old mode 100755 new mode 100644 diff --git a/eclass/tests/eapi9-pipestatus.sh b/eclass/tests/eapi9-pipestatus.sh old mode 100755 new mode 100644 diff --git a/eclass/tests/edo.sh b/eclass/tests/edo.sh old mode 100755 new mode 100644 diff --git a/eclass/tests/estack_eshopts.sh b/eclass/tests/estack_eshopts.sh old mode 100755 new mode 100644 diff --git a/eclass/tests/estack_estack.sh b/eclass/tests/estack_estack.sh old mode 100755 new mode 100644 diff --git a/eclass/tests/estack_evar.sh b/eclass/tests/estack_evar.sh old mode 100755 new mode 100644 diff --git a/eclass/tests/flag-o-matic.sh b/eclass/tests/flag-o-matic.sh old mode 100755 new mode 100644 diff --git a/eclass/tests/git-r3_GIT_DIR.sh b/eclass/tests/git-r3_GIT_DIR.sh old mode 100755 new mode 100644 diff --git a/eclass/tests/git-r3_subrepos.sh b/eclass/tests/git-r3_subrepos.sh old mode 100755 new mode 100644 diff --git a/eclass/tests/linux-info_get_running_version.sh b/eclass/tests/linux-info_get_running_version.sh old mode 100755 new mode 100644 diff --git a/eclass/tests/llvm-r1.sh b/eclass/tests/llvm-r1.sh old mode 100755 new mode 100644 diff --git a/eclass/tests/llvm-r2.sh b/eclass/tests/llvm-r2.sh old mode 100755 new mode 100644 diff --git a/eclass/tests/llvm-utils.sh b/eclass/tests/llvm-utils.sh old mode 100755 new mode 100644 diff --git a/eclass/tests/llvm.sh b/eclass/tests/llvm.sh old mode 100755 new mode 100644 diff --git a/eclass/tests/multilib.sh b/eclass/tests/multilib.sh old mode 100755 new mode 100644 diff --git a/eclass/tests/multiprocessing_makeopts_jobs.sh b/eclass/tests/multiprocessing_makeopts_jobs.sh old mode 100755 new mode 100644 diff --git a/eclass/tests/multiprocessing_makeopts_loadavg.sh b/eclass/tests/multiprocessing_makeopts_loadavg.sh old mode 100755 new mode 100644 diff --git a/eclass/tests/pypi-bench.sh b/eclass/tests/pypi-bench.sh old mode 100755 new mode 100644 diff --git a/eclass/tests/pypi.sh b/eclass/tests/pypi.sh old mode 100755 new mode 100644 diff --git a/eclass/tests/python-utils-bench.sh b/eclass/tests/python-utils-bench.sh old mode 100755 new mode 100644 diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh old mode 100755 new mode 100644 diff --git a/eclass/tests/qmail.sh b/eclass/tests/qmail.sh old mode 100755 new mode 100644 diff --git a/eclass/tests/rebar_fix_include_path.sh b/eclass/tests/rebar_fix_include_path.sh old mode 100755 new mode 100644 diff --git a/eclass/tests/rebar_remove_deps.sh b/eclass/tests/rebar_remove_deps.sh old mode 100755 new mode 100644 diff --git a/eclass/tests/rebar_set_vsn.sh b/eclass/tests/rebar_set_vsn.sh old mode 100755 new mode 100644 diff --git a/eclass/tests/savedconfig.sh b/eclass/tests/savedconfig.sh old mode 100755 new mode 100644 diff --git a/eclass/tests/systemd.sh b/eclass/tests/systemd.sh old mode 100755 new mode 100644 diff --git a/eclass/tests/toolchain-funcs.sh b/eclass/tests/toolchain-funcs.sh old mode 100755 new mode 100644 diff --git a/eclass/tests/toolchain.sh b/eclass/tests/toolchain.sh old mode 100755 new mode 100644 diff --git a/eclass/tests/unpacker.sh b/eclass/tests/unpacker.sh old mode 100755 new mode 100644 diff --git a/eclass/tests/verify-sig.sh b/eclass/tests/verify-sig.sh old mode 100755 new mode 100644 diff --git a/eclass/tests/version-funcs.sh b/eclass/tests/version-funcs.sh old mode 100755 new mode 100644 diff --git a/eclass/tests/zig-utils.sh b/eclass/tests/zig-utils.sh old mode 100755 new mode 100644 -- cgit v1.2.3