1 |
commit: 5dc7055c1c68b6087c90c9176860ad543e77ac3b |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Sep 8 06:08:56 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Sep 8 06:08:56 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dc7055c |
7 |
|
8 |
app-shells/bash-completion: Drop old |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
app-shells/bash-completion/Manifest | 2 - |
13 |
.../bash-completion/bash-completion-2.7-r3.ebuild | 133 -------------------- |
14 |
.../bash-completion/bash-completion-2.8.ebuild | 135 --------------------- |
15 |
3 files changed, 270 deletions(-) |
16 |
|
17 |
diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest |
18 |
index 8e6ca751c11..e9d58832db6 100644 |
19 |
--- a/app-shells/bash-completion/Manifest |
20 |
+++ b/app-shells/bash-completion/Manifest |
21 |
@@ -1,5 +1,3 @@ |
22 |
-DIST bash-completion-2.7.tar.xz 280048 BLAKE2B 88b09f451fd4e14daf8e139951a4b65aaa9d9b1d86dceade388a726ac7f3caff2546597695c3f0cbd5dd64e20472d0cf3e98e0f367898b81d696d4ccb8f2fb73 SHA512 514709ad2e5f6bd4e20027c7049a1144c1854a37b653d5c11fad1cdf7a46d0e1afca725d6ce75d49691149e0de57be85747f704ac1c429ef4cea114bfbff8fcd |
23 |
-DIST bash-completion-2.8.tar.xz 286128 BLAKE2B a99faeb3c9ee2ea6d1cc9988e61951f4e688ac0b3c6837d1fd43381519fedf5f95167e8dbc166543b0235f3ac61d92af35eb8399efc0cd297a62849071dee5c7 SHA512 d839ef5a98811a2aade7ebdc0bc84c84a41c74db384f89913b06f3c25add1ba22528ac25392b19d27280685d258c74dcdc11247cbaae5b8d82f2c0b546abc268 |
24 |
DIST bash-completion-2.9.tar.xz 305788 BLAKE2B c8a05bbb16fb671d73025c2fc579f77569251974a57fa4125a8e0aebcbed4e50fc1a47b9743abab0264599ffdef30b33cb540c6c3ab0d8a3577c6dda95f622b6 SHA512 e864091196d670699bdb2af3fc40464788e79c932fa564afa7ba34a637aa1583db7dbceab0e7ba6718fac99e9fd2dfb03d1ee51d7cf279d925ad63f60401d7d5 |
25 |
DIST bashcomp-2.0.2.tar.gz 3625 BLAKE2B ebd835e23634e8a7491467ad66c53941763cea43bad75fe24982d3885be2d2ba132e5273a655fec34705224315d7a3f0248c030fb7685fc613ac4f489cde5bf5 SHA512 46bc1bcc32263135f44be68569459a409250dd2c81c18190735f11e13a26508e9d3cb91d24a8fe7b21bdea678347873b7ac1b67d5e8c78c8444011f85dfdcdce |
26 |
DIST bashcomp-2.0.3.tar.gz 3539 BLAKE2B 75304d144792cc7f6ad5455a05a65c33c646d6f7384d020a06a1fcf012cd51625a3dd0750ad539253453b1eede196c340286a1e81737f0835b5091609ba01295 SHA512 b2bd185ccbd4456939ccc731cc1983fcec2b9564a9920642a753fadd5d897fdb96b925ac1524657629d621d45b37d99076c8ae72511a827e96ff6c388d720008 |
27 |
|
28 |
diff --git a/app-shells/bash-completion/bash-completion-2.7-r3.ebuild b/app-shells/bash-completion/bash-completion-2.7-r3.ebuild |
29 |
deleted file mode 100644 |
30 |
index 58a5adc8514..00000000000 |
31 |
--- a/app-shells/bash-completion/bash-completion-2.7-r3.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,133 +0,0 @@ |
34 |
-# Copyright 1999-2018 Gentoo Foundation |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=6 |
38 |
- |
39 |
-BASHCOMP_P=bashcomp-2.0.2 |
40 |
-inherit versionator |
41 |
- |
42 |
-DESCRIPTION="Programmable Completion for bash" |
43 |
-HOMEPAGE="https://github.com/scop/bash-completion" |
44 |
-SRC_URI="https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz |
45 |
- https://bitbucket.org/mgorny/bashcomp2/downloads/${BASHCOMP_P}.tar.gz" |
46 |
- |
47 |
-LICENSE="GPL-2" |
48 |
-SLOT="0" |
49 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris" |
50 |
-IUSE="test" |
51 |
-# Multiple test failures, need to investigate the exact problem |
52 |
-RESTRICT="test" |
53 |
- |
54 |
-# completion collision with net-fs/mc |
55 |
-RDEPEND=">=app-shells/bash-4.3_p30-r1 |
56 |
- sys-apps/miscfiles |
57 |
- !app-eselect/eselect-bashcomp |
58 |
- !!net-fs/mc" |
59 |
-DEPEND="app-arch/xz-utils |
60 |
- test? ( |
61 |
- ${RDEPEND} |
62 |
- app-misc/dtach |
63 |
- dev-util/dejagnu |
64 |
- dev-tcltk/tcllib |
65 |
- )" |
66 |
-PDEPEND=">=app-shells/gentoo-bashcomp-20140911" |
67 |
- |
68 |
-# Remove unwanted completions. |
69 |
-STRIP_COMPLETIONS=( |
70 |
- # Slackware package stuff, quite generic names cause collisions |
71 |
- # (e.g. with sys-apps/pacman) |
72 |
- explodepkg installpkg makepkg pkgtool removepkg upgradepkg |
73 |
- |
74 |
- # Debian/Red Hat network stuff |
75 |
- ifdown ifup ifstatus |
76 |
- |
77 |
- # Installed in app-editors/vim-core |
78 |
- xxd |
79 |
- |
80 |
- # Now-dead symlinks to deprecated completions |
81 |
- hd ncal |
82 |
- |
83 |
- # Installed by sys-apps/util-linux-2.28 |
84 |
- mount umount mount.linux umount.linux |
85 |
- |
86 |
- # Installed by sys-apps/util-linux-2.31 |
87 |
- rfkill |
88 |
-) |
89 |
- |
90 |
-src_prepare() { |
91 |
- eapply "${WORKDIR}/${BASHCOMP_P}/${PN}"-2.1_p*.patch |
92 |
- # Bug 543100, update bug 601194 |
93 |
- eapply "${FILESDIR}/${PN}-2.1-escape-characters-r1.patch" |
94 |
- eapply_user |
95 |
- |
96 |
- # Remove implicit completions for vim. |
97 |
- # https://bugs.gentoo.org/649986 |
98 |
- sed -i -e 's/vi vim gvim rvim view rview rgvim rgview gview//' \ |
99 |
- bash_completion || die |
100 |
- rm test/completion/vi.exp || die |
101 |
-} |
102 |
- |
103 |
-src_test() { |
104 |
- # Tests need an interactive shell, #477066 |
105 |
- # idea stolen from: |
106 |
- # http://pkgs.fedoraproject.org/cgit/rpms/bash-completion.git/tree/bash-completion.spec |
107 |
- |
108 |
- # real-time output of the log ;-) |
109 |
- touch "${T}/dtach-test.log" || die |
110 |
- tail -f "${T}/dtach-test.log" & |
111 |
- local tail_pid=${!} |
112 |
- |
113 |
- nonfatal dtach -N "${T}/dtach.sock" \ |
114 |
- bash -c 'emake check &> "${T}"/dtach-test.log; echo ${?} > "${T}"/dtach-test.out' |
115 |
- |
116 |
- kill "${tail_pid}" |
117 |
- [[ -f ${T}/dtach-test.out ]] || die "Unable to run tests" |
118 |
- [[ $(<"${T}"/dtach-test.out) == 0 ]] || die "Tests failed" |
119 |
-} |
120 |
- |
121 |
-src_install() { |
122 |
- # work-around race conditions, bug #526996 |
123 |
- mkdir -p "${ED}"/usr/share/bash-completion/{completions,helpers} || die |
124 |
- |
125 |
- emake DESTDIR="${D}" profiledir="${EPREFIX}"/etc/bash/bashrc.d install |
126 |
- |
127 |
- local file |
128 |
- for file in "${STRIP_COMPLETIONS[@]}"; do |
129 |
- rm "${ED}"/usr/share/bash-completion/completions/${file} || die |
130 |
- done |
131 |
- # remove deprecated completions (moved to other packages) |
132 |
- rm "${ED}"/usr/share/bash-completion/completions/_* || die |
133 |
- |
134 |
- dodoc AUTHORS CHANGES CONTRIBUTING.md README.md |
135 |
- |
136 |
- # install the eselect module |
137 |
- insinto /usr/share/eselect/modules |
138 |
- doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect" |
139 |
- doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5" |
140 |
-} |
141 |
- |
142 |
-pkg_postinst() { |
143 |
- local v |
144 |
- for v in ${REPLACING_VERSIONS}; do |
145 |
- if ! version_is_at_least 2.1-r90 ${v}; then |
146 |
- ewarn "For bash-completion autoloader to work, all completions need to" |
147 |
- ewarn "be installed in /usr/share/bash-completion/completions. You may" |
148 |
- ewarn "need to rebuild packages that installed completions in the old" |
149 |
- ewarn "location. You can do this using:" |
150 |
- ewarn |
151 |
- ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +" |
152 |
- ewarn |
153 |
- ewarn "After the rebuild, you should remove the old setup symlinks:" |
154 |
- ewarn |
155 |
- ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete" |
156 |
- fi |
157 |
- done |
158 |
- |
159 |
- if has_version 'app-shells/zsh'; then |
160 |
- elog |
161 |
- elog "If you are interested in using the provided bash completion functions with" |
162 |
- elog "zsh, valuable tips on the effective use of bashcompinit are available:" |
163 |
- elog " http://www.zsh.org/mla/workers/2003/msg00046.html" |
164 |
- elog |
165 |
- fi |
166 |
-} |
167 |
|
168 |
diff --git a/app-shells/bash-completion/bash-completion-2.8.ebuild b/app-shells/bash-completion/bash-completion-2.8.ebuild |
169 |
deleted file mode 100644 |
170 |
index 06b8bbba722..00000000000 |
171 |
--- a/app-shells/bash-completion/bash-completion-2.8.ebuild |
172 |
+++ /dev/null |
173 |
@@ -1,135 +0,0 @@ |
174 |
-# Copyright 1999-2019 Gentoo Authors |
175 |
-# Distributed under the terms of the GNU General Public License v2 |
176 |
- |
177 |
-EAPI=6 |
178 |
- |
179 |
-BASHCOMP_P=bashcomp-2.0.2 |
180 |
-inherit eapi7-ver |
181 |
- |
182 |
-DESCRIPTION="Programmable Completion for bash" |
183 |
-HOMEPAGE="https://github.com/scop/bash-completion" |
184 |
-SRC_URI=" |
185 |
- https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz |
186 |
- https://bitbucket.org/mgorny/bashcomp2/downloads/${BASHCOMP_P}.tar.gz" |
187 |
- |
188 |
-LICENSE="GPL-2" |
189 |
-SLOT="0" |
190 |
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris" |
191 |
-IUSE="test" |
192 |
-# Multiple test failures, need to investigate the exact problem |
193 |
-RESTRICT="test" |
194 |
- |
195 |
-# completion collision with net-fs/mc |
196 |
-RDEPEND=" |
197 |
- >=app-shells/bash-4.3_p30-r1 |
198 |
- sys-apps/miscfiles |
199 |
- !app-eselect/eselect-bashcomp |
200 |
- !!net-fs/mc" |
201 |
- |
202 |
-DEPEND=" |
203 |
- app-arch/xz-utils |
204 |
- test? ( |
205 |
- ${RDEPEND} |
206 |
- app-misc/dtach |
207 |
- dev-util/dejagnu |
208 |
- dev-tcltk/tcllib |
209 |
- )" |
210 |
- |
211 |
-PDEPEND=">=app-shells/gentoo-bashcomp-20140911" |
212 |
- |
213 |
-# Remove unwanted completions. |
214 |
-STRIP_COMPLETIONS=( |
215 |
- # Slackware package stuff, quite generic names cause collisions |
216 |
- # (e.g. with sys-apps/pacman) |
217 |
- explodepkg installpkg makepkg pkgtool removepkg upgradepkg |
218 |
- |
219 |
- # Debian/Red Hat network stuff |
220 |
- ifdown ifup ifstatus |
221 |
- |
222 |
- # Installed in app-editors/vim-core |
223 |
- xxd |
224 |
- |
225 |
- # Now-dead symlinks to deprecated completions |
226 |
- hd ncal |
227 |
- |
228 |
- # Installed by sys-apps/util-linux-2.28 |
229 |
- mount umount mount.linux umount.linux |
230 |
-) |
231 |
- |
232 |
-src_prepare() { |
233 |
- eapply "${WORKDIR}/${BASHCOMP_P}/${PN}"-2.1_p*.patch |
234 |
- # Bug 543100, update bug 601194 |
235 |
- eapply "${FILESDIR}/${PN}-2.1-escape-characters-r1.patch" |
236 |
- eapply_user |
237 |
- |
238 |
- # Remove implicit completions for vim. |
239 |
- # https://bugs.gentoo.org/649986 |
240 |
- sed -i -e 's/vi vim gvim rvim view rview rgvim rgview gview//' \ |
241 |
- bash_completion || die |
242 |
- rm test/completion/vi.exp || die |
243 |
-} |
244 |
- |
245 |
-src_test() { |
246 |
- # Tests need an interactive shell, #477066 |
247 |
- # idea stolen from: |
248 |
- # http://pkgs.fedoraproject.org/cgit/rpms/bash-completion.git/tree/bash-completion.spec |
249 |
- |
250 |
- # real-time output of the log ;-) |
251 |
- touch "${T}/dtach-test.log" || die |
252 |
- tail -f "${T}/dtach-test.log" & |
253 |
- local tail_pid=${!} |
254 |
- |
255 |
- nonfatal dtach -N "${T}/dtach.sock" \ |
256 |
- bash -c 'emake check &> "${T}"/dtach-test.log; echo ${?} > "${T}"/dtach-test.out' |
257 |
- |
258 |
- kill "${tail_pid}" |
259 |
- [[ -f ${T}/dtach-test.out ]] || die "Unable to run tests" |
260 |
- [[ $(<"${T}"/dtach-test.out) == 0 ]] || die "Tests failed" |
261 |
-} |
262 |
- |
263 |
-src_install() { |
264 |
- # work-around race conditions, bug #526996 |
265 |
- mkdir -p "${ED}"/usr/share/bash-completion/{completions,helpers} || die |
266 |
- |
267 |
- emake DESTDIR="${D}" profiledir="${EPREFIX}"/etc/bash/bashrc.d install |
268 |
- |
269 |
- local file |
270 |
- for file in "${STRIP_COMPLETIONS[@]}"; do |
271 |
- rm "${ED}"/usr/share/bash-completion/completions/${file} || die |
272 |
- done |
273 |
- # remove deprecated completions (moved to other packages) |
274 |
- rm "${ED}"/usr/share/bash-completion/completions/_* || die |
275 |
- |
276 |
- dodoc AUTHORS CHANGES CONTRIBUTING.md README.md |
277 |
- |
278 |
- # install the eselect module |
279 |
- insinto /usr/share/eselect/modules |
280 |
- doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect" |
281 |
- doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5" |
282 |
-} |
283 |
- |
284 |
-pkg_postinst() { |
285 |
- local v |
286 |
- for v in ${REPLACING_VERSIONS}; do |
287 |
- if ver_test "${v}" -lt 2.1-r90; then |
288 |
- ewarn "For bash-completion autoloader to work, all completions need to" |
289 |
- ewarn "be installed in /usr/share/bash-completion/completions. You may" |
290 |
- ewarn "need to rebuild packages that installed completions in the old" |
291 |
- ewarn "location. You can do this using:" |
292 |
- ewarn |
293 |
- ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +" |
294 |
- ewarn |
295 |
- ewarn "After the rebuild, you should remove the old setup symlinks:" |
296 |
- ewarn |
297 |
- ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete" |
298 |
- fi |
299 |
- done |
300 |
- |
301 |
- if has_version 'app-shells/zsh'; then |
302 |
- elog |
303 |
- elog "If you are interested in using the provided bash completion functions with" |
304 |
- elog "zsh, valuable tips on the effective use of bashcompinit are available:" |
305 |
- elog " http://www.zsh.org/mla/workers/2003/msg00046.html" |
306 |
- elog |
307 |
- fi |
308 |
-} |