summaryrefslogtreecommitdiff
path: root/app-shells/fish
diff options
context:
space:
mode:
Diffstat (limited to 'app-shells/fish')
-rw-r--r--app-shells/fish/Manifest4
-rw-r--r--app-shells/fish/fish-2.7.0.ebuild84
-rw-r--r--app-shells/fish/fish-2.7.1.ebuild2
3 files changed, 2 insertions, 88 deletions
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index e6d8a9502bf5..4d532411cf4a 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,7 +1,5 @@
DIST fish-2.6.0.tar.gz 3575346 BLAKE2B 8697dc6e50836d93d0ed22663e86016fec8e567cd4e129ea92008f52da6dd629bf11b70719beabe5c08bd3d7ba43d8017441f103d49a82c0faec3bc749e83764 SHA512 d4ded5ce24600e85673a7bb016e9dc36bce999b27f40e6b1ce0b9ca49a421be2d444d9d2b6f178f6eee963e59daa4a65df4c3de2a8086a610486f758fcfb0ed1
-DIST fish-2.7.0.tar.gz 5760470 BLAKE2B 8b3b905b6118cbcb988cedb1e80bcaf0e69d3d27aa355421f11b4ae8d26f2bb8c8b05cf31b30035f2235a063d3385d0a999b73e505df906a35ca6f034410061e SHA512 1b43a8eb25c08d1bf2870d51e1c5328438ea05a21d9a122345d765190ded7a6e335b4e1d3b92a6f7f764190321f471e3cda7bf7e995521b4c98beffc745880e9
DIST fish-2.7.1.tar.gz 5760550 BLAKE2B 71568a3a17f4222b05a314464a61fceb241409a7d42c46249486ca742ef0cf990c46d693bcc22521c18f58a558e6aab35759d0da6eb62ee6611a2a7946fe714d SHA512 45ee3453404c5d6c56d307b4cd19197de862f9f42d7fa06461acec56dea7146db5675cf6419dd5f72e939b3e4b1955d3761098df1de89a8cebe47645eb6f7a4b
EBUILD fish-2.6.0.ebuild 2101 BLAKE2B 58ffb1a0240f07c7b84cdd09aafcde2fd5315bc089c6b0408e741e2ff692181910580c6d35b6ed7116eca4715d8908ea9283b1721b1ea6144ef397eb063e6a40 SHA512 300260bdc26e6e17ba5aa0ec8e1cb96b9669e43e83d92b98903ed79299ce6a350eb12b626ba5e6882138f2374107a2e7b9360a1012ccaf11578664f1270ced61
-EBUILD fish-2.7.0.ebuild 2287 BLAKE2B 483123e3b74e45e1402195ad971e26bb36f321646e7ac6298cdd29f8f6ff838f0fef0f255bf683bf37825164ede42d7823c9a6dad4253650a2e59f4404428979 SHA512 0ee5c9aec58088fb471c7212c48ecb9d8453983027e959d7ab5bf983f3c193fa8267b1f179ac02f33645f1d7bcad80fb1798c4df6683f811a7dd7c2a9631b7db
-EBUILD fish-2.7.1.ebuild 2169 BLAKE2B 5d513aa92737d6e58d9e0558a1c49f5b3a81faf07191ffd15f2a9420c0e56012cbbae29e78a226e78812f5fa273a8fcacc61d807f1e1a3d1db4bcb856e33ea88 SHA512 9d276f9b4fe9c3880f514cb487566380dd11eb715e6857ce2bb40c70c065ea93791d5bbdcb2bb97e769ab2cd1cb80c72bbad5c3f3a1413793d89b83262f1f928
+EBUILD fish-2.7.1.ebuild 2168 BLAKE2B b1a3c6ab6b4a00214a09c6f5540a94c086e10faa48de4159698324450bb8caade898f6f50cad00adc476ffc9a8f0d8ac05a162728bc1fd43bd6312103f609e59 SHA512 17724fdf4d0f765d0656de5b800b7ff369cb4f3f88f173a32a503f60b3bac343bf2bb088dd4c22b78d2e10ecfe0c01056306e0220ca3ede1f6b4149690132ac7
MISC metadata.xml 733 BLAKE2B 5397b2e1714a6089ff4c263025499d5231a179946a913db582309b52aff118a3a853399107da99f2469ad3fa80b1b9129a4eeaa5293b4430b0f08abbe1f48f75 SHA512 92cba131da5b8684008868f6fcecc62b91ede3ea2271ae2af5e501728b90c63a0227743d59e255ba16dc0d4ef2d8ac70b702be184db6f91ba4b335ce04be3be6
diff --git a/app-shells/fish/fish-2.7.0.ebuild b/app-shells/fish/fish-2.7.0.ebuild
deleted file mode 100644
index 317865b783fd..000000000000
--- a/app-shells/fish/fish-2.7.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV="${PV/_beta/b}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="fish is the 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 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="nls"
-
-RDEPEND="
- >=dev-libs/libpcre2-10.21[pcre32]
- sys-libs/ncurses:0=
-"
-DEPEND="
- ${RDEPEND}
- sys-devel/bc
- nls? ( sys-devel/gettext )
-"
-
-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 \
- docdir="${EPREFIX}"/usr/share/doc/${PF} \
- --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 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 "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-2.7.1.ebuild b/app-shells/fish/fish-2.7.1.ebuild
index d33a4f6cf288..3c3119fb6510 100644
--- a/app-shells/fish/fish-2.7.1.ebuild
+++ b/app-shells/fish/fish-2.7.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/$
LICENSE="GPL-2"
SLOT="0"
[[ "${PV}" = *_* ]] || \
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="nls test"
RDEPEND="