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