public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-shells/fish/files/, app-shells/fish/
@ 2021-03-02  7:23 Lars Wendler
  0 siblings, 0 replies; 10+ messages in thread
From: Lars Wendler @ 2021-03-02  7:23 UTC (permalink / raw
  To: gentoo-commits

commit:     4e9198cf256905e3448f8b02b8d163e278af610a
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  2 07:23:32 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Mar  2 07:23:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e9198cf

app-shells/fish: Removed old

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 app-shells/fish/Manifest                           |  3 -
 .../fish-2.7.1-fix-printf-o-handling-on-ppc.patch  | 12 ---
 .../fish/files/fix-histfile-test-on-ppc.patch      | 31 --------
 app-shells/fish/fish-2.7.1.ebuild                  | 88 ----------------------
 app-shells/fish/fish-3.0.2.ebuild                  | 75 ------------------
 app-shells/fish/fish-3.1.0.ebuild                  | 71 -----------------
 6 files changed, 280 deletions(-)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 95cfa48885e..635e72d9b61 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,5 +1,2 @@
-DIST fish-2.7.1.tar.gz 5760550 BLAKE2B 71568a3a17f4222b05a314464a61fceb241409a7d42c46249486ca742ef0cf990c46d693bcc22521c18f58a558e6aab35759d0da6eb62ee6611a2a7946fe714d SHA512 45ee3453404c5d6c56d307b4cd19197de862f9f42d7fa06461acec56dea7146db5675cf6419dd5f72e939b3e4b1955d3761098df1de89a8cebe47645eb6f7a4b
-DIST fish-3.0.2.tar.gz 6477869 BLAKE2B fedc8bd5fd6d7856b695207ce9ac7a5a47f0e3c211d2aa2151a7a3c1bd944b3cf5c86ddf8b6e4c4d3499bb72d4ede64886706e05a44786d70c665b4ffb85369f SHA512 cd4a8e6a0d7770ef17e92d3d20ea23e754b9fa53e5ee5459ab5838fcbbcac69544ca2f83551e93a004b140cc14ec556860a711ce216197753c1704901518c9c3
-DIST fish-3.1.0.tar.gz 6810953 BLAKE2B 93143d9a2496b569ff6f73f4332beb3b738b7b03ede5357b0d7cc02a0c7da99852eb44a61c16d2524396ae37e76a1b439d708ae01488e79b0e03ba72504ebdec SHA512 143e462b5329790fa9834e135109e1397c3525756a0209d0ec68a53f7d2a1f581cd45fbbdcde6a5b53dff447da18ed6a62277993d851e7b18ef7f1a6b6d49cff
 DIST fish-3.1.2.tar.gz 6816214 BLAKE2B d994cb867a1a86850db2ec36d262328cd8dc21d63edb860c26d727aac08fa257392690999e099d754287d9f12a294222815e4cc84abbb2e2a87a982bb6627b6b SHA512 b6ae2c928774a2eaccf35312d3a9446bfa3e1335182c8f2b2d6198161d0916904f4964fb20ed13a5bf850c1c819e003905d13db3bc8b1faa5b401a60b47dc563
 DIST fish-3.2.0.tar.xz 3403640 BLAKE2B 740e20d428ef67b25352d56e5f2ca5732bbcb8310082dc1ca4f66c173d0380a5ab86328d6c1f8d899844d78bfd9547323a02d2c4caf5e82817ad01260bba3a7e SHA512 4525b8dd991179f77a298080d389813d1da8557bd394d174ded9238570715137e3aeec009d123811b34c07856d5f7cbe0ad35dc599d748f8f305036c3b74face

diff --git a/app-shells/fish/files/fish-2.7.1-fix-printf-o-handling-on-ppc.patch b/app-shells/fish/files/fish-2.7.1-fix-printf-o-handling-on-ppc.patch
deleted file mode 100644
index 4d3d79ae6a5..00000000000
--- a/app-shells/fish/files/fish-2.7.1-fix-printf-o-handling-on-ppc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/builtin_printf.cpp b/src/builtin_printf.cpp
-index 8595120d5..24cf9a9e1 100644
---- a/src/builtin_printf.cpp
-+++ b/src/builtin_printf.cpp
-@@ -444,6 +444,7 @@ void builtin_printf_state_t::print_direc(const wchar_t *start, size_t length, wc
-         case L'X':
-         case L'd':
-         case L'i':
-+        case L'o':
-         case L'u': {
-             fmt.append(L"ll");
-             break;

diff --git a/app-shells/fish/files/fix-histfile-test-on-ppc.patch b/app-shells/fish/files/fix-histfile-test-on-ppc.patch
deleted file mode 100644
index 8b9540ffc61..00000000000
--- a/app-shells/fish/files/fix-histfile-test-on-ppc.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 2c01e67a74ca48ca87e2f11f6239d54c35551e7b Mon Sep 17 00:00:00 2001
-From: David Adam <zanchey@ucc.gu.uwa.edu.au>
-Date: Sat, 5 Jan 2019 15:59:25 +0800
-Subject: [PATCH] histfile tests: tweak expect commands to avoid crash on
- 32-bit platforms
-
-Rather than killing the process with close, read EOF after sending the
-"exit" command and wait for OS cleanup (per the expect examples).
-
-Not cleaning up with wait caused expect to crash on all 32-bit platforms
-including i586 and armv7l with "alloc: invalid block: 0xbf993ccb: 3d 3b".
-
-64-bit platforms were not affected, for reasons that are not clear.
----
- tests/histfile.expect | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tests/histfile.expect b/tests/histfile.expect
-index 81ca11276..7ac056235 100644
---- a/tests/histfile.expect
-+++ b/tests/histfile.expect
-@@ -92,7 +92,8 @@ expect_prompt -re "\r\n$hist_line\r\n" {
- # =============
- # Start by shutting down the previous shell.
- send "exit\r"
--close $spawn_id
-+expect eof
-+wait
- 
- # Set the fish_history env var.
- set ::env(fish_history) env

diff --git a/app-shells/fish/fish-2.7.1.ebuild b/app-shells/fish/fish-2.7.1.ebuild
deleted file mode 100644
index 8d7a938cb99..00000000000
--- a/app-shells/fish/fish-2.7.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV="${PV/_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Friendly Interactive SHell"
-HOMEPAGE="http://fishshell.com/"
-SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-[[ "${PV}" = *_* ]] || \
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="nls test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/libpcre2-10.21[pcre32]
-	sys-libs/ncurses:0=
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/bc
-	nls? ( sys-devel/gettext )
-	test? ( dev-tcltk/expect )
-"
-
-PATCHES=( "${FILESDIR}/${P}-fix-printf-o-handling-on-ppc.patch"
-	"${FILESDIR}/fix-histfile-test-on-ppc.patch" )
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	# Set things up for fish to be a default shell.
-	# It has to be in /bin in case /usr is unavailable.
-	# Also, all of its utilities have to be in /bin.
-	econf \
-		--bindir="${EPREFIX}"/bin \
-		--without-included-pcre2 \
-		$(use_with nls gettext)
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	emake DESTDIR="${D}" V=1 install
-}
-
-src_test() {
-	if has_version ~${CATEGORY}/${P} ; then
-		emake -j1 V=1 SHOW_INTERACTIVE_LOG=1 test
-	else
-		ewarn "Some tests only work when the package is already installed"
-	fi
-}
-
-pkg_postinst() {
-	elog "fish is now installed on your system."
-	elog "To run fish, type 'fish' in your terminal."
-	elog
-	elog "It is advised not to set fish as a default login shell."
-	elog "see bug #545830 for more details."
-	elog "Executing fish using ~/.bashrc is an alternative"
-	elog "see https://wiki.gentoo.org/wiki/Fish#Caveats for details"
-	elog
-	elog "To set your colors, run 'fish_config'"
-	elog "To scan your man pages for completions, run 'fish_update_completions'"
-	elog "To autocomplete command suggestions press Ctrl + F or right arrow key."
-	elog
-	elog "Please add a \"BROWSER\" variable to ${PN}'s environment pointing to the"
-	elog "browser of your choice to get acces to ${PN}'s help system:"
-	elog "  BROWSER=\"/usr/bin/firefox\""
-	elog
-	elog "In order to get lzma and xz support for man-page completion please"
-	elog "emerge one of the following packages:"
-	elog "  dev-python/backports-lzma"
-	elog "  >=dev-lang/python-3.3"
-	elog
-	elog "If you have issues with cut'n'paste in X-terminals, install the"
-	elog "x11-misc/xsel package."
-	elog
-	elog "Have fun!"
-}

diff --git a/app-shells/fish/fish-3.0.2.ebuild b/app-shells/fish/fish-3.0.2.ebuild
deleted file mode 100644
index 8af6d759311..00000000000
--- a/app-shells/fish/fish-3.0.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake 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.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~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.21[pcre32]
-	sys-devel/bc
-	sys-libs/ncurses:0=[unicode]
-"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	nls? ( sys-devel/gettext )
-	test? ( dev-tcltk/expect )
-"
-
-PATCHES=( "${FILESDIR}/fix-histfile-test-on-ppc.patch" )
-
-S="${WORKDIR}/${MY_P}"
-
-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
-		-DINTERNAL_WCWIDTH=OFF
-		-DBUILD_DOCS="$(usex doc)"
-		-DWITH_GETTEXT="$(usex nls)"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
-	readme.gentoo_create_doc
-}
-
-src_test() {
-	cmake_build -j1 test
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}

diff --git a/app-shells/fish/fish-3.1.0.ebuild b/app-shells/fish/fish-3.1.0.ebuild
deleted file mode 100644
index 546da679986..00000000000
--- a/app-shells/fish/fish-3.1.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake 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.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~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-libs/ncurses:0=[unicode]
-"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	nls? ( sys-devel/gettext )
-	test? ( dev-tcltk/expect )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-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
-		-DBUILD_DOCS="$(usex doc)"
-		-DWITH_GETTEXT="$(usex nls)"
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
-	readme.gentoo_create_doc
-}
-
-src_test() {
-	cmake_build -j1 test
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/fish/files/, app-shells/fish/
@ 2025-03-28 15:10 Sam James
  0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2025-03-28 15:10 UTC (permalink / raw
  To: gentoo-commits

commit:     ba26d86a4688e913386828b90d43c76822dbeddf
Author:     idealseal <realidealseal <AT> protonmail <DOT> com>
AuthorDate: Wed Mar 26 17:56:57 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 28 15:07:54 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba26d86a

app-shells/fish: fix link failure with gcc

This happens when we rebuild the code with Fish's CMake wrapper (we need
that to install auxilary files and run test), since cargo.eclass and
Fish's build system put the target executables in different output
directories.

First we patch CMake so that it doesn't even try to execute cargo for
it's targets and just retain the target to copy the executables over into
the CMake build directory.

Also we need to set the cargo output directory in the CMake scripts to
point to the target directory of cargo.eclass so it reuses the already
build binaries.

And since Fish sometimes uses a custom cargo build profile which alters
the target directory in a way not handled by cargo.eclass we remove that
as well.

Signed-off-by: idealseal <realidealseal <AT> protonmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../fish-4.0.1-use-cargo-eclass-for-build.patch    | 46 ++++++++++++++++++++++
 app-shells/fish/fish-4.0.1.ebuild                  | 12 ++----
 2 files changed, 50 insertions(+), 8 deletions(-)

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}
+-            $<$<CONFIG:Release>:--release>
+-            $<$<CONFIG:RelWithDebInfo>:--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 $<IF:$<CONFIG:Debug>,debug,$<IF:$<CONFIG:RelWithDebInfo>,release-with-debug,release>>)
+-set(rust_debugflags "$<$<CONFIG:Debug>:-g>$<$<CONFIG:RelWithDebInfo>:-g>")
++set(rust_profile $<IF:$<CONFIG:Debug>,debug,release>)
++set(rust_debugflags "$<$<CONFIG:Debug>:-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/fish-4.0.1.ebuild b/app-shells/fish/fish-4.0.1.ebuild
index 38ea9817d238..8e85d81223a9 100644
--- a/app-shells/fish/fish-4.0.1.ebuild
+++ b/app-shells/fish/fish-4.0.1.ebuild
@@ -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() {
@@ -86,14 +90,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() {


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/fish/files/, app-shells/fish/
@ 2025-03-28 15:10 Sam James
  0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2025-03-28 15:10 UTC (permalink / raw
  To: gentoo-commits

commit:     3732e5b0cbdb990e57172a660c5c297f9ae2dad9
Author:     idealseal <realidealseal <AT> protonmail <DOT> com>
AuthorDate: Wed Mar 26 18:23:13 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 28 15:07:55 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3732e5b0

app-shells/fish: sync live ebuild, fix link failure with gcc

This happens when we rebuild the code with Fish's CMake wrapper (we need
that to install auxilary files and run test), since cargo.eclass and
Fish's build system put the target executables in different output
directories.

First we patch CMake so that it doesn't even try to execute cargo for
it's targets and just retain the target to copy the executables over into
the CMake build directory.

Also we need to set the cargo output directory in the CMake scripts to
point to the target directory of cargo.eclass so it reuses the already
build binaries.

And since Fish sometimes uses a custom cargo build profile which alters
the target directory in a way not handled by cargo.eclass we remove that
as well.

Signed-off-by: idealseal <realidealseal <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/41068
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../fish-9999-use-cargo-eclass-for-build.patch     | 46 ++++++++++++++++++++++
 app-shells/fish/fish-9999.ebuild                   | 13 ++----
 2 files changed, 50 insertions(+), 9 deletions(-)

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}
+-            $<$<CONFIG:Release>:--release>
+-            $<$<CONFIG:RelWithDebInfo>:--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 $<IF:$<CONFIG:Debug>,debug,$<IF:$<CONFIG:RelWithDebInfo>,release-with-debug,release>>)
+-set(rust_debugflags "$<$<CONFIG:Debug>:-g>$<$<CONFIG:RelWithDebInfo>:-g>")
++set(rust_profile $<IF:$<CONFIG:Debug>,debug,release>)
++set(rust_debugflags "$<$<CONFIG:Debug>:-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-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
 }
 


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/fish/files/, app-shells/fish/
@ 2021-12-21 11:55 Georgy Yakovlev
  0 siblings, 0 replies; 10+ messages in thread
From: Georgy Yakovlev @ 2021-12-21 11:55 UTC (permalink / raw
  To: gentoo-commits

commit:     dffcabb1fe3e9bd7145211397da23e182c97d2b4
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 21 11:53:40 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Dec 21 11:54:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dffcabb1

app-shells/fish: enable py3.10, fix failing tests

we remove terminal.py pexpect test because it's
very fragile and depends on test environment

Closes: https://bugs.gentoo.org/821559
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 app-shells/fish/files/3.3.1-drop-some-tests.patch | 26 +++++++++++++++++++++++
 app-shells/fish/fish-3.3.1-r1.ebuild              | 10 ++++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/app-shells/fish/files/3.3.1-drop-some-tests.patch b/app-shells/fish/files/3.3.1-drop-some-tests.patch
new file mode 100644
index 000000000000..4c4081d77cfa
--- /dev/null
+++ b/app-shells/fish/files/3.3.1-drop-some-tests.patch
@@ -0,0 +1,26 @@
+From ec8844d834cc9fe626e9fc326c6f5410341d532a Mon Sep 17 00:00:00 2001
+From: Fabian Homborg <FHomborg@gmail.com>
+Date: Thu, 14 Oct 2021 18:18:51 +0200
+Subject: [PATCH] Drop tests with resetting match start inside lookaround
+
+This seems to be of little use
+
+Fixes #8353
+---
+ src/fish_tests.cpp | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
+index 3d71877de81..04058b47ba7 100644
+--- a/src/fish_tests.cpp
++++ b/src/fish_tests.cpp
+@@ -5723,9 +5723,6 @@ static void test_string() {
+         {{L"string", L"match", L"-r", L"-a", L"a*", L"b", 0}, STATUS_CMD_OK, L"\n\n"},
+         {{L"string", L"match", L"-r", L"foo\\Kbar", L"foobar", 0}, STATUS_CMD_OK, L"bar\n"},
+         {{L"string", L"match", L"-r", L"(foo)\\Kbar", L"foobar", 0}, STATUS_CMD_OK, L"bar\nfoo\n"},
+-        {{L"string", L"match", L"-r", L"(?=ab\\K)", L"ab", 0}, STATUS_CMD_OK, L"\n"},
+-        {{L"string", L"match", L"-r", L"(?=ab\\K)..(?=cd\\K)", L"abcd", 0}, STATUS_CMD_OK, L"\n"},
+-
+         {{L"string", L"replace", 0}, STATUS_INVALID_ARGS, L""},
+         {{L"string", L"replace", L"", 0}, STATUS_INVALID_ARGS, L""},
+         {{L"string", L"replace", L"", L"", 0}, STATUS_CMD_ERROR, L""},

diff --git a/app-shells/fish/fish-3.3.1-r1.ebuild b/app-shells/fish/fish-3.3.1-r1.ebuild
index e24e0866494f..0b5e029e2e55 100644
--- a/app-shells/fish/fish-3.3.1-r1.ebuild
+++ b/app-shells/fish/fish-3.3.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit cmake python-any-r1 readme.gentoo-r1
 
@@ -30,6 +30,7 @@ RESTRICT="!test? ( test )"
 PATCHES=(
 	"${FILESDIR}/3.3.1-don-t-override-linker.patch"
 	"${FILESDIR}/3.3.1-sbin-path-sh-test.patch"
+	"${FILESDIR}/3.3.1-drop-some-tests.patch"
 )
 
 RDEPEND="
@@ -86,6 +87,13 @@ src_install() {
 }
 
 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
+	rm -v tests/pexpects/terminal.py || die 
+
 	cmake_build test
 }
 


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/fish/files/, app-shells/fish/
@ 2021-07-06 17:10 Georgy Yakovlev
  0 siblings, 0 replies; 10+ messages in thread
From: Georgy Yakovlev @ 2021-07-06 17:10 UTC (permalink / raw
  To: gentoo-commits

commit:     2b57511643716436599d1ec2b839035d3cb6d696
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 30 03:18:08 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Jul  6 17:09:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b575116

app-shells/fish: add 3.3.1

terminal size test fails, depending on
size of terminal fish is tested in.

Bug: https://bugs.gentoo.org/790596
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 app-shells/fish/Manifest                           |  1 +
 .../fish/files/3.3.1-don-t-override-linker.patch   | 48 +++++++++++
 .../fish/files/3.3.1-sbin-path-sh-test.patch       | 25 ++++++
 app-shells/fish/fish-3.3.1.ebuild                  | 94 ++++++++++++++++++++++
 4 files changed, 168 insertions(+)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 0ad814f70c2..fc67224f5d1 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,3 +1,4 @@
 DIST fish-3.1.2.tar.gz 6816214 BLAKE2B d994cb867a1a86850db2ec36d262328cd8dc21d63edb860c26d727aac08fa257392690999e099d754287d9f12a294222815e4cc84abbb2e2a87a982bb6627b6b SHA512 b6ae2c928774a2eaccf35312d3a9446bfa3e1335182c8f2b2d6198161d0916904f4964fb20ed13a5bf850c1c819e003905d13db3bc8b1faa5b401a60b47dc563
 DIST fish-3.2.1.tar.xz 3409808 BLAKE2B ad136c60cc98ae9fdb2e2abecb722107543184cb162a3c6b058e8ebe40a383a09c0e9b0eca762ab95725227dd6630605ad875bd4da59d38e605bc1f82fa1d517 SHA512 bf565bac93e7d163af5253b4053f9c9e760508b929624440fd8a160504a127c34013882576293c72a47ce7f285f87e0b594d61d7cebcefcc3be4e92c572926bc
 DIST fish-3.2.2.tar.xz 3411748 BLAKE2B f8b20b6c56c54f84f347b930b71528dbd61a4f53adfd8addec05314c9d15992257cea89ce854adef2eecf3adfb07e6fa576b9d45c2e362ff360b24cf1edf3afc SHA512 e82c5a390bd94f84c60843a94dc4f30bd46539828a54d2e96f208e0d54a0aa361a8c9d4a66cdf2fa636a5fab310a96bf1c165c58440c38d123f788fff3598f4a
+DIST fish-3.3.1.tar.xz 3489152 BLAKE2B 61b2bf96526d957d3f9706df5a76d4d9b4ccf55a1ff2b7b66f1a0d5d126a220df9984551f5adb06dcedbfb5674b93c4f3d75ef991585980a29d4dd84f7697559 SHA512 fc50ca44fab3f2d942284d4f714150f7ccf1e49c73da36f8d4ae4a33a9b3280f98bed15848839f5d443b4274fd0ff90174bafa6a8e9a4da226dda63d7766a660

diff --git a/app-shells/fish/files/3.3.1-don-t-override-linker.patch b/app-shells/fish/files/3.3.1-don-t-override-linker.patch
new file mode 100644
index 00000000000..cb67498fd2b
--- /dev/null
+++ b/app-shells/fish/files/3.3.1-don-t-override-linker.patch
@@ -0,0 +1,48 @@
+From c9ab706be64439d1a03f978d3a47450135c87002 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <ya@sysdump.net>
+Date: Tue, 29 Jun 2021 09:40:44 -0700
+Subject: [PATCH] don't override linker
+
+---
+ CMakeLists.txt | 18 +-----------------
+ 1 file changed, 1 insertion(+), 17 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fda837cd3..507dc8817 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -56,22 +56,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra \
+ # Disable exception handling.
+ add_compile_options(-fno-exceptions)
+ 
+-# Prefer lld or the gold linker because they don't emit useless warnings about sys_nerr and
+-# _sys_errlist. They're also faster (significantly so in the case of lld).
+-if (UNIX)
+-    execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=lld -Wl,--version
+-        ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
+-    if ("${LD_VERSION}" MATCHES "LLD ")
+-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld")
+-    elseif (NOT APPLE)
+-        execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version
+-            ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
+-        if ("${LD_VERSION}" MATCHES "GNU gold")
+-            set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold")
+-        endif()
+-    endif()
+-endif()
+-
+ # Hide the CMake Rules directories in Xcode projects.
+ source_group("CMake Rules" REGULAR_EXPRESSION "^$")
+ 
+@@ -128,7 +112,7 @@ set(FISH_SRCS
+     src/proc.cpp src/reader.cpp src/redirection.cpp src/sanity.cpp src/screen.cpp
+     src/signal.cpp src/termsize.cpp src/timer.cpp src/tinyexpr.cpp
+     src/tokenizer.cpp src/topic_monitor.cpp src/trace.cpp src/utf8.cpp src/util.cpp
+-    src/wait_handle.cpp src/wcstringutil.cpp src/wgetopt.cpp src/wildcard.cpp 
++    src/wait_handle.cpp src/wcstringutil.cpp src/wgetopt.cpp src/wildcard.cpp
+     src/wutil.cpp src/fds.cpp
+ )
+ 
+-- 
+2.32.0
+

diff --git a/app-shells/fish/files/3.3.1-sbin-path-sh-test.patch b/app-shells/fish/files/3.3.1-sbin-path-sh-test.patch
new file mode 100644
index 00000000000..ce66e98eb12
--- /dev/null
+++ b/app-shells/fish/files/3.3.1-sbin-path-sh-test.patch
@@ -0,0 +1,25 @@
+From 1f73c8d923e41442cefd5a58498798971282c701 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <ya@sysdump.net>
+Date: Tue, 29 Jun 2021 09:55:14 -0700
+Subject: [PATCH] sbin path sh test
+
+---
+ tests/checks/type.fish | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/checks/type.fish b/tests/checks/type.fish
+index 85a2d142a..6ce3a4f68 100644
+--- a/tests/checks/type.fish
++++ b/tests/checks/type.fish
+@@ -31,7 +31,7 @@ echo $status
+ # Test that we print a command path
+ type sh
+ # (we resolve the path, so if /bin is a symlink to /usr/bin this shows /usr/bin/sh)
+-# CHECK: sh is {{.*}}/bin/sh
++# CHECK: sh is {{.*}}/{{s*}}bin/sh
+ 
+ # Test that we print a function definition.
+ # The exact definition and description here depends on the system, so we'll ignore the actual code.
+-- 
+2.32.0
+

diff --git a/app-shells/fish/fish-3.3.1.ebuild b/app-shells/fish/fish-3.3.1.ebuild
new file mode 100644
index 00000000000..fc205e24afc
--- /dev/null
+++ b/app-shells/fish/fish-3.3.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+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 ~ppc ~ppc64 ~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 )"
+
+PATCHES=(
+	"${FILESDIR}/3.3.1-don-t-override-linker.patch"
+	"${FILESDIR}/3.3.1-sbin-path-sh-test.patch"
+)
+
+RDEPEND="
+	>=dev-libs/libpcre2-10.32[pcre32]
+	sys-apps/coreutils
+	sys-libs/ncurses:0=[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}"
+
+python_check_deps() {
+	use test || return 0
+	has_version -d "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
+	[[ ${PV} == 9999 ]] && mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
+	readme.gentoo_create_doc
+}
+
+src_test() {
+	cmake_build test
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/fish/files/, app-shells/fish/
@ 2019-01-10  9:06 Georgy Yakovlev
  0 siblings, 0 replies; 10+ messages in thread
From: Georgy Yakovlev @ 2019-01-10  9:06 UTC (permalink / raw
  To: gentoo-commits

commit:     3df1fcdb8134cbf3c03ed18301323eef84113221
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 10 09:00:12 2019 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Thu Jan 10 09:00:45 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3df1fcdb

app-shells/fish: fix single test failing on 32bit arches

Closes: https://bugs.gentoo.org/656246
Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 .../fish/files/fix-histfile-test-on-ppc.patch      | 31 ++++++++++++++++++++++
 app-shells/fish/fish-2.7.1.ebuild                  |  5 ++--
 app-shells/fish/fish-3.0.0-r1.ebuild               |  4 ++-
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/app-shells/fish/files/fix-histfile-test-on-ppc.patch b/app-shells/fish/files/fix-histfile-test-on-ppc.patch
new file mode 100644
index 00000000000..8b9540ffc61
--- /dev/null
+++ b/app-shells/fish/files/fix-histfile-test-on-ppc.patch
@@ -0,0 +1,31 @@
+From 2c01e67a74ca48ca87e2f11f6239d54c35551e7b Mon Sep 17 00:00:00 2001
+From: David Adam <zanchey@ucc.gu.uwa.edu.au>
+Date: Sat, 5 Jan 2019 15:59:25 +0800
+Subject: [PATCH] histfile tests: tweak expect commands to avoid crash on
+ 32-bit platforms
+
+Rather than killing the process with close, read EOF after sending the
+"exit" command and wait for OS cleanup (per the expect examples).
+
+Not cleaning up with wait caused expect to crash on all 32-bit platforms
+including i586 and armv7l with "alloc: invalid block: 0xbf993ccb: 3d 3b".
+
+64-bit platforms were not affected, for reasons that are not clear.
+---
+ tests/histfile.expect | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tests/histfile.expect b/tests/histfile.expect
+index 81ca11276..7ac056235 100644
+--- a/tests/histfile.expect
++++ b/tests/histfile.expect
+@@ -92,7 +92,8 @@ expect_prompt -re "\r\n$hist_line\r\n" {
+ # =============
+ # Start by shutting down the previous shell.
+ send "exit\r"
+-close $spawn_id
++expect eof
++wait
+ 
+ # Set the fish_history env var.
+ set ::env(fish_history) env

diff --git a/app-shells/fish/fish-2.7.1.ebuild b/app-shells/fish/fish-2.7.1.ebuild
index b58c91c63b0..2bc49389213 100644
--- a/app-shells/fish/fish-2.7.1.ebuild
+++ b/app-shells/fish/fish-2.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,8 @@ DEPEND="
 	test? ( dev-tcltk/expect )
 "
 
-PATCHES=( "${FILESDIR}/${P}-fix-printf-o-handling-on-ppc.patch" )
+PATCHES=( "${FILESDIR}/${P}-fix-printf-o-handling-on-ppc.patch"
+	"${FILESDIR}/fix-histfile-test-on-ppc.patch" )
 
 S="${WORKDIR}/${MY_P}"
 

diff --git a/app-shells/fish/fish-3.0.0-r1.ebuild b/app-shells/fish/fish-3.0.0-r1.ebuild
index e9917b07a6c..8cc9571025c 100644
--- a/app-shells/fish/fish-3.0.0-r1.ebuild
+++ b/app-shells/fish/fish-3.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,6 +36,8 @@ DEPEND="${RDEPEND}
 	test? ( dev-tcltk/expect )
 "
 
+PATCHES=( "${FILESDIR}/fix-histfile-test-on-ppc.patch" )
+
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/fish/files/, app-shells/fish/
@ 2018-12-13  5:04 Georgy Yakovlev
  0 siblings, 0 replies; 10+ messages in thread
From: Georgy Yakovlev @ 2018-12-13  5:04 UTC (permalink / raw
  To: gentoo-commits

commit:     94f30802351d007b1b0a0e7a7bd357ea0467b473
Author:     Georgy Yakovlev <ya <AT> sysdump <DOT> net>
AuthorDate: Sat Apr  7 18:36:20 2018 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Thu Dec 13 05:04:32 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94f30802

app-shells/fish: add 3.0_beta1 and live cmake-based ebuilds

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 app-shells/fish/Manifest              |  1 +
 app-shells/fish/files/README.gentoo   | 19 +++++++++
 app-shells/fish/fish-3.0_beta1.ebuild | 72 +++++++++++++++++++++++++++++++++++
 app-shells/fish/fish-9999.ebuild      | 72 +++++++++++++++++++++++++++++++++++
 4 files changed, 164 insertions(+)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 477ae5e35a1..85645e50d3b 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,2 +1,3 @@
 DIST fish-2.6.0.tar.gz 3575346 BLAKE2B 8697dc6e50836d93d0ed22663e86016fec8e567cd4e129ea92008f52da6dd629bf11b70719beabe5c08bd3d7ba43d8017441f103d49a82c0faec3bc749e83764 SHA512 d4ded5ce24600e85673a7bb016e9dc36bce999b27f40e6b1ce0b9ca49a421be2d444d9d2b6f178f6eee963e59daa4a65df4c3de2a8086a610486f758fcfb0ed1
 DIST fish-2.7.1.tar.gz 5760550 BLAKE2B 71568a3a17f4222b05a314464a61fceb241409a7d42c46249486ca742ef0cf990c46d693bcc22521c18f58a558e6aab35759d0da6eb62ee6611a2a7946fe714d SHA512 45ee3453404c5d6c56d307b4cd19197de862f9f42d7fa06461acec56dea7146db5675cf6419dd5f72e939b3e4b1955d3761098df1de89a8cebe47645eb6f7a4b
+DIST fish-3.0b1.tar.gz 6471932 BLAKE2B d65ed7e7f4de1f967f5f2090b01be86b778a46f8e5c112daf99234bc584e01992c466976d6547814f84730d1092e39bc3f2bfa55592e71bf1a93a42fb8846b34 SHA512 f13c4ca9e62ecdd6afc4961cb4f6ec5d4b7f51b9c3b3ba97f280b7a9ed2cdeb9be193ff58b9f556b01af0815b78ab540f25c473a253651c96db03f8cb1652dde

diff --git a/app-shells/fish/files/README.gentoo b/app-shells/fish/files/README.gentoo
new file mode 100644
index 00000000000..421d070ac57
--- /dev/null
+++ b/app-shells/fish/files/README.gentoo
@@ -0,0 +1,19 @@
+fish is now installed on your system.
+To run fish, type 'fish' in your terminal.
+
+It is advised not to set fish as a default login shell.
+see https://bugs.gentoo.org/545830 for more details.
+Executing fish using ~/.bashrc is an alternative
+see https://wiki.gentoo.org/wiki/Fish#Caveats for details
+
+To set your colors, run 'fish_config'
+To scan your man pages for completions, run 'fish_update_completions'
+To autocomplete command suggestions press Ctrl + F or right arrow key.
+
+Please add a "BROWSER" variable to fish environment pointing to the
+browser of your choice to get acces to fish help system:
+  BROWSER="/usr/bin/firefox"
+
+If you have issues with cut'n'paste in X-terminals, install the x11-misc/xsel package.
+
+Have fun!

diff --git a/app-shells/fish/fish-3.0_beta1.ebuild b/app-shells/fish/fish-3.0_beta1.ebuild
new file mode 100644
index 00000000000..cc6e0bba617
--- /dev/null
+++ b/app-shells/fish/fish-3.0_beta1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils 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.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="doc nls test"
+
+RDEPEND="
+	>=dev-libs/libpcre2-10.21[pcre32]
+	sys-devel/bc
+	sys-libs/ncurses:0=
+"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )
+	test? ( dev-tcltk/expect )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+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-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DINTERNAL_WCWIDTH=OFF
+		-DBUILD_DOCS="$(usex doc)"
+		-DWITH_GETTEXT="$(usex nls)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
+	readme.gentoo_create_doc
+}
+
+src_test() {
+	cmake-utils_src_make -j1 test
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}

diff --git a/app-shells/fish/fish-9999.ebuild b/app-shells/fish/fish-9999.ebuild
new file mode 100644
index 00000000000..cc6e0bba617
--- /dev/null
+++ b/app-shells/fish/fish-9999.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils 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.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="doc nls test"
+
+RDEPEND="
+	>=dev-libs/libpcre2-10.21[pcre32]
+	sys-devel/bc
+	sys-libs/ncurses:0=
+"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	nls? ( sys-devel/gettext )
+	test? ( dev-tcltk/expect )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+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-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DINTERNAL_WCWIDTH=OFF
+		-DBUILD_DOCS="$(usex doc)"
+		-DWITH_GETTEXT="$(usex nls)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
+	readme.gentoo_create_doc
+}
+
+src_test() {
+	cmake-utils_src_make -j1 test
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/fish/files/, app-shells/fish/
@ 2017-03-03 13:12 Lars Wendler
  0 siblings, 0 replies; 10+ messages in thread
From: Lars Wendler @ 2017-03-03 13:12 UTC (permalink / raw
  To: gentoo-commits

commit:     e2fd0ed7efae55eadfe15572cb6ff0883ae42fcf
Author:     Georgy Yakovlev <ya <AT> sysdump <DOT> net>
AuthorDate: Fri Feb 24 06:27:53 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Mar  3 13:12:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2fd0ed7

app-shells/fish: remove profile.env parser

This removes profile.env parser and
modifies postinst message advising
to use bash to launch fish.
Fixes bug 545830
Closes: https://github.com/gentoo/gentoo/pull/4072

 app-shells/fish/files/profile-env.fish | 23 -----------------------
 app-shells/fish/fish-2.5.0.ebuild      | 15 ++++-----------
 2 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/app-shells/fish/files/profile-env.fish b/app-shells/fish/files/profile-env.fish
deleted file mode 100644
index d4852f04171..00000000000
--- a/app-shells/fish/files/profile-env.fish
+++ /dev/null
@@ -1,23 +0,0 @@
-# only apply env for login shells, as we'd like fish to
-# inherit existing shell environment without overriding it
-# using csh env, as it's cleaner and less too parse/strip
-
-if status --is-login
-	# since fish supports export via upstream provided function
-	# we can source directly, only ommiting $PATH and comments.
-	string match -r -v '^(#|setenv (PATH|ROOTPATH) )' < /etc/csh.env | source
-
-	# strip unneded stuff from setenv lines
-	# apply paths and cleanup
-	if [ "$EUID" = "0" ] ; or [ "$USER" = "root" ]
-		string match -r '^setenv ROOTPATH .+' < /etc/csh.env | string replace -ra '\'|\:' ' ' | source
-		set -gx PATH /usr/local/sbin /usr/local/bin /usr/sbin /usr/bin /sbin /bin $ROOTPATH
-		set -e ROOTPATH
-	else
-		string match -r '^setenv PATH .+' < /etc/csh.env | string replace -ra '\'|\:' ' ' | source
-		set -gx PATH /usr/local/bin /usr/bin /bin $PATH
-	end
-
-	# re-prepend $fish_user_paths
-	__fish_reconstruct_path
-end

diff --git a/app-shells/fish/fish-2.5.0.ebuild b/app-shells/fish/fish-2.5.0.ebuild
index 78465a9f78a..5132a555abc 100644
--- a/app-shells/fish/fish-2.5.0.ebuild
+++ b/app-shells/fish/fish-2.5.0.ebuild
@@ -32,13 +32,6 @@ src_configure() {
 		--without-included-pcre2
 }
 
-src_install() {
-	default
-
-	insinto /usr/share/fish/vendor_conf.d
-	newins "${FILESDIR}/profile-env.fish" 00-profile-env.fish
-}
-
 src_test() {
 	if has_version ~${CATEGORY}/${P} ; then
 		emake test
@@ -51,10 +44,10 @@ pkg_postinst() {
 	elog "fish is now installed on your system."
 	elog "To run fish, type 'fish' in your terminal."
 	elog
-	elog "To use fish as your login shell:"
-	elog "* add the line '${EPREFIX}/bin/${PN}'"
-	elog "* to the file '${EPREFIX}/etc/shells'."
-	elog "* use the command 'chsh -s ${EPREFIX}/bin/${PN}'."
+	elog "It is advised not to set fish as a default login shell."
+	elog "see bug #545830 for more details."
+	elog "Executing fish using ~/.bashrc is an alternative"
+	elog "see https://wiki.gentoo.org/wiki/Fish#Caveats for details"
 	elog
 	elog "To set your colors, run 'fish_config'"
 	elog "To scan your man pages for completions, run 'fish_update_completions'"


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/fish/files/, app-shells/fish/
@ 2017-02-06  0:52 Lars Wendler
  0 siblings, 0 replies; 10+ messages in thread
From: Lars Wendler @ 2017-02-06  0:52 UTC (permalink / raw
  To: gentoo-commits

commit:     d2e4f983d7ac7732c631dcada21fe44b7c0dc25d
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  6 00:50:51 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Feb  6 00:50:51 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2e4f983

Revert "app-shells/fish: Removed old."

This reverts commit 6529c95301c9f8d936869dd0496c88cffbab2aa1.

Wrong commit message. Did bump and remove in one commit.

 app-shells/fish/Manifest                           |  1 -
 app-shells/fish/files/profile-env.fish             | 34 +++++++++-------------
 .../{fish-2.5.0.ebuild => fish-2.4.0-r1.ebuild}    |  0
 3 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index 858f28c..bc12de2 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,2 +1 @@
 DIST fish-2.4.0.tar.gz 3455874 SHA256 06bbb2323360439c4044da762d114ec1aa1aba265cec71c0543e6a0095c9efc5 SHA512 b27a2291c284fda7a12b3cd5dcba8dfcbf2738f50de40d9aac1500afa3bd98be04b4f67d7e6d3bb2f808c11a8c2dd6b1b5cc2dfe3e8e0e7d1bc88f8d8994d57b WHIRLPOOL abb9c31237a33553b25920fe3284f4ca90941aed2b8f1ec4b69fdb4231f7b2585f0292bc647ffe3acf88f6b01ac61931f615fa9a56ede35a8182e3a69aa11861
-DIST fish-2.5.0.tar.gz 3496831 SHA256 f8c0edadca2de379ccf305aeace660a9255fa2180c72e85e97705a24c256b2a5 SHA512 6d94bb70a5f1cefaada4d10ac845992f87c9bfc8c253f38bdfcc3a573a35503d825c9487d2ce8ef3819713594ab7b54ebf6c89fe3362c7010c63dbefc99b424d WHIRLPOOL a16d5f75e95573f2b766527fb124d99083a7ab84522a4826cd5b3aaf3a73ae6728f30defbd0598698b496f279f686eddcb4e81779767e89888037abe0b908849

diff --git a/app-shells/fish/files/profile-env.fish b/app-shells/fish/files/profile-env.fish
index af3b133..21a918a 100644
--- a/app-shells/fish/files/profile-env.fish
+++ b/app-shells/fish/files/profile-env.fish
@@ -1,23 +1,15 @@
-# only apply env for login shells, as we'd like fish to
-# inherit existing shell environment without overriding it
-# using csh env, as it's cleaner and less too parse/strip
+# since fish supports export via upstream provided function
+# we can source directly, only ommiting $PATH and comments.
+grep -Ev "^(#|export (PATH|ROOTPATH)=)" /etc/profile.env | source
 
-if status --is-login
-	# since fish supports export via upstream provided function
-	# we can source directly, only ommiting $PATH and comments.
-	string match -r -v '^(#|setenv (PATH|ROOTPATH) )' < /etc/csh.env | source
-
-	# strip unneded stuff from setenv lines
-	# apply paths and cleanup
-	if [ "$EUID" = "0" ] ; or [ "$USER" = "root" ]
-		string match -r '^setenv ROOTPATH .+' < /etc/csh.env | string replace -ra '\'|\:' ' ' | source 
-		set -gx PATH /usr/local/sbin /usr/local/bin /usr/sbin /usr/bin /sbin /bin $ROOTPATH
-		set -e ROOTPATH
-	else
-		string match -r '^setenv PATH .+' < /etc/csh.env | string replace -ra '\'|\:' ' ' | source
-		set -gx PATH /usr/local/bin /usr/bin /bin $PATH
-	end
-
-	# re-prepend $fish_user_paths
-	__fish_reconstruct_path
+# strip unneded stuff from bash export lines
+# apply paths and cleanup
+if [ "$EUID" = "0" ] ; or [ "$USER" = "root" ]
+	set _rootpath (grep -o " ROOTPATH='.*'" /etc/profile.env | sed "s@.*'\(.*\)'@\1@;s@:@\n@g")
+	set -xg PATH /usr/local/sbin /usr/local/bin /usr/sbin /usr/bin /sbin /bin $_rootpath
+	set -e _rootpath
+else
+	set _userpath (grep -o " PATH='.*'" /etc/profile.env | sed "s@.*'\(.*\)'@\1@;s@:@\n@g")
+	set -xg PATH /usr/local/bin /usr/bin /bin $_userpath
+	set -e _userpath
 end

diff --git a/app-shells/fish/fish-2.5.0.ebuild b/app-shells/fish/fish-2.4.0-r1.ebuild
similarity index 100%
rename from app-shells/fish/fish-2.5.0.ebuild
rename to app-shells/fish/fish-2.4.0-r1.ebuild


^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/fish/files/, app-shells/fish/
@ 2017-01-13  5:02 Lars Wendler
  0 siblings, 0 replies; 10+ messages in thread
From: Lars Wendler @ 2017-01-13  5:02 UTC (permalink / raw
  To: gentoo-commits

commit:     867eb172854e2965a1992c802d10fd3993769170
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 05:02:25 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 05:02:47 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=867eb172

app-shells/fish: Attempt to load system-wide variables (bug #545830).

Use system pcre2 lib instead of bundled one.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-shells/fish/files/profile-env.fish | 15 +++++++
 app-shells/fish/fish-2.4.0-r1.ebuild   | 76 ++++++++++++++++++++++++++++++++++
 2 files changed, 91 insertions(+)

diff --git a/app-shells/fish/files/profile-env.fish b/app-shells/fish/files/profile-env.fish
new file mode 100644
index 00000000..21a918a
--- /dev/null
+++ b/app-shells/fish/files/profile-env.fish
@@ -0,0 +1,15 @@
+# since fish supports export via upstream provided function
+# we can source directly, only ommiting $PATH and comments.
+grep -Ev "^(#|export (PATH|ROOTPATH)=)" /etc/profile.env | source
+
+# strip unneded stuff from bash export lines
+# apply paths and cleanup
+if [ "$EUID" = "0" ] ; or [ "$USER" = "root" ]
+	set _rootpath (grep -o " ROOTPATH='.*'" /etc/profile.env | sed "s@.*'\(.*\)'@\1@;s@:@\n@g")
+	set -xg PATH /usr/local/sbin /usr/local/bin /usr/sbin /usr/bin /sbin /bin $_rootpath
+	set -e _rootpath
+else
+	set _userpath (grep -o " PATH='.*'" /etc/profile.env | sed "s@.*'\(.*\)'@\1@;s@:@\n@g")
+	set -xg PATH /usr/local/bin /usr/bin /bin $_userpath
+	set -e _userpath
+end

diff --git a/app-shells/fish/fish-2.4.0-r1.ebuild b/app-shells/fish/fish-2.4.0-r1.ebuild
new file mode 100644
index 00000000..ef2dbfe
--- /dev/null
+++ b/app-shells/fish/fish-2.4.0-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+DESCRIPTION="fish is the Friendly Interactive SHell"
+HOMEPAGE="http://fishshell.com/"
+SRC_URI="http://fishshell.com/files/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="X"
+
+RDEPEND="
+	>=dev-libs/libpcre2-10.21[pcre32]
+	sys-libs/ncurses:0=
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/bc
+	sys-devel/gettext
+"
+
+src_configure() {
+	# Set things up for fish to be a default shell.
+	# It has to be in /bin in case /usr is unavailable.
+	# Also, all of its utilities have to be in /bin.
+	econf \
+		docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		--bindir="${EPREFIX}"/bin \
+		--without-included-pcre2
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/fish/vendor_conf.d
+	newins "${FILESDIR}/profile-env.fish" 00-profile-env.fish
+}
+
+src_test() {
+	if has_version ~${CATEGORY}/${P} ; then
+		emake test
+	else
+		ewarn "The test suite only works when the package is already installed"
+	fi
+}
+
+pkg_postinst() {
+	elog "fish is now installed on your system."
+	elog "To run fish, type 'fish' in your terminal."
+	elog
+	elog "To use fish as your login shell:"
+	elog "* add the line '${EPREFIX}/bin/${PN}'"
+	elog "* to the file '${EPREFIX}/etc/shells'."
+	elog "* use the command 'chsh -s ${EPREFIX}/bin/${PN}'."
+	elog
+	elog "To set your colors, run 'fish_config'"
+	elog "To scan your man pages for completions, run 'fish_update_completions'"
+	elog "To autocomplete command suggestions press Ctrl + F or right arrow key."
+	elog
+	elog "Please add a \"BROWSER\" variable to ${PN}'s environment pointing to the"
+	elog "browser of your choice to get acces to ${PN}'s help system:"
+	elog "  BROWSER=\"/usr/bin/firefox\""
+	elog
+	elog "In order to get lzma and xz support for man-page completion please"
+	elog "emerge one of the following packages:"
+	elog "  dev-python/backports-lzma"
+	elog "  >=dev-lang/python-3.3"
+	elog
+	elog "Have fun!"
+}


^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2025-03-28 15:10 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-02  7:23 [gentoo-commits] repo/gentoo:master commit in: app-shells/fish/files/, app-shells/fish/ Lars Wendler
  -- strict thread matches above, loose matches on Subject: below --
2025-03-28 15:10 Sam James
2025-03-28 15:10 Sam James
2021-12-21 11:55 Georgy Yakovlev
2021-07-06 17:10 Georgy Yakovlev
2019-01-10  9:06 Georgy Yakovlev
2018-12-13  5:04 Georgy Yakovlev
2017-03-03 13:12 Lars Wendler
2017-02-06  0:52 Lars Wendler
2017-01-13  5:02 Lars Wendler

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox