diff options
Diffstat (limited to 'app-shells/fish')
| -rw-r--r-- | app-shells/fish/Manifest | 9 | ||||
| -rw-r--r-- | app-shells/fish/files/fish-2.5.0-honor-linguas.patch | 32 | ||||
| -rw-r--r-- | app-shells/fish/fish-2.4.0.ebuild | 64 | ||||
| -rw-r--r-- | app-shells/fish/fish-2.6.0.ebuild | 2 | ||||
| -rw-r--r-- | app-shells/fish/fish-2.7_beta1.ebuild (renamed from app-shells/fish/fish-2.5.0.ebuild) | 16 |
5 files changed, 18 insertions, 105 deletions
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest index 9849e3c1a3ac..5b9ef514991f 100644 --- a/app-shells/fish/Manifest +++ b/app-shells/fish/Manifest @@ -1,10 +1,7 @@ -AUX fish-2.5.0-honor-linguas.patch 1013 SHA256 15a1e08fef5a1b55a7d95adf8460e7269056e33ab659d577be726d5203fa33bd SHA512 c6800b5f45ab031418dd6492878ebe58a9b997cf265d6b17b90a1a4716f94eafbcdc5a1f1681e00ceede012d30b6200d61c94b5a28adc2379774eafcfc20664d WHIRLPOOL 134bd3f3f22f68a847587ae62031a07bb0a733a0832686b4316383b76407d75e7e672f6ce2da0ea29ec6eb5dcc85de367e9f1ca611762e4b96521d933bc716f3 -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 DIST fish-2.6.0.tar.gz 3575346 SHA256 7ee5bbd671c73e5323778982109241685d58a836e52013e18ee5d9f2e638fdfb SHA512 d4ded5ce24600e85673a7bb016e9dc36bce999b27f40e6b1ce0b9ca49a421be2d444d9d2b6f178f6eee963e59daa4a65df4c3de2a8086a610486f758fcfb0ed1 WHIRLPOOL 3316c1bd8778a1eba5b7b65edf28495ec89ec01ba3d0bc26cbc64ce69bfcd73a538c9a5463c9385f55689e3e680241d37e36bfec309f87c6ee98934f74fd7aa4 -EBUILD fish-2.4.0.ebuild 1877 SHA256 29a7ab3301e00e6610cedb280d95fd094f97eb2e62a4fef0f3f1ac0eac91843d SHA512 d933209c285be394428524f844cd3bb55a471fbc79be0a3581a8cec73b0dbb73ab386782bf5b9a8ecbfa1fcc20290be4b822948deb644fa185145941cb9f25d7 WHIRLPOOL 7131a648485aa4a5fddd16599febc4ff5324e5cad5e2235fcd444eabc929927dbf58d791b29a96437a22d01c641851109331f326f7f57ccefe3bc14c4a0609c5 -EBUILD fish-2.5.0.ebuild 2122 SHA256 faf104bead0103640a62bf883dfaf063daa387bae3b1551b85a913782a579121 SHA512 28dbe1515cb8f96b35a9809a5b103bf45a79203050d2374838fc031f4b7b97fad07459d8899bab702ec98e2798540ce9e52963eb4f5430c0260528a8ec6851a7 WHIRLPOOL 3ce775ee38e1f4c7a2a39ef0afbce080eb08cbde3c5a9be7d3aff4b5fb6eee081f5d6c49fd27bc85da2fe5e189a60332db0427e57f7c4aa2e84f04d23d17a3b4 -EBUILD fish-2.6.0.ebuild 2102 SHA256 c3848a3d139e74813fc6684fbb7e3d67994447e649fb857739406e633e5d9592 SHA512 5dc3509e05d5151f7c5705381f0a2aba8c98b6d208a990dd49de9250bfbaa46a96eab247b175acfa0737aa17370d65d93ccdffbcc020897cb7d907da7a9bbaaa WHIRLPOOL b4338606075d6df076a5d0decba711cd47d829060fb0da2d6fd5c24b7b2b636854dae1f88b930ba5035f606cf8fb1be936d7c518c4a9418706f37867859b5fd0 +DIST fish-2.7b1.tar.gz 5760393 SHA256 326dbea5d0f20eba54fa0b0c5525e58b4a39ebd8c52c14cfffc5f4d6cdf55385 SHA512 75e9351eb8179d9a21915d6cbc8d042f595e9fd3120f2ab7ad503fde5d59c9d965cc01ec599c89d7e6c9b3ef3e175b91e6c750427e146a0649434ee121a7c17c WHIRLPOOL 3ec2707d4bd2d8726c969e7aadd665d29adc89d1e6e78918a509c275ec289c1cfbdab4e6271b15ad2bd47a292dff00c312ed0735e1ef34ae66dcbf5c8c6bcae1 +EBUILD fish-2.6.0.ebuild 2101 SHA256 97b3b1d5a11c220a8c240c504a0026a8cbcc9bdd66a2dbae1c30eaa50040ea2e SHA512 300260bdc26e6e17ba5aa0ec8e1cb96b9669e43e83d92b98903ed79299ce6a350eb12b626ba5e6882138f2374107a2e7b9360a1012ccaf11578664f1270ced61 WHIRLPOOL 757fa1387a36607bef53db4b6e328c77544e2ae69a749f1862875a6f86a16974c961b7a2e9da42bfc6718ee49e289facc7ea0c3d8b08184aee8ed114a41ed16b +EBUILD fish-2.7_beta1.ebuild 2287 SHA256 58ffc0db2dbf67514ecf07f54d48da94ea14a252264b7babbd326d235393d805 SHA512 0ee5c9aec58088fb471c7212c48ecb9d8453983027e959d7ab5bf983f3c193fa8267b1f179ac02f33645f1d7bcad80fb1798c4df6683f811a7dd7c2a9631b7db WHIRLPOOL 22b6d33575a21ab8c5f8e1bd66483c4aac692167542a30372c86e612de89b45254c29a8b5ee053ae39391a28c60efd7f890ffa0c8cd667847c101103e57a81cd MISC ChangeLog 4266 SHA256 a1da0515d9df5080a95f75942508c85d0a11971edc4cec45c0fe9d1b6e0724da SHA512 94ce9fd4fe7754244eb5cf33804c27a4a46f262e7f35f6b73991d741c2e28e0e898b0102e070582daa9821582fa6ffa66967bb9c39fd30224a04c7b6c38928f8 WHIRLPOOL 94cd84f0494023da953bce4fe02f7ab19a8da8b4638122ad2b9dbca271fa5a1ca0dccca663ff1898609153b5da1da15d833b8efe5835f12a569891cd66b798c1 MISC ChangeLog-2015 12909 SHA256 4cb0e569f70bf96e0968b9ab6fcabdcaa7c1ec3e36a3f8897174b6fac87cda73 SHA512 c74ef90c9574c8115a3c23dc147095f036ff6b121933f837af451a8fbb974d4d8599668da9cd81afcde71ec7a10dda331ea25b64f5ca9296cb1a0708f83a86ba WHIRLPOOL cb88ef78f054b75d1687b98536f23b45ad4fc79a92d6727f61b5f2eb443d64fc50dd89ade150bd5912ca9bb9da2c27091294f81456562c1acf762b1b2a3ec72d MISC metadata.xml 509 SHA256 73aa49594b1c3a374bbcd282f4c66ad58744a88ed0b858d1ea57b0ac50016d5b SHA512 b4ba8bf04d8814847af718f64bfc59e79f6146f2841da5b8e9d1854caa9d72526cca85d2235483970656f5d78a9bcaba2d636b91ef6406f6f6a32a9fee3c312f WHIRLPOOL 23985a921962a204f7e8d732a8384c990b6acc393cf3bf00d2c2c2d425f933ea93bf9830010703f9d885a3f4377acf88ea7eea694c516c70a86c249d38c9ffc9 diff --git a/app-shells/fish/files/fish-2.5.0-honor-linguas.patch b/app-shells/fish/files/fish-2.5.0-honor-linguas.patch deleted file mode 100644 index 843036d6e5d3..000000000000 --- a/app-shells/fish/files/fish-2.5.0-honor-linguas.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index 35e63ae..b73c612 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -195,11 +195,16 @@ ifeq ($(shell uname), Darwin) - endif - - # --# All translation message catalogs -+# All translation message catalogs, filter files based on LINGUAS. - # - TRANSLATIONS_SRC := $(wildcard po/*.po) --ifdef HAVE_GETTEXT -+ifeq ($(HAVE_GETTEXT), 1) - TRANSLATIONS := $(TRANSLATIONS_SRC:.po=.gmo) -+ifdef LINGUAS -+ TRANSLATIONS_ALL := $(TRANSLATIONS) -+ TRANSLATIONS_WANTED = $(patsubst %,po/%.gmo,$(LINGUAS)) -+ TRANSLATIONS = $(filter $(TRANSLATIONS_WANTED),$(TRANSLATIONS_ALL)) -+endif - else - TRANSLATIONS := - endif -@@ -764,7 +769,7 @@ uninstall: uninstall-translations | show-prefix show-bindir show-sysconfdir show - .PHONY: uninstall - - install-translations: $(TRANSLATIONS) | show-HAVE_GETTEXT --ifdef HAVE_GETTEXT -+ifeq ($(HAVE_GETTEXT), 1) - @echo "Installing translations..." - $v for i in $(TRANSLATIONS); do \ - $(INSTALL) -m 755 -d $(DESTDIR)$(localedir)/`basename $$i .gmo`/LC_MESSAGES; \ diff --git a/app-shells/fish/fish-2.4.0.ebuild b/app-shells/fish/fish-2.4.0.ebuild deleted file mode 100644 index e4b272b56390..000000000000 --- a/app-shells/fish/fish-2.4.0.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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" - -DEPEND="sys-libs/ncurses:0= - sys-devel/bc - sys-devel/gettext - X? ( x11-misc/xsel )" - -RDEPEND="${DEPEND}" - -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 -} - -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!" -} diff --git a/app-shells/fish/fish-2.6.0.ebuild b/app-shells/fish/fish-2.6.0.ebuild index c8031c924452..fd71035af530 100644 --- a/app-shells/fish/fish-2.6.0.ebuild +++ b/app-shells/fish/fish-2.6.0.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${PV}/${P} LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" IUSE="nls" RDEPEND=" diff --git a/app-shells/fish/fish-2.5.0.ebuild b/app-shells/fish/fish-2.7_beta1.ebuild index 6d94ff16ddfb..317865b783fd 100644 --- a/app-shells/fish/fish-2.5.0.ebuild +++ b/app-shells/fish/fish-2.7_beta1.ebuild @@ -3,12 +3,16 @@ 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="http://fishshell.com/files/${PV}/${P}.tar.gz" +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" @@ -22,7 +26,7 @@ DEPEND=" nls? ( sys-devel/gettext ) " -PATCHES=( "${FILESDIR}/${P}-honor-linguas.patch" ) +S="${WORKDIR}/${MY_P}" src_configure() { # Set things up for fish to be a default shell. @@ -35,6 +39,14 @@ src_configure() { $(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 |