From ad108e7b751d67723534624b94eb0e04250dd1af Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 29 Mar 2025 00:32:16 +0000 Subject: gentoo auto-resync : 29:03:2025 - 00:32:15 --- app-shells/Manifest.gz | Bin 10638 -> 10640 bytes app-shells/fish/Manifest | 6 ++- .../fish-4.0.1-use-cargo-eclass-for-build.patch | 46 +++++++++++++++++++++ .../fish-9999-use-cargo-eclass-for-build.patch | 46 +++++++++++++++++++++ app-shells/fish/fish-4.0.1.ebuild | 17 +++----- app-shells/fish/fish-9999.ebuild | 13 ++---- 6 files changed, 105 insertions(+), 23 deletions(-) create mode 100644 app-shells/fish/files/fish-4.0.1-use-cargo-eclass-for-build.patch create mode 100644 app-shells/fish/files/fish-9999-use-cargo-eclass-for-build.patch (limited to 'app-shells') diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz index 7877444d70fb..b8fe946991d6 100644 Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest index e891e69b1719..bd975e3f159d 100644 --- a/app-shells/fish/Manifest +++ b/app-shells/fish/Manifest @@ -1,4 +1,6 @@ AUX README.gentoo 732 BLAKE2B b869bd411bf505339adec5a6c35731bf26f8910bcf82919c15df7f8e2a8bc6ebf4baf6964ff27ce572e738c657696b1cd1446a18996a2270a620c3374f629f98 SHA512 20a0892d7e9c4aa7736bf5dbca485e848f817390325186bb2dd054ac56259679f0accf5b4c3b18c9cd398c43d1bb393b0423be26a4c15adfe070d6f06741f693 +AUX fish-4.0.1-use-cargo-eclass-for-build.patch 1694 BLAKE2B be084c0de6f80ce36106e054a70af79488c0fc048ef646a49ae0c3a45a6d900e25deabd96a23b69e946962ffa048c64f86a2924cfb08956dd6c067d1478bcea7 SHA512 8f50fae143bc6038823fab293bcefcffe3c305bdf9b86de9eeabe2e51a89210165382ee93678f2b2ea1486fa31846d1b44f40bd0c0b0bcfc72e97d27207c9dd9 +AUX fish-9999-use-cargo-eclass-for-build.patch 1699 BLAKE2B f69a00e13858802fa07d2d7d28cf1ae68d1c5da8a3b2329482ed7711380b9d329837cecb66263d496075fc47dfb40e651121b3a01d0fe00b51b1cf0cd4ef380b SHA512 0da6b9e0f3980ef999f355459e2084ceafe290333dbfd7a3964b1cfbbcf9ada0f958f60ff8691b41ae276be11fcd4308354795ad13439699a1b418e354d39d83 DIST fish-3.7.1.tar.xz 2965756 BLAKE2B 3ba628047c042b9bcb4b28aaeb205efb211b006cc379d766ee805d9fded92a3c07a3994ad1006648cdd68b26cf977de70a39f3694879de40f2e72ed058572c3a SHA512 f1605c400c5d5494f37b92dd386963dba7a3f3c401c369aaf3ff616d9d94836a0138d26074be24c92d94d9d7b625513800899c9431f5e21be0757eb0a0bfd3fe DIST fish-4.0.0.tar.xz 3047432 BLAKE2B 70081b5c3a143021456cc37d28051ef86f589c00418f0261a6b50bf44bf5d0fdd2ea762088fa7d26756341ab7eb7a26b78711c2a1e59665324d080d6e028ce9d SHA512 559a0433aacd5b62204e02607ee628210619c633c3b9403fad91546feab5061707630d239a95db3e2efa5c95491008f94b767059c01d1f5ba3197c09dac7302c DIST fish-4.0.1.tar.xz 3049856 BLAKE2B d9ead161f5c7e0fa49055472756cfd24e5477844b9865eaac5d3db204a0f27725a7ea6ad053205bff51258b625e1707cbf2b86687458edd34bc4637dec9f8639 SHA512 ed72beef48e18ea31705c6f4904aacd35982a36aaa4c3f7ba1ac3e07e6ff8eb02c76f82d47a59a522f57dd36d9664d69e20fd15b7e253aa8d9406cf1c10cd565 @@ -7,6 +9,6 @@ DIST fish-shell-4.0.1-crates.tar.xz 7418464 BLAKE2B 943f28ef8b30ff54ad4d8a774624 DIST rust-pcre2-85b7afba1a9d9bd445779800e5bcafeb732e4421.gh.tar.gz 743187 BLAKE2B 533671ee8e97e65b93aa9103135848e8a85d79a2f525100aa0120500def9479675f6140878fa7b9bb248e51175ceac7c5710ce247af6e10385a00b23c8986b68 SHA512 9323e4d11708d8dc0e7ed607e97b8d4fac6f4a0b955e5e07b76da8152178888bc0ae2d2c109dd58b97d5faa037216e88365fcacb606f23f912d2edb82ede23ad EBUILD fish-3.7.1.ebuild 3197 BLAKE2B 2f57c82bbfcf15c53c05d12929d2adead97721dece482d5fc16d98d5fe7394246c0d131218ff7ae40905d771d82c18fdcabd60dd5476b28137ebbb70bdddc30b SHA512 d7e9a25a5e0378ccf00574dccb7bb422315520ab5d6a118bcd2b0b817ece949a6dcf57d73f3b135d518f8fada6792b989ceb16c7299ce3856d786eb7d70634bb EBUILD fish-4.0.0-r1.ebuild 4349 BLAKE2B 0f025b0b14a2a53eaf8b3371f9f848fb7ea879d30035a294bd039c289eeb31590a234bea257648628d30bc043d4eeab66bea2978561fba41d5108ca47cedd7f8 SHA512 cd0a537f52146079ef752ea83ce19e8c576dc30436a9000bdf42a8f6b4a33d4e75a5de7370fe096f5a75e101c6adf854b60b2d97a4f1bc3b52cbf904665ebbcc -EBUILD fish-4.0.1.ebuild 2860 BLAKE2B 98eff85c545403488397dcb8b288bcd952b4e5c2558fd08c201d7481514be189c9566ca522439fcd2e412679dd1cfd40ff0351be0f3c900dd3efa273d0a35bc5 SHA512 30aa4093c59e4d8038645302ef8090869ae82d5a0a390a5b08cf8105faf843c7d864c7f73e71bfbb87e50ad0eafa61571243db42108c44df01e0d79371b0fd14 -EBUILD fish-9999.ebuild 3454 BLAKE2B 592a92255a5ff766e0845dd3c62e7176244e4b158a3177bbc3515e296e736b0628ab81c49f1fe0e472b069b7537608a4790b65606c85c7021d2dec01ec9ede55 SHA512 54ebfd56437dc37f1fd450821b9ad5bd36cfec334a25b1177e560607d82edf16143639f373002e9b0ca8eb1d39a705ea9ab40cd6ecf19bb993d45088c1233bb2 +EBUILD fish-4.0.1.ebuild 2575 BLAKE2B 2236fdd07acac0d481f7775355fc26ab4e0a579bf9637080b8ca2fc06eb63d4c608ebc63b8e418ec1f1b03482fc78c2fa98bddd62b91042b103d8a74c9daf1a9 SHA512 161ffc02355aaf3ea560387b762870e0a7a39749e7f8fba5840618d78ba36e90fefc41908456d3ba334ab435ffced6df98dd25e10b8f5d94b8dacb7e01950538 +EBUILD fish-9999.ebuild 3251 BLAKE2B 71804485d73aa8d98bf578d0d735b6fbc878a608ebff14e701a9eb3dfadc21c5257aa8929f1c88a5457f8a3271b505153e414e2afdf30079da1102e40bdc86f2 SHA512 f804d0679bbf34f347da1b6a5fd1c6ff8522d18db2bceb923fb1ba8be369fe9541f8f65c8c8b231fa5faa73bd6b151efb900f04a395e09d903ee36dfa410be80 MISC metadata.xml 849 BLAKE2B 5cb3da9bc82b7c27bebb318df4d6a79058df1fa774a34dad666e0b89ea96e066a3293f31488f872f403e9ac2ebae68407936a036750038b776b8de9346d24a67 SHA512 df3ace1c8c02d5840b15111a70b386e4b35ab574e7da6c4f065a571c74822b3178ca5996b69cfa0de95b5f12e873ff62c3476494163e8d60a3e7120bfd073545 diff --git a/app-shells/fish/files/fish-4.0.1-use-cargo-eclass-for-build.patch b/app-shells/fish/files/fish-4.0.1-use-cargo-eclass-for-build.patch new file mode 100644 index 000000000000..3f2bf9c6ec40 --- /dev/null +++ b/app-shells/fish/files/fish-4.0.1-use-cargo-eclass-for-build.patch @@ -0,0 +1,46 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 496226e89..cb032d6d5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -51,17 +51,6 @@ function(CREATE_TARGET target) + add_custom_target( + ${target} ALL + COMMAND +- "${CMAKE_COMMAND}" -E +- env ${VARS_FOR_CARGO} +- ${Rust_CARGO} +- build --bin ${target} +- $<$:--release> +- $<$:--profile=release-with-debug> +- --target ${Rust_CARGO_TARGET} +- --no-default-features +- ${CARGO_FLAGS} +- ${FEATURES_ARG} +- && + "${CMAKE_COMMAND}" -E + copy "${rust_target_dir}/${rust_profile}/${target}" "${CMAKE_CURRENT_BINARY_DIR}" + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" +diff --git a/cmake/Rust.cmake b/cmake/Rust.cmake +index 40887be45..fa0f7ab6f 100644 +--- a/cmake/Rust.cmake ++++ b/cmake/Rust.cmake +@@ -5,7 +5,7 @@ set(Rust_RESOLVE_RUSTUP_TOOLCHAINS Off) + include(FindRust) + find_package(Rust REQUIRED) + +-set(FISH_RUST_BUILD_DIR "${CMAKE_BINARY_DIR}/cargo/build") ++set(FISH_RUST_BUILD_DIR "${CMAKE_SOURCE_DIR}/target") + + if(DEFINED ASAN) + list(APPEND CARGO_FLAGS "-Z" "build-std") +@@ -22,8 +22,8 @@ else() + set(rust_target_dir "${FISH_RUST_BUILD_DIR}/${Rust_CARGO_HOST_TARGET}") + endif() + +-set(rust_profile $,debug,$,release-with-debug,release>>) +-set(rust_debugflags "$<$:-g>$<$:-g>") ++set(rust_profile $,debug,release>) ++set(rust_debugflags "$<$:-g>") + + + # Temporary hack to propogate CMake flags/options to build.rs. We need to get CMake to evaluate the diff --git a/app-shells/fish/files/fish-9999-use-cargo-eclass-for-build.patch b/app-shells/fish/files/fish-9999-use-cargo-eclass-for-build.patch new file mode 100644 index 000000000000..f20510a54bd8 --- /dev/null +++ b/app-shells/fish/files/fish-9999-use-cargo-eclass-for-build.patch @@ -0,0 +1,46 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0510cd2d7..c49f80d69 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,17 +41,6 @@ function(CREATE_TARGET target) + add_custom_target( + ${target} ALL + COMMAND +- "${CMAKE_COMMAND}" -E +- env ${VARS_FOR_CARGO} +- ${Rust_CARGO} +- build --bin ${target} +- $<$:--release> +- $<$:--profile=release-with-debug> +- --target ${Rust_CARGO_TARGET} +- --no-default-features +- ${CARGO_FLAGS} +- ${FEATURES_ARG} +- && + "${CMAKE_COMMAND}" -E + copy "${rust_target_dir}/${rust_profile}/${target}" "${CMAKE_CURRENT_BINARY_DIR}" + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" +diff --git a/cmake/Rust.cmake b/cmake/Rust.cmake +index c5bb1b1b3..618b47183 100644 +--- a/cmake/Rust.cmake ++++ b/cmake/Rust.cmake +@@ -5,7 +5,7 @@ set(Rust_RESOLVE_RUSTUP_TOOLCHAINS Off) + include(FindRust) + find_package(Rust 1.70 REQUIRED) + +-set(FISH_RUST_BUILD_DIR "${CMAKE_BINARY_DIR}/cargo/build") ++set(FISH_RUST_BUILD_DIR "${CMAKE_SOURCE_DIR}/target") + + if(DEFINED ASAN) + list(APPEND CARGO_FLAGS "-Z" "build-std") +@@ -22,8 +22,8 @@ else() + set(rust_target_dir "${FISH_RUST_BUILD_DIR}/${Rust_CARGO_HOST_TARGET}") + endif() + +-set(rust_profile $,debug,$,release-with-debug,release>>) +-set(rust_debugflags "$<$:-g>$<$:-g>") ++set(rust_profile $,debug,release>) ++set(rust_debugflags "$<$:-g>") + + + # Temporary hack to propagate CMake flags/options to build.rs. We need to get CMake to evaluate the diff --git a/app-shells/fish/fish-4.0.1.ebuild b/app-shells/fish/fish-4.0.1.ebuild index 5d155c4ce982..8e85d81223a9 100644 --- a/app-shells/fish/fish-4.0.1.ebuild +++ b/app-shells/fish/fish-4.0.1.ebuild @@ -10,7 +10,7 @@ declare -A GIT_CRATES=( [pcre2]='https://github.com/fish-shell/rust-pcre2;85b7afba1a9d9bd445779800e5bcafeb732e4421;rust-pcre2-%commit%' ) -inherit cargo cmake multiprocessing readme.gentoo-r1 xdg +inherit cargo cmake readme.gentoo-r1 xdg DESCRIPTION="Friendly Interactive SHell" HOMEPAGE="https://fishshell.com/" @@ -46,6 +46,10 @@ BDEPEND=" # Release tarballs contain prebuilt documentation. [[ ${PV} == 9999 ]] && BDEPEND+=" doc? ( dev-python/sphinx )" +PATCHES=( + "${FILESDIR}/${PN}-4.0.1-use-cargo-eclass-for-build.patch" +) + QA_FLAGS_IGNORED="usr/bin/.*" src_unpack() { @@ -60,7 +64,6 @@ src_unpack() { src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" - -DCTEST_PARALLEL_LEVEL="$(makeopts_jobs)" -DINSTALL_DOCS="$(usex doc)" ) cargo_src_configure --no-default-features \ @@ -87,20 +90,10 @@ src_compile() { fi cargo_src_compile - - # Copy built binaries into the cmake build directory to mark the targets - # up-to-date in cmake. - for target in fish fish_indent fish_key_reader; do - cp "$(cargo_target_dir)/${target}" "${BUILD_DIR}" || die - done - - cmake_src_compile } src_test() { local -x CARGO_TERM_COLOR=always - local -x FISH_SOURCE_DIR="${S}" - local -x FISH_FORCE_COLOR=1 local -x TEST_VERBOSE=1 cargo_env cmake_src_test -R cargo-test } diff --git a/app-shells/fish/fish-9999.ebuild b/app-shells/fish/fish-9999.ebuild index 6912899db052..43f063210450 100644 --- a/app-shells/fish/fish-9999.ebuild +++ b/app-shells/fish/fish-9999.ebuild @@ -50,6 +50,10 @@ BDEPEND=" # Release tarballs contain prebuilt documentation. [[ ${PV} == 9999 ]] && BDEPEND+=" doc? ( dev-python/sphinx )" +PATCHES=( + "${FILESDIR}/${PN}-9999-use-cargo-eclass-for-build.patch" +) + QA_FLAGS_IGNORED="usr/bin/.*" python_check_deps() { @@ -101,14 +105,6 @@ src_compile() { fi cargo_src_compile - - # Copy built binaries into the cmake build directory to mark the targets - # up-to-date in cmake. - for target in fish fish_indent fish_key_reader; do - cp "$(cargo_target_dir)/${target}" "${BUILD_DIR}" || die - done - - cmake_src_compile } src_test() { @@ -129,7 +125,6 @@ src_test() { # Enable colored output for building tests. local -x CARGO_TERM_COLOR=always - # TODO: Figure out why we link again. cargo_env cmake_build fish_run_tests } -- cgit v1.2.3