Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/fish/
Date: Thu, 23 Dec 2021 22:28:08
Message-Id: 1640298433.7b1e952b3a1209d208048269d008841fe4163132.gyakovlev@gentoo
1 commit: 7b1e952b3a1209d208048269d008841fe4163132
2 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 23 21:55:51 2021 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 23 22:27:13 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b1e952b
7
8 app-shells/fish: drop 3.1.2-r1, 3.2.1-r1, 3.2.2-r1
9
10 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
11
12 app-shells/fish/Manifest | 3 --
13 app-shells/fish/fish-3.1.2-r1.ebuild | 71 ----------------------------
14 app-shells/fish/fish-3.2.1-r1.ebuild | 89 ------------------------------------
15 app-shells/fish/fish-3.2.2-r1.ebuild | 89 ------------------------------------
16 4 files changed, 252 deletions(-)
17
18 diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
19 index fc67224f5d13..c41057369d88 100644
20 --- a/app-shells/fish/Manifest
21 +++ b/app-shells/fish/Manifest
22 @@ -1,4 +1 @@
23 -DIST fish-3.1.2.tar.gz 6816214 BLAKE2B d994cb867a1a86850db2ec36d262328cd8dc21d63edb860c26d727aac08fa257392690999e099d754287d9f12a294222815e4cc84abbb2e2a87a982bb6627b6b SHA512 b6ae2c928774a2eaccf35312d3a9446bfa3e1335182c8f2b2d6198161d0916904f4964fb20ed13a5bf850c1c819e003905d13db3bc8b1faa5b401a60b47dc563
24 -DIST fish-3.2.1.tar.xz 3409808 BLAKE2B ad136c60cc98ae9fdb2e2abecb722107543184cb162a3c6b058e8ebe40a383a09c0e9b0eca762ab95725227dd6630605ad875bd4da59d38e605bc1f82fa1d517 SHA512 bf565bac93e7d163af5253b4053f9c9e760508b929624440fd8a160504a127c34013882576293c72a47ce7f285f87e0b594d61d7cebcefcc3be4e92c572926bc
25 -DIST fish-3.2.2.tar.xz 3411748 BLAKE2B f8b20b6c56c54f84f347b930b71528dbd61a4f53adfd8addec05314c9d15992257cea89ce854adef2eecf3adfb07e6fa576b9d45c2e362ff360b24cf1edf3afc SHA512 e82c5a390bd94f84c60843a94dc4f30bd46539828a54d2e96f208e0d54a0aa361a8c9d4a66cdf2fa636a5fab310a96bf1c165c58440c38d123f788fff3598f4a
26 DIST fish-3.3.1.tar.xz 3489152 BLAKE2B 61b2bf96526d957d3f9706df5a76d4d9b4ccf55a1ff2b7b66f1a0d5d126a220df9984551f5adb06dcedbfb5674b93c4f3d75ef991585980a29d4dd84f7697559 SHA512 fc50ca44fab3f2d942284d4f714150f7ccf1e49c73da36f8d4ae4a33a9b3280f98bed15848839f5d443b4274fd0ff90174bafa6a8e9a4da226dda63d7766a660
27
28 diff --git a/app-shells/fish/fish-3.1.2-r1.ebuild b/app-shells/fish/fish-3.1.2-r1.ebuild
29 deleted file mode 100644
30 index 177c7aa2ce46..000000000000
31 --- a/app-shells/fish/fish-3.1.2-r1.ebuild
32 +++ /dev/null
33 @@ -1,71 +0,0 @@
34 -# Copyright 1999-2021 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -
39 -inherit cmake readme.gentoo-r1
40 -
41 -DESCRIPTION="Friendly Interactive SHell"
42 -HOMEPAGE="http://fishshell.com/"
43 -
44 -MY_PV="${PV/_beta/b}"
45 -MY_P="${PN}-${MY_PV}"
46 -
47 -if [[ ${PV} == "9999" ]]; then
48 - inherit git-r3
49 - EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
50 -else
51 - SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.gz"
52 - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
53 -fi
54 -
55 -LICENSE="GPL-2"
56 -SLOT="0"
57 -
58 -IUSE="doc nls test"
59 -RESTRICT="!test? ( test )"
60 -
61 -RDEPEND="
62 - >=dev-libs/libpcre2-10.32:=[pcre32]
63 - sys-libs/ncurses:=[unicode(+)]
64 -"
65 -
66 -DEPEND="${RDEPEND}
67 - doc? ( app-doc/doxygen )
68 - nls? ( sys-devel/gettext )
69 - test? ( dev-tcltk/expect )
70 -"
71 -
72 -S="${WORKDIR}/${MY_P}"
73 -
74 -src_prepare() {
75 - # workaround for https://github.com/fish-shell/fish-shell/issues/4883
76 - sed -i 's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
77 - cmake/Tests.cmake || die
78 - cmake_src_prepare
79 -}
80 -
81 -src_configure() {
82 - local mycmakeargs=(
83 - -DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
84 - -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
85 - -DCURSES_NEED_NCURSES=ON
86 - -DBUILD_DOCS="$(usex doc)"
87 - -DWITH_GETTEXT="$(usex nls)"
88 - )
89 - cmake_src_configure
90 -}
91 -
92 -src_install() {
93 - cmake_src_install
94 - keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
95 - readme.gentoo_create_doc
96 -}
97 -
98 -src_test() {
99 - cmake_build -j1 test
100 -}
101 -
102 -pkg_postinst() {
103 - readme.gentoo_print_elog
104 -}
105
106 diff --git a/app-shells/fish/fish-3.2.1-r1.ebuild b/app-shells/fish/fish-3.2.1-r1.ebuild
107 deleted file mode 100644
108 index abb51e209302..000000000000
109 --- a/app-shells/fish/fish-3.2.1-r1.ebuild
110 +++ /dev/null
111 @@ -1,89 +0,0 @@
112 -# Copyright 1999-2021 Gentoo Authors
113 -# Distributed under the terms of the GNU General Public License v2
114 -
115 -EAPI=7
116 -
117 -PYTHON_COMPAT=( python3_{7..9} )
118 -
119 -inherit cmake python-any-r1 readme.gentoo-r1
120 -
121 -DESCRIPTION="Friendly Interactive SHell"
122 -HOMEPAGE="http://fishshell.com/"
123 -
124 -MY_PV="${PV/_beta/b}"
125 -MY_P="${PN}-${MY_PV}"
126 -
127 -if [[ ${PV} == "9999" ]]; then
128 - inherit git-r3
129 - EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
130 -else
131 - SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz"
132 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
133 -fi
134 -
135 -LICENSE="GPL-2"
136 -SLOT="0"
137 -IUSE="+doc nls test"
138 -
139 -RESTRICT="!test? ( test )"
140 -
141 -RDEPEND="
142 - >=dev-libs/libpcre2-10.32:=[pcre32]
143 - sys-apps/coreutils
144 - sys-libs/ncurses:=[unicode(+)]
145 -"
146 -
147 -DEPEND="${RDEPEND}"
148 -BDEPEND="
149 - nls? ( sys-devel/gettext )
150 - test? (
151 - ${PYTHON_DEPS}
152 - dev-tcltk/expect
153 - $(python_gen_any_dep '
154 - dev-python/pexpect[${PYTHON_USEDEP}]
155 - ')
156 - )
157 -"
158 -# we don't need shpinx dep for release tarballs
159 -[[ ${PV} == 9999 ]] && DEPEND+=" doc? ( dev-python/sphinx )"
160 -
161 -S="${WORKDIR}/${MY_P}"
162 -
163 -python_check_deps() {
164 - use test || return 0
165 - has_version -d "dev-python/pexpect[${PYTHON_USEDEP}]"
166 -}
167 -
168 -src_prepare() {
169 - # workaround for https://github.com/fish-shell/fish-shell/issues/4883
170 - sed -i 's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
171 - cmake/Tests.cmake || die
172 - cmake_src_prepare
173 -}
174 -
175 -src_configure() {
176 - local mycmakeargs=(
177 - -DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
178 - -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
179 - -DCURSES_NEED_NCURSES=ON
180 - -DINSTALL_DOCS="$(usex doc)"
181 - -DWITH_GETTEXT="$(usex nls)"
182 - )
183 - # release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE
184 - [[ ${PV} == 9999 ]] && mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
185 - cmake_src_configure
186 -}
187 -
188 -src_install() {
189 - cmake_src_install
190 - keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
191 - readme.gentoo_create_doc
192 -}
193 -
194 -src_test() {
195 - cmake_build -j1 test
196 -}
197 -
198 -pkg_postinst() {
199 - readme.gentoo_print_elog
200 -}
201
202 diff --git a/app-shells/fish/fish-3.2.2-r1.ebuild b/app-shells/fish/fish-3.2.2-r1.ebuild
203 deleted file mode 100644
204 index abb51e209302..000000000000
205 --- a/app-shells/fish/fish-3.2.2-r1.ebuild
206 +++ /dev/null
207 @@ -1,89 +0,0 @@
208 -# Copyright 1999-2021 Gentoo Authors
209 -# Distributed under the terms of the GNU General Public License v2
210 -
211 -EAPI=7
212 -
213 -PYTHON_COMPAT=( python3_{7..9} )
214 -
215 -inherit cmake python-any-r1 readme.gentoo-r1
216 -
217 -DESCRIPTION="Friendly Interactive SHell"
218 -HOMEPAGE="http://fishshell.com/"
219 -
220 -MY_PV="${PV/_beta/b}"
221 -MY_P="${PN}-${MY_PV}"
222 -
223 -if [[ ${PV} == "9999" ]]; then
224 - inherit git-r3
225 - EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
226 -else
227 - SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.xz"
228 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
229 -fi
230 -
231 -LICENSE="GPL-2"
232 -SLOT="0"
233 -IUSE="+doc nls test"
234 -
235 -RESTRICT="!test? ( test )"
236 -
237 -RDEPEND="
238 - >=dev-libs/libpcre2-10.32:=[pcre32]
239 - sys-apps/coreutils
240 - sys-libs/ncurses:=[unicode(+)]
241 -"
242 -
243 -DEPEND="${RDEPEND}"
244 -BDEPEND="
245 - nls? ( sys-devel/gettext )
246 - test? (
247 - ${PYTHON_DEPS}
248 - dev-tcltk/expect
249 - $(python_gen_any_dep '
250 - dev-python/pexpect[${PYTHON_USEDEP}]
251 - ')
252 - )
253 -"
254 -# we don't need shpinx dep for release tarballs
255 -[[ ${PV} == 9999 ]] && DEPEND+=" doc? ( dev-python/sphinx )"
256 -
257 -S="${WORKDIR}/${MY_P}"
258 -
259 -python_check_deps() {
260 - use test || return 0
261 - has_version -d "dev-python/pexpect[${PYTHON_USEDEP}]"
262 -}
263 -
264 -src_prepare() {
265 - # workaround for https://github.com/fish-shell/fish-shell/issues/4883
266 - sed -i 's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
267 - cmake/Tests.cmake || die
268 - cmake_src_prepare
269 -}
270 -
271 -src_configure() {
272 - local mycmakeargs=(
273 - -DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
274 - -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
275 - -DCURSES_NEED_NCURSES=ON
276 - -DINSTALL_DOCS="$(usex doc)"
277 - -DWITH_GETTEXT="$(usex nls)"
278 - )
279 - # release tarballs ship pre-built docs // -DHAVE_PREBUILT_DOCS=TRUE
280 - [[ ${PV} == 9999 ]] && mycmakeargs+=( -DBUILD_DOCS="$(usex doc)" )
281 - cmake_src_configure
282 -}
283 -
284 -src_install() {
285 - cmake_src_install
286 - keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
287 - readme.gentoo_create_doc
288 -}
289 -
290 -src_test() {
291 - cmake_build -j1 test
292 -}
293 -
294 -pkg_postinst() {
295 - readme.gentoo_print_elog
296 -}