diff options
Diffstat (limited to 'app-shells')
| -rw-r--r-- | app-shells/Manifest.gz | bin | 8795 -> 8787 bytes | |||
| -rw-r--r-- | app-shells/fish/Manifest | 7 | ||||
| -rw-r--r-- | app-shells/fish/files/fish-3.4.1-atomic.patch | 65 | ||||
| -rw-r--r-- | app-shells/fish/fish-3.4.1.ebuild | 107 | ||||
| -rw-r--r-- | app-shells/fish/fish-3.5.1.ebuild (renamed from app-shells/fish/fish-3.5.0.ebuild) | 0 |
5 files changed, 2 insertions, 177 deletions
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz Binary files differindex 98cf1f2969bf..035945e0577b 100644 --- a/app-shells/Manifest.gz +++ b/app-shells/Manifest.gz diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest index a7148767435e..3536e0c35603 100644 --- a/app-shells/fish/Manifest +++ b/app-shells/fish/Manifest @@ -1,10 +1,7 @@ AUX README.gentoo 732 BLAKE2B b869bd411bf505339adec5a6c35731bf26f8910bcf82919c15df7f8e2a8bc6ebf4baf6964ff27ce572e738c657696b1cd1446a18996a2270a620c3374f629f98 SHA512 20a0892d7e9c4aa7736bf5dbca485e848f817390325186bb2dd054ac56259679f0accf5b4c3b18c9cd398c43d1bb393b0423be26a4c15adfe070d6f06741f693 -AUX fish-3.4.1-atomic.patch 2109 BLAKE2B 8b33b8a0d3add15847ea54d5c3f243bc7bb5a8e99e029ee445405304a113217984e68c10088549df4c9cdba967bfda3f09f0dcfae96ce4035594477961410fe2 SHA512 651acf7d0961ed51332f52611e7ec4e6b56808ecd90ad8b2839c4cd9d4573a9d92824f1f3b3dafed9fabc06523cdb2fb4622098b60d4e32b462bc2ce450cc488 DIST fish-3.4.0.tar.xz 3292216 BLAKE2B 3691e5387a8392d7d43b3b0f8b893e83e246c3532684e95a19c7b2eb4ebe80bcf04aaa1b965f5c4f6d782d0ae52269bb1cdafef76845b02f9f99d4c82ea77ce3 SHA512 463ee8d86815520c6de9777fd2b5975f06cc0842137c86cca7ae0331e95d74e755bf6f4b0bdea7e96c11371436ff9f97ce483ae026daa1e8d385f6cad8860ed4 -DIST fish-3.4.1.tar.xz 3293068 BLAKE2B 5edcd59445e6d928fb2183deb68fb0a305f6f80c134fef48ea79d91b79af1da6b31a1e870a9df963bb27dfc5985f326d9b6d53d64b16c79f9c303aa8edfa4423 SHA512 20a2892ec0c413c4c3fcfe5fbf52fb2398de35a9172758728bd2ccdccc5fb6e0e18712a664d02db67543d47180a4d04f3998a6297d23088926b6d03baefdf981 -DIST fish-3.5.0.tar.xz 3326276 BLAKE2B ac8fa514a728af5bc02ea02f57344d92d3d897c5dda3a2a32b6dbaab81c795828da0cc6938f19bb6d538aa1e620b67de72225fa73b52405c94e1eecab2299faa SHA512 ccec4abcdb425563688c6112f3c9c57add16aa3a05c121d2633b655d27185e1c96c263d51d6af7d83c068580d7d0723c072f1a4853fa8b6736291beeab64b859 +DIST fish-3.5.1.tar.xz 3329900 BLAKE2B 960ee4036dd44bda93300a377e44f5c3db19f2c24ee60112c3e8b886cc434e9bc08c65dd99ab13aefde6c7cb66e027f446064bc6b7f20f9a85b16753ea7b50c3 SHA512 328e3d972f9e7cffe161515540f00a97c5cbe11b43ec293090bedb96a6a8e689e07ceafecb3efcd0e378edea59811adb0acc011d5885ac28d98838387c678235 EBUILD fish-3.4.0.ebuild 2346 BLAKE2B 540bb7722faa9a5b609c8613c294b62fa7285c84027a1a1216c57cc9eb87ebfdd459188d621aa8e771800d8453c33bae1dc38d2efd0fdf66f2769377d61346cd SHA512 8801a597506ecb2e1f92d84e64c44c11055ffebe80945eeb00953db2fd0eb60252604bddec1af135eaf85be58d8fbf3cc4f364390e1ca3cfec3eb2a4a49bbc81 -EBUILD fish-3.4.1.ebuild 2467 BLAKE2B 6b66f8f300aa0c8e3dbf66f355001c62ed7f909404355d27d5dee305153042ebf19869ab81d714664ad05966a53ea4cdecbfac578939465df25d4487daf7c637 SHA512 7e80999fa43681a93bd0c64125c063c4a449f700abb1058978e0a0fbeb4b888ba1ce416af8e2e60614a73f8c820c1d069d9253944d2babf0d0ed021260101b0b -EBUILD fish-3.5.0.ebuild 2615 BLAKE2B c411170b4573d767fbc2e2c8097e171501abae458bfcf4bcbff960ce935d9ded5dd612c05b79edeb04398a7cd2a2da71f0fd33e63a790a38cd5353a0d5d34d1f SHA512 7e94c344a5191f506f8072dce81c7eabcdf5744920333dcd93811d3f89615d6ec88cd062349b531a8045407697d587e8b1f759e379689d7989d55b534a3b09ee +EBUILD fish-3.5.1.ebuild 2615 BLAKE2B c411170b4573d767fbc2e2c8097e171501abae458bfcf4bcbff960ce935d9ded5dd612c05b79edeb04398a7cd2a2da71f0fd33e63a790a38cd5353a0d5d34d1f SHA512 7e94c344a5191f506f8072dce81c7eabcdf5744920333dcd93811d3f89615d6ec88cd062349b531a8045407697d587e8b1f759e379689d7989d55b534a3b09ee EBUILD fish-9999.ebuild 2615 BLAKE2B c411170b4573d767fbc2e2c8097e171501abae458bfcf4bcbff960ce935d9ded5dd612c05b79edeb04398a7cd2a2da71f0fd33e63a790a38cd5353a0d5d34d1f SHA512 7e94c344a5191f506f8072dce81c7eabcdf5744920333dcd93811d3f89615d6ec88cd062349b531a8045407697d587e8b1f759e379689d7989d55b534a3b09ee MISC metadata.xml 628 BLAKE2B 0449de5f2df4578d1b6ea0ca56276805afa3726b9120b96de0968db59a92bf933c6516f7d62afe7074d64fe1f5cb7c48fce09d0f15ccda67b5f45fd600cef490 SHA512 f30b029929df8548ad626b96d6426227c9bd421d8838836ca09304a44aa7045d7a06b4ca215c98dd6ab9554dbd594578c5d9b0baa1b8564c17cd69dd9a8d9203 diff --git a/app-shells/fish/files/fish-3.4.1-atomic.patch b/app-shells/fish/files/fish-3.4.1-atomic.patch deleted file mode 100644 index a12e069a7433..000000000000 --- a/app-shells/fish/files/fish-3.4.1-atomic.patch +++ /dev/null @@ -1,65 +0,0 @@ -https://bugs.gentoo.org/836951 -Taken from https://github.com/fish-shell/fish-shell/pull/8851 - -From a3eb41ca882cc390b656515dd668a6816f745121 Mon Sep 17 00:00:00 2001 -From: Raymond Wong <infiwang@pm.me> -Date: Mon, 4 Apr 2022 01:14:26 +0800 -Subject: [PATCH 1/2] cmake: alter check for 64-bit atomic operation - -Signed-off-by: Raymond Wong <infiwang@pm.me> ---- - cmake/ConfigureChecks.cmake | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake -index bc190de054f..924aea1015a 100644 ---- a/cmake/ConfigureChecks.cmake -+++ b/cmake/ConfigureChecks.cmake -@@ -255,10 +255,10 @@ int main () { - check_cxx_source_compiles(" - #include <atomic> - #include <cstdint> --std::atomic<uint64_t> x (0); -+std::atomic<uint64_t> n64 (0); - int main() { --uint64_t i = x.load(std::memory_order_relaxed); --return std::atomic_is_lock_free(&x); -+uint64_t i = n64.load(std::memory_order_relaxed); -+return std::atomic_is_lock_free(&n64); - }" - LIBATOMIC_NOT_NEEDED) - IF (NOT LIBATOMIC_NOT_NEEDED) - -From 2fe9bfe0a6c1a821dabbf52af35c8eb2cd6e029b Mon Sep 17 00:00:00 2001 -From: Raymond Wong <infiwang@pm.me> -Date: Sun, 3 Apr 2022 14:01:15 +0800 -Subject: [PATCH 2/2] cmake: check for 8-bit atomic operation - -Fix building on RISC-V. -Closes #8850. - -Signed-off-by: Raymond Wong <infiwang@pm.me> ---- - cmake/ConfigureChecks.cmake | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake -index 924aea1015a..6562d324f45 100644 ---- a/cmake/ConfigureChecks.cmake -+++ b/cmake/ConfigureChecks.cmake -@@ -255,10 +255,13 @@ int main () { - check_cxx_source_compiles(" - #include <atomic> - #include <cstdint> -+std::atomic<uint8_t> n8 (0); - std::atomic<uint64_t> n64 (0); - int main() { --uint64_t i = n64.load(std::memory_order_relaxed); --return std::atomic_is_lock_free(&n64); -+uint8_t i = n8.load(std::memory_order_relaxed); -+uint64_t j = n64.load(std::memory_order_relaxed); -+return std::atomic_is_lock_free(&n8) -+ & std::atomic_is_lock_free(&n64); - }" - LIBATOMIC_NOT_NEEDED) - IF (NOT LIBATOMIC_NOT_NEEDED) diff --git a/app-shells/fish/fish-3.4.1.ebuild b/app-shells/fish/fish-3.4.1.ebuild deleted file mode 100644 index 08acc9d3b69e..000000000000 --- a/app-shells/fish/fish-3.4.1.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit cmake python-any-r1 readme.gentoo-r1 - -DESCRIPTION="Friendly Interactive SHell" -HOMEPAGE="http://fishshell.com/" - -MY_PV="${PV/_beta/b}" -MY_P="${PN}-${MY_PV}" - -if [[ ${PV} == "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git" -else - SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+doc nls test" - -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/libpcre2-10.32:=[pcre32] - sys-apps/coreutils - sys-libs/ncurses:=[unicode(+)] -" - -DEPEND="${RDEPEND}" -BDEPEND=" - nls? ( sys-devel/gettext ) - test? ( - ${PYTHON_DEPS} - dev-tcltk/expect - $(python_gen_any_dep ' - dev-python/pexpect[${PYTHON_USEDEP}] - ') - ) -" -# we don't need shpinx dep for release tarballs -[[ ${PV} == 9999 ]] && DEPEND+=" doc? ( dev-python/sphinx )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - # bug 836951, drop on next version bump - "${FILESDIR}"/${PN}-3.4.1-atomic.patch -) - -python_check_deps() { - use test || return 0 - python_has_version "dev-python/pexpect[${PYTHON_USEDEP}]" -} - -src_prepare() { - # workaround for https://github.com/fish-shell/fish-shell/issues/4883 - sed -i 's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \ - cmake/Tests.cmake || die - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin" - -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc" - -DCURSES_NEED_NCURSES=ON - -DINSTALL_DOCS="$(usex doc)" - -DWITH_GETTEXT="$(usex nls)" - ) - # release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE - if [[ ${PV} == 9999 ]]; then - mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" ) - else - mycmakeargs+=( -DBUILD_DOCS=OFF ) - fi - cmake_src_configure -} - -src_install() { - cmake_src_install - keepdir /usr/share/fish/vendor_{completions,conf,functions}.d - readme.gentoo_create_doc -} - -src_test() { - # some tests are fragile, sanitize environment - local -x COLUMNS=80 - local -x LINES=24 - - # very fragile, depends on terminal, size, tmux, screen and timing - if [[ ${PV} != 9999 ]]; then - rm -v tests/pexpects/terminal.py || die - fi - - cmake_build test -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/app-shells/fish/fish-3.5.0.ebuild b/app-shells/fish/fish-3.5.1.ebuild index 936ed237ea77..936ed237ea77 100644 --- a/app-shells/fish/fish-3.5.0.ebuild +++ b/app-shells/fish/fish-3.5.1.ebuild |