diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2025-02-01 22:43:06 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2025-02-01 22:43:06 +0000 |
| commit | 417ef5d7c7bd36af15766ab14554600fbe7daed7 (patch) | |
| tree | 3b5d8d93ff01be44bfb626166431ec3722be57b0 /eclass | |
| parent | 7323114f21150e9c3714584386134160e2c520cf (diff) | |
gentoo auto-resync : 01:02:2025 - 22:43:06
Diffstat (limited to 'eclass')
39 files changed, 25 insertions, 7 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 5032756b4e7a..caa98fff9871 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz 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 index b64f857ec102..b64f857ec102 100755..100644 --- a/eclass/tests/autotools_eaclocal_amflags.sh +++ b/eclass/tests/autotools_eaclocal_amflags.sh diff --git a/eclass/tests/cargo-bench.sh b/eclass/tests/cargo-bench.sh index 9347fe339c12..9347fe339c12 100755..100644 --- a/eclass/tests/cargo-bench.sh +++ b/eclass/tests/cargo-bench.sh diff --git a/eclass/tests/dist-kernel-utils.sh b/eclass/tests/dist-kernel-utils.sh index 28c8f7213a53..28c8f7213a53 100755..100644 --- a/eclass/tests/dist-kernel-utils.sh +++ b/eclass/tests/dist-kernel-utils.sh diff --git a/eclass/tests/eapi8-dosym.sh b/eclass/tests/eapi8-dosym.sh index a0f8961d4d96..a0f8961d4d96 100755..100644 --- a/eclass/tests/eapi8-dosym.sh +++ b/eclass/tests/eapi8-dosym.sh diff --git a/eclass/tests/eapi9-pipestatus.sh b/eclass/tests/eapi9-pipestatus.sh index 6264b63d9440..6264b63d9440 100755..100644 --- a/eclass/tests/eapi9-pipestatus.sh +++ b/eclass/tests/eapi9-pipestatus.sh diff --git a/eclass/tests/edo.sh b/eclass/tests/edo.sh index cac03e0401ba..cac03e0401ba 100755..100644 --- a/eclass/tests/edo.sh +++ b/eclass/tests/edo.sh diff --git a/eclass/tests/estack_eshopts.sh b/eclass/tests/estack_eshopts.sh index c070e99b6569..c070e99b6569 100755..100644 --- a/eclass/tests/estack_eshopts.sh +++ b/eclass/tests/estack_eshopts.sh diff --git a/eclass/tests/estack_estack.sh b/eclass/tests/estack_estack.sh index 18d337ec1f0c..18d337ec1f0c 100755..100644 --- a/eclass/tests/estack_estack.sh +++ b/eclass/tests/estack_estack.sh diff --git a/eclass/tests/estack_evar.sh b/eclass/tests/estack_evar.sh index 1bf35f2d6e0e..1bf35f2d6e0e 100755..100644 --- a/eclass/tests/estack_evar.sh +++ b/eclass/tests/estack_evar.sh diff --git a/eclass/tests/flag-o-matic.sh b/eclass/tests/flag-o-matic.sh index 1e4bfdb2fcfe..1e4bfdb2fcfe 100755..100644 --- a/eclass/tests/flag-o-matic.sh +++ b/eclass/tests/flag-o-matic.sh diff --git a/eclass/tests/git-r3_GIT_DIR.sh b/eclass/tests/git-r3_GIT_DIR.sh index 2c9fa07b7041..2c9fa07b7041 100755..100644 --- a/eclass/tests/git-r3_GIT_DIR.sh +++ b/eclass/tests/git-r3_GIT_DIR.sh diff --git a/eclass/tests/git-r3_subrepos.sh b/eclass/tests/git-r3_subrepos.sh index 76dbb1981bfc..76dbb1981bfc 100755..100644 --- a/eclass/tests/git-r3_subrepos.sh +++ b/eclass/tests/git-r3_subrepos.sh diff --git a/eclass/tests/linux-info_get_running_version.sh b/eclass/tests/linux-info_get_running_version.sh index b8ae8c4b85ae..b8ae8c4b85ae 100755..100644 --- a/eclass/tests/linux-info_get_running_version.sh +++ b/eclass/tests/linux-info_get_running_version.sh diff --git a/eclass/tests/llvm-r1.sh b/eclass/tests/llvm-r1.sh index d4657815465d..d4657815465d 100755..100644 --- a/eclass/tests/llvm-r1.sh +++ b/eclass/tests/llvm-r1.sh diff --git a/eclass/tests/llvm-r2.sh b/eclass/tests/llvm-r2.sh index fde76d2d682e..fde76d2d682e 100755..100644 --- a/eclass/tests/llvm-r2.sh +++ b/eclass/tests/llvm-r2.sh diff --git a/eclass/tests/llvm-utils.sh b/eclass/tests/llvm-utils.sh index 6fe3da3eda13..6fe3da3eda13 100755..100644 --- a/eclass/tests/llvm-utils.sh +++ b/eclass/tests/llvm-utils.sh diff --git a/eclass/tests/llvm.sh b/eclass/tests/llvm.sh index e62fb4b002a2..e62fb4b002a2 100755..100644 --- a/eclass/tests/llvm.sh +++ b/eclass/tests/llvm.sh diff --git a/eclass/tests/multilib.sh b/eclass/tests/multilib.sh index 95be9530881e..95be9530881e 100755..100644 --- a/eclass/tests/multilib.sh +++ b/eclass/tests/multilib.sh diff --git a/eclass/tests/multiprocessing_makeopts_jobs.sh b/eclass/tests/multiprocessing_makeopts_jobs.sh index 56d73ef48b3c..56d73ef48b3c 100755..100644 --- a/eclass/tests/multiprocessing_makeopts_jobs.sh +++ b/eclass/tests/multiprocessing_makeopts_jobs.sh diff --git a/eclass/tests/multiprocessing_makeopts_loadavg.sh b/eclass/tests/multiprocessing_makeopts_loadavg.sh index d6e4bf0451fb..d6e4bf0451fb 100755..100644 --- a/eclass/tests/multiprocessing_makeopts_loadavg.sh +++ b/eclass/tests/multiprocessing_makeopts_loadavg.sh diff --git a/eclass/tests/pypi-bench.sh b/eclass/tests/pypi-bench.sh index 02855563db3f..02855563db3f 100755..100644 --- a/eclass/tests/pypi-bench.sh +++ b/eclass/tests/pypi-bench.sh diff --git a/eclass/tests/pypi.sh b/eclass/tests/pypi.sh index 471ac048b18a..471ac048b18a 100755..100644 --- a/eclass/tests/pypi.sh +++ b/eclass/tests/pypi.sh diff --git a/eclass/tests/python-utils-bench.sh b/eclass/tests/python-utils-bench.sh index f718b9f125cb..f718b9f125cb 100755..100644 --- a/eclass/tests/python-utils-bench.sh +++ b/eclass/tests/python-utils-bench.sh diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh index 81c3c6f78158..81c3c6f78158 100755..100644 --- a/eclass/tests/python-utils-r1.sh +++ b/eclass/tests/python-utils-r1.sh diff --git a/eclass/tests/qmail.sh b/eclass/tests/qmail.sh index 16e52741c23c..16e52741c23c 100755..100644 --- a/eclass/tests/qmail.sh +++ b/eclass/tests/qmail.sh diff --git a/eclass/tests/rebar_fix_include_path.sh b/eclass/tests/rebar_fix_include_path.sh index 46c5712104b1..46c5712104b1 100755..100644 --- a/eclass/tests/rebar_fix_include_path.sh +++ b/eclass/tests/rebar_fix_include_path.sh diff --git a/eclass/tests/rebar_remove_deps.sh b/eclass/tests/rebar_remove_deps.sh index e2717b59eaf9..e2717b59eaf9 100755..100644 --- a/eclass/tests/rebar_remove_deps.sh +++ b/eclass/tests/rebar_remove_deps.sh diff --git a/eclass/tests/rebar_set_vsn.sh b/eclass/tests/rebar_set_vsn.sh index 6cc4600695a6..6cc4600695a6 100755..100644 --- a/eclass/tests/rebar_set_vsn.sh +++ b/eclass/tests/rebar_set_vsn.sh diff --git a/eclass/tests/savedconfig.sh b/eclass/tests/savedconfig.sh index ad03ce2d2d94..ad03ce2d2d94 100755..100644 --- a/eclass/tests/savedconfig.sh +++ b/eclass/tests/savedconfig.sh diff --git a/eclass/tests/systemd.sh b/eclass/tests/systemd.sh index f870df4b7a12..f870df4b7a12 100755..100644 --- a/eclass/tests/systemd.sh +++ b/eclass/tests/systemd.sh diff --git a/eclass/tests/toolchain-funcs.sh b/eclass/tests/toolchain-funcs.sh index 0d6745862148..0d6745862148 100755..100644 --- a/eclass/tests/toolchain-funcs.sh +++ b/eclass/tests/toolchain-funcs.sh diff --git a/eclass/tests/toolchain.sh b/eclass/tests/toolchain.sh index 1ba2e6b1f29d..1ba2e6b1f29d 100755..100644 --- a/eclass/tests/toolchain.sh +++ b/eclass/tests/toolchain.sh diff --git a/eclass/tests/unpacker.sh b/eclass/tests/unpacker.sh index ef17e724a851..ef17e724a851 100755..100644 --- a/eclass/tests/unpacker.sh +++ b/eclass/tests/unpacker.sh diff --git a/eclass/tests/verify-sig.sh b/eclass/tests/verify-sig.sh index a87e2c7703d7..a87e2c7703d7 100755..100644 --- a/eclass/tests/verify-sig.sh +++ b/eclass/tests/verify-sig.sh diff --git a/eclass/tests/version-funcs.sh b/eclass/tests/version-funcs.sh index cb2a92342c65..cb2a92342c65 100755..100644 --- a/eclass/tests/version-funcs.sh +++ b/eclass/tests/version-funcs.sh diff --git a/eclass/tests/zig-utils.sh b/eclass/tests/zig-utils.sh index 14af1d2105e3..14af1d2105e3 100755..100644 --- a/eclass/tests/zig-utils.sh +++ b/eclass/tests/zig-utils.sh |