Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/fish/, app-shells/fish/files/
Date: Tue, 07 Nov 2017 12:50:24
Message-Id: 1510059015.c75e9d17844d466093d64db626d319d063deb417.polynomial-c@gentoo
1 commit: c75e9d17844d466093d64db626d319d063deb417
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 7 12:50:03 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 7 12:50:15 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c75e9d17
7
8 app-shells/fish: Removed old.
9
10 Package-Manager: Portage-2.3.13, Repoman-2.3.4
11
12 app-shells/fish/Manifest | 2 -
13 .../fish/files/fish-2.5.0-honor-linguas.patch | 32 ----------
14 app-shells/fish/fish-2.4.0.ebuild | 64 -------------------
15 app-shells/fish/fish-2.5.0.ebuild | 72 ----------------------
16 4 files changed, 170 deletions(-)
17
18 diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
19 index 4ecff87b779..84fd66c268e 100644
20 --- a/app-shells/fish/Manifest
21 +++ b/app-shells/fish/Manifest
22 @@ -1,4 +1,2 @@
23 -DIST fish-2.4.0.tar.gz 3455874 SHA256 06bbb2323360439c4044da762d114ec1aa1aba265cec71c0543e6a0095c9efc5 SHA512 b27a2291c284fda7a12b3cd5dcba8dfcbf2738f50de40d9aac1500afa3bd98be04b4f67d7e6d3bb2f808c11a8c2dd6b1b5cc2dfe3e8e0e7d1bc88f8d8994d57b WHIRLPOOL abb9c31237a33553b25920fe3284f4ca90941aed2b8f1ec4b69fdb4231f7b2585f0292bc647ffe3acf88f6b01ac61931f615fa9a56ede35a8182e3a69aa11861
24 -DIST fish-2.5.0.tar.gz 3496831 SHA256 f8c0edadca2de379ccf305aeace660a9255fa2180c72e85e97705a24c256b2a5 SHA512 6d94bb70a5f1cefaada4d10ac845992f87c9bfc8c253f38bdfcc3a573a35503d825c9487d2ce8ef3819713594ab7b54ebf6c89fe3362c7010c63dbefc99b424d WHIRLPOOL a16d5f75e95573f2b766527fb124d99083a7ab84522a4826cd5b3aaf3a73ae6728f30defbd0598698b496f279f686eddcb4e81779767e89888037abe0b908849
25 DIST fish-2.6.0.tar.gz 3575346 SHA256 7ee5bbd671c73e5323778982109241685d58a836e52013e18ee5d9f2e638fdfb SHA512 d4ded5ce24600e85673a7bb016e9dc36bce999b27f40e6b1ce0b9ca49a421be2d444d9d2b6f178f6eee963e59daa4a65df4c3de2a8086a610486f758fcfb0ed1 WHIRLPOOL 3316c1bd8778a1eba5b7b65edf28495ec89ec01ba3d0bc26cbc64ce69bfcd73a538c9a5463c9385f55689e3e680241d37e36bfec309f87c6ee98934f74fd7aa4
26 DIST fish-2.7b1.tar.gz 5760393 SHA256 326dbea5d0f20eba54fa0b0c5525e58b4a39ebd8c52c14cfffc5f4d6cdf55385 SHA512 75e9351eb8179d9a21915d6cbc8d042f595e9fd3120f2ab7ad503fde5d59c9d965cc01ec599c89d7e6c9b3ef3e175b91e6c750427e146a0649434ee121a7c17c WHIRLPOOL 3ec2707d4bd2d8726c969e7aadd665d29adc89d1e6e78918a509c275ec289c1cfbdab4e6271b15ad2bd47a292dff00c312ed0735e1ef34ae66dcbf5c8c6bcae1
27
28 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
29 deleted file mode 100644
30 index 843036d6e5d..00000000000
31 --- a/app-shells/fish/files/fish-2.5.0-honor-linguas.patch
32 +++ /dev/null
33 @@ -1,32 +0,0 @@
34 -diff --git a/Makefile.in b/Makefile.in
35 -index 35e63ae..b73c612 100644
36 ---- a/Makefile.in
37 -+++ b/Makefile.in
38 -@@ -195,11 +195,16 @@ ifeq ($(shell uname), Darwin)
39 - endif
40 -
41 - #
42 --# All translation message catalogs
43 -+# All translation message catalogs, filter files based on LINGUAS.
44 - #
45 - TRANSLATIONS_SRC := $(wildcard po/*.po)
46 --ifdef HAVE_GETTEXT
47 -+ifeq ($(HAVE_GETTEXT), 1)
48 - TRANSLATIONS := $(TRANSLATIONS_SRC:.po=.gmo)
49 -+ifdef LINGUAS
50 -+ TRANSLATIONS_ALL := $(TRANSLATIONS)
51 -+ TRANSLATIONS_WANTED = $(patsubst %,po/%.gmo,$(LINGUAS))
52 -+ TRANSLATIONS = $(filter $(TRANSLATIONS_WANTED),$(TRANSLATIONS_ALL))
53 -+endif
54 - else
55 - TRANSLATIONS :=
56 - endif
57 -@@ -764,7 +769,7 @@ uninstall: uninstall-translations | show-prefix show-bindir show-sysconfdir show
58 - .PHONY: uninstall
59 -
60 - install-translations: $(TRANSLATIONS) | show-HAVE_GETTEXT
61 --ifdef HAVE_GETTEXT
62 -+ifeq ($(HAVE_GETTEXT), 1)
63 - @echo "Installing translations..."
64 - $v for i in $(TRANSLATIONS); do \
65 - $(INSTALL) -m 755 -d $(DESTDIR)$(localedir)/`basename $$i .gmo`/LC_MESSAGES; \
66
67 diff --git a/app-shells/fish/fish-2.4.0.ebuild b/app-shells/fish/fish-2.4.0.ebuild
68 deleted file mode 100644
69 index e4b272b5639..00000000000
70 --- a/app-shells/fish/fish-2.4.0.ebuild
71 +++ /dev/null
72 @@ -1,64 +0,0 @@
73 -# Copyright 1999-2017 Gentoo Foundation
74 -# Distributed under the terms of the GNU General Public License v2
75 -
76 -EAPI=6
77 -
78 -PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
79 -
80 -DESCRIPTION="fish is the Friendly Interactive SHell"
81 -HOMEPAGE="http://fishshell.com/"
82 -SRC_URI="http://fishshell.com/files/${PV}/${P}.tar.gz"
83 -
84 -LICENSE="GPL-2"
85 -SLOT="0"
86 -KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
87 -IUSE="X"
88 -
89 -DEPEND="sys-libs/ncurses:0=
90 - sys-devel/bc
91 - sys-devel/gettext
92 - X? ( x11-misc/xsel )"
93 -
94 -RDEPEND="${DEPEND}"
95 -
96 -src_configure() {
97 - # Set things up for fish to be a default shell.
98 - # It has to be in /bin in case /usr is unavailable.
99 - # Also, all of its utilities have to be in /bin.
100 - econf \
101 - docdir="${EPREFIX}"/usr/share/doc/${PF} \
102 - --bindir="${EPREFIX}"/bin
103 -}
104 -
105 -src_test() {
106 - if has_version ~${CATEGORY}/${P} ; then
107 - emake test
108 - else
109 - ewarn "The test suite only works when the package is already installed"
110 - fi
111 -}
112 -
113 -pkg_postinst() {
114 - elog "fish is now installed on your system."
115 - elog "To run fish, type 'fish' in your terminal."
116 - elog
117 - elog "To use fish as your login shell:"
118 - elog "* add the line '${EPREFIX}/bin/${PN}'"
119 - elog "* to the file '${EPREFIX}/etc/shells'."
120 - elog "* use the command 'chsh -s ${EPREFIX}/bin/${PN}'."
121 - elog
122 - elog "To set your colors, run 'fish_config'"
123 - elog "To scan your man pages for completions, run 'fish_update_completions'"
124 - elog "To autocomplete command suggestions press Ctrl + F or right arrow key."
125 - elog
126 - elog "Please add a \"BROWSER\" variable to ${PN}'s environment pointing to the"
127 - elog "browser of your choice to get acces to ${PN}'s help system:"
128 - elog " BROWSER=\"/usr/bin/firefox\""
129 - elog
130 - elog "In order to get lzma and xz support for man-page completion please"
131 - elog "emerge one of the following packages:"
132 - elog " dev-python/backports-lzma"
133 - elog " >=dev-lang/python-3.3"
134 - elog
135 - elog "Have fun!"
136 -}
137
138 diff --git a/app-shells/fish/fish-2.5.0.ebuild b/app-shells/fish/fish-2.5.0.ebuild
139 deleted file mode 100644
140 index 6d94ff16ddf..00000000000
141 --- a/app-shells/fish/fish-2.5.0.ebuild
142 +++ /dev/null
143 @@ -1,72 +0,0 @@
144 -# Copyright 1999-2017 Gentoo Foundation
145 -# Distributed under the terms of the GNU General Public License v2
146 -
147 -EAPI=6
148 -
149 -DESCRIPTION="fish is the Friendly Interactive SHell"
150 -HOMEPAGE="http://fishshell.com/"
151 -SRC_URI="http://fishshell.com/files/${PV}/${P}.tar.gz"
152 -
153 -LICENSE="GPL-2"
154 -SLOT="0"
155 -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
156 -IUSE="nls"
157 -
158 -RDEPEND="
159 - >=dev-libs/libpcre2-10.21[pcre32]
160 - sys-libs/ncurses:0=
161 -"
162 -DEPEND="
163 - ${RDEPEND}
164 - sys-devel/bc
165 - nls? ( sys-devel/gettext )
166 -"
167 -
168 -PATCHES=( "${FILESDIR}/${P}-honor-linguas.patch" )
169 -
170 -src_configure() {
171 - # Set things up for fish to be a default shell.
172 - # It has to be in /bin in case /usr is unavailable.
173 - # Also, all of its utilities have to be in /bin.
174 - econf \
175 - docdir="${EPREFIX}"/usr/share/doc/${PF} \
176 - --bindir="${EPREFIX}"/bin \
177 - --without-included-pcre2 \
178 - $(use_with nls gettext)
179 -}
180 -
181 -src_test() {
182 - if has_version ~${CATEGORY}/${P} ; then
183 - emake test
184 - else
185 - ewarn "The test suite only works when the package is already installed"
186 - fi
187 -}
188 -
189 -pkg_postinst() {
190 - elog "fish is now installed on your system."
191 - elog "To run fish, type 'fish' in your terminal."
192 - elog
193 - elog "It is advised not to set fish as a default login shell."
194 - elog "see bug #545830 for more details."
195 - elog "Executing fish using ~/.bashrc is an alternative"
196 - elog "see https://wiki.gentoo.org/wiki/Fish#Caveats for details"
197 - elog
198 - elog "To set your colors, run 'fish_config'"
199 - elog "To scan your man pages for completions, run 'fish_update_completions'"
200 - elog "To autocomplete command suggestions press Ctrl + F or right arrow key."
201 - elog
202 - elog "Please add a \"BROWSER\" variable to ${PN}'s environment pointing to the"
203 - elog "browser of your choice to get acces to ${PN}'s help system:"
204 - elog " BROWSER=\"/usr/bin/firefox\""
205 - elog
206 - elog "In order to get lzma and xz support for man-page completion please"
207 - elog "emerge one of the following packages:"
208 - elog " dev-python/backports-lzma"
209 - elog " >=dev-lang/python-3.3"
210 - elog
211 - elog "If you have issues with cut'n'paste in X-terminals, install the"
212 - elog "x11-misc/xsel package."
213 - elog
214 - elog "Have fun!"
215 -}