Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/
Date: Mon, 04 May 2020 09:37:12
Message-Id: 1588585005.c5e52c2a7d5c2789d9e17ebac5397753d27f661d.mgorny@gentoo
1 commit: c5e52c2a7d5c2789d9e17ebac5397753d27f661d
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 4 09:29:05 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon May 4 09:36:45 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5e52c2a
7
8 app-shells/bash-completion: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 app-shells/bash-completion/Manifest | 1 -
13 .../bash-completion/bash-completion-2.9-r1.ebuild | 156 ---------------------
14 2 files changed, 157 deletions(-)
15
16 diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
17 index cb45623e7cc..3620b452cc2 100644
18 --- a/app-shells/bash-completion/Manifest
19 +++ b/app-shells/bash-completion/Manifest
20 @@ -1,3 +1,2 @@
21 DIST bash-completion-2.10.tar.xz 310764 BLAKE2B b6b96f049b44eb455805916bbbeb0c9578104aa4c8c736801fd27c7268e4de70424eebbb5d1e4d1841273b1c4e169da4f369f2f65276349ead4aa7944aa193b2 SHA512 d434e0e48b25328e8c6b43ed64e58f56459186434754ee972795edd031ce1864038b53926b218fe06e5b3882682db4dec5101b3124362c0137101d3fa6d87cd7
22 -DIST bash-completion-2.9.tar.xz 305788 BLAKE2B c8a05bbb16fb671d73025c2fc579f77569251974a57fa4125a8e0aebcbed4e50fc1a47b9743abab0264599ffdef30b33cb540c6c3ab0d8a3577c6dda95f622b6 SHA512 e864091196d670699bdb2af3fc40464788e79c932fa564afa7ba34a637aa1583db7dbceab0e7ba6718fac99e9fd2dfb03d1ee51d7cf279d925ad63f60401d7d5
23 DIST bashcomp-2.0.3.tar.gz 3539 BLAKE2B 75304d144792cc7f6ad5455a05a65c33c646d6f7384d020a06a1fcf012cd51625a3dd0750ad539253453b1eede196c340286a1e81737f0835b5091609ba01295 SHA512 b2bd185ccbd4456939ccc731cc1983fcec2b9564a9920642a753fadd5d897fdb96b925ac1524657629d621d45b37d99076c8ae72511a827e96ff6c388d720008
24
25 diff --git a/app-shells/bash-completion/bash-completion-2.9-r1.ebuild b/app-shells/bash-completion/bash-completion-2.9-r1.ebuild
26 deleted file mode 100644
27 index c7c30545e25..00000000000
28 --- a/app-shells/bash-completion/bash-completion-2.9-r1.ebuild
29 +++ /dev/null
30 @@ -1,156 +0,0 @@
31 -# Copyright 1999-2020 Gentoo Authors
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI=7
35 -
36 -BASHCOMP_P=bashcomp-2.0.3
37 -PYTHON_COMPAT=( python3_{6,7} )
38 -inherit bash-completion-r1 python-any-r1
39 -
40 -DESCRIPTION="Programmable Completion for bash"
41 -HOMEPAGE="https://github.com/scop/bash-completion"
42 -SRC_URI="
43 - https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz
44 - eselect? ( https://github.com/mgorny/bashcomp2/releases/download/v${BASHCOMP_P#*-}/${BASHCOMP_P}.tar.gz )"
45 -
46 -LICENSE="GPL-2+"
47 -SLOT="0"
48 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
49 -IUSE="+eselect test"
50 -RESTRICT="test"
51 -
52 -# completion collision with net-fs/mc
53 -RDEPEND=">=app-shells/bash-4.3_p30-r1:0
54 - sys-apps/miscfiles
55 - !!net-fs/mc"
56 -DEPEND="app-arch/xz-utils
57 - test? (
58 - ${RDEPEND}
59 - app-misc/dtach
60 - dev-util/dejagnu
61 - dev-tcltk/tcllib
62 - $(python_gen_any_dep '
63 - dev-python/pexpect[${PYTHON_USEDEP}]
64 - dev-python/pytest[${PYTHON_USEDEP}]
65 - ')
66 - )"
67 -PDEPEND=">=app-shells/gentoo-bashcomp-20140911"
68 -
69 -strip_completions() {
70 - # Remove unwanted completions.
71 - local strip_completions=(
72 - # Slackware package stuff, quite generic names cause collisions
73 - # (e.g. with sys-apps/pacman)
74 - explodepkg installpkg makepkg pkgtool removepkg upgradepkg
75 -
76 - # Debian/Red Hat network stuff
77 - ifdown ifup ifquery ifstatus
78 -
79 - # Installed in app-editors/vim-core
80 - xxd
81 -
82 - # Now-dead symlinks to deprecated completions
83 - hd ncal
84 - )
85 - if [[ ${ARCH} != *-fbsd && ${ARCH} != *-freebsd ]]; then
86 - strip_completions+=(
87 - freebsd-update kldload kldunload portinstall portsnap
88 - pkg_deinstall pkg_delete pkg_info
89 - )
90 - fi
91 -
92 - local file
93 - for file in "${strip_completions[@]}"; do
94 - rm "${ED}"/usr/share/bash-completion/completions/${file} ||
95 - die "stripping ${file} failed"
96 - done
97 -
98 - # remove deprecated completions (moved to other packages)
99 - rm "${ED}"/usr/share/bash-completion/completions/_* || die
100 -}
101 -
102 -pkg_setup() {
103 - use test && python-any-r1_pkg_setup
104 -}
105 -
106 -python_check_deps() {
107 - has_version "dev-python/pexpect[${PYTHON_USEDEP}]" &&
108 - has_version "dev-python/pytest[${PYTHON_USEDEP}]"
109 -}
110 -
111 -src_prepare() {
112 - use eselect &&
113 - eapply "${WORKDIR}/${BASHCOMP_P}/bash-completion-blacklist-support.patch"
114 - # Bug 543100, update bug 601194
115 - eapply "${FILESDIR}/${PN}-2.1-escape-characters-r1.patch"
116 - eapply_user
117 -}
118 -
119 -src_test() {
120 - # Tests need an interactive shell, #477066
121 - # idea stolen from:
122 - # http://pkgs.fedoraproject.org/cgit/rpms/bash-completion.git/tree/bash-completion.spec
123 -
124 - # real-time output of the log ;-)
125 - touch "${T}/dtach-test.log" || die
126 - tail -f "${T}/dtach-test.log" &
127 - local tail_pid=${!}
128 -
129 - # override the default expect timeout and buffer size to avoid tests
130 - # failing randomly due to cold cache, busy system or just more output
131 - # than upstream anticipated (they run tests on pristine docker
132 - # installs of binary distros)
133 - nonfatal dtach -N "${T}/dtach.sock" \
134 - bash -c 'emake check RUNTESTFLAGS="OPT_TIMEOUT=300 OPT_BUFFER_SIZE=1000000" PYTESTFLAGS="-vv" \
135 - &> "${T}"/dtach-test.log; echo ${?} > "${T}"/dtach-test.out'
136 -
137 - kill "${tail_pid}"
138 - [[ -f ${T}/dtach-test.out ]] || die "Unable to run tests"
139 - [[ $(<"${T}"/dtach-test.out) == 0 ]] || die "Tests failed"
140 -}
141 -
142 -src_install() {
143 - # work-around race conditions, bug #526996
144 - mkdir -p "${ED}"/usr/share/bash-completion/{completions,helpers} || die
145 -
146 - emake DESTDIR="${D}" profiledir="${EPREFIX}"/etc/bash/bashrc.d install
147 -
148 - strip_completions
149 - # fix missing aliases
150 - bashcomp_alias tar bsdtar gtar star
151 -
152 - dodoc AUTHORS CHANGES CONTRIBUTING.md README.md
153 -
154 - # install the eselect module
155 - if use eselect; then
156 - insinto /usr/share/eselect/modules
157 - doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect"
158 - doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5"
159 - fi
160 -}
161 -
162 -pkg_postinst() {
163 - local v
164 - for v in ${REPLACING_VERSIONS}; do
165 - if ver_test "${v}" -lt 2.1-r90; then
166 - ewarn "For bash-completion autoloader to work, all completions need to"
167 - ewarn "be installed in /usr/share/bash-completion/completions. You may"
168 - ewarn "need to rebuild packages that installed completions in the old"
169 - ewarn "location. You can do this using:"
170 - ewarn
171 - ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +"
172 - ewarn
173 - ewarn "After the rebuild, you should remove the old setup symlinks:"
174 - ewarn
175 - ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete"
176 - fi
177 - done
178 -
179 - if has_version 'app-shells/zsh'; then
180 - elog
181 - elog "If you are interested in using the provided bash completion functions with"
182 - elog "zsh, valuable tips on the effective use of bashcompinit are available:"
183 - elog " http://www.zsh.org/mla/workers/2003/msg00046.html"
184 - elog
185 - fi
186 -}