From 6529c95301c9f8d936869dd0496c88cffbab2aa1 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Mon, 6 Feb 2017 01:48:53 +0100 Subject: app-shells/fish: Removed old. Package-Manager: Portage-2.3.3, Repoman-2.3.1 --- app-shells/fish/Manifest | 1 + app-shells/fish/files/profile-env.fish | 34 +++++++++------ app-shells/fish/fish-2.4.0-r1.ebuild | 77 ---------------------------------- app-shells/fish/fish-2.5.0.ebuild | 77 ++++++++++++++++++++++++++++++++++ 4 files changed, 99 insertions(+), 90 deletions(-) delete mode 100644 app-shells/fish/fish-2.4.0-r1.ebuild create mode 100644 app-shells/fish/fish-2.5.0.ebuild (limited to 'app-shells') diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest index bc12de2ee976..858f28c23684 100644 --- a/app-shells/fish/Manifest +++ b/app-shells/fish/Manifest @@ -1 +1,2 @@ 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 21a918adba8f..af3b133aa921 100644 --- a/app-shells/fish/files/profile-env.fish +++ b/app-shells/fish/files/profile-env.fish @@ -1,15 +1,23 @@ -# 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 +# 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 -# 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 +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.4.0-r1.ebuild b/app-shells/fish/fish-2.4.0-r1.ebuild deleted file mode 100644 index 0d2402bcd745..000000000000 --- a/app-shells/fish/fish-2.4.0-r1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -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="" - -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 "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-2.5.0.ebuild b/app-shells/fish/fish-2.5.0.ebuild new file mode 100644 index 000000000000..0d2402bcd745 --- /dev/null +++ b/app-shells/fish/fish-2.5.0.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +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="" + +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 "If you have issues with cut'n'paste in X-terminals, install the" + elog "x11-misc/xsel package." + elog + elog "Have fun!" +} -- cgit v1.2.3-65-gdbad