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: Sun, 03 Nov 2019 15:29:41
Message-Id: 1572794970.b63bc8a8cce80bf28039eabecff5d3e33f607277.mgorny@gentoo
1 commit: b63bc8a8cce80bf28039eabecff5d3e33f607277
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 3 15:16:22 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 3 15:29:30 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b63bc8a8
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 | 1 -
13 .../bash-completion/bash-completion-2.9.ebuild | 154 ---------------------
14 2 files changed, 155 deletions(-)
15
16 diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
17 index e9d58832db6..e53bcde1d09 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.9.tar.xz 305788 BLAKE2B c8a05bbb16fb671d73025c2fc579f77569251974a57fa4125a8e0aebcbed4e50fc1a47b9743abab0264599ffdef30b33cb540c6c3ab0d8a3577c6dda95f622b6 SHA512 e864091196d670699bdb2af3fc40464788e79c932fa564afa7ba34a637aa1583db7dbceab0e7ba6718fac99e9fd2dfb03d1ee51d7cf279d925ad63f60401d7d5
22 -DIST bashcomp-2.0.2.tar.gz 3625 BLAKE2B ebd835e23634e8a7491467ad66c53941763cea43bad75fe24982d3885be2d2ba132e5273a655fec34705224315d7a3f0248c030fb7685fc613ac4f489cde5bf5 SHA512 46bc1bcc32263135f44be68569459a409250dd2c81c18190735f11e13a26508e9d3cb91d24a8fe7b21bdea678347873b7ac1b67d5e8c78c8444011f85dfdcdce
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.ebuild b/app-shells/bash-completion/bash-completion-2.9.ebuild
26 deleted file mode 100644
27 index da4cf1463bc..00000000000
28 --- a/app-shells/bash-completion/bash-completion-2.9.ebuild
29 +++ /dev/null
30 @@ -1,154 +0,0 @@
31 -# Copyright 1999-2019 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.2
37 -PYTHON_COMPAT=( python3_{5,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 - https://bitbucket.org/mgorny/bashcomp2/downloads/${BASHCOMP_P}.tar.gz"
45 -
46 -LICENSE="GPL-2+"
47 -SLOT="0"
48 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
49 -IUSE="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 - !app-eselect/eselect-bashcomp
56 - !!net-fs/mc"
57 -DEPEND="app-arch/xz-utils
58 - test? (
59 - ${RDEPEND}
60 - app-misc/dtach
61 - dev-util/dejagnu
62 - dev-tcltk/tcllib
63 - $(python_gen_any_dep '
64 - dev-python/pexpect[${PYTHON_USEDEP}]
65 - dev-python/pytest[${PYTHON_USEDEP}]
66 - ')
67 - )"
68 -PDEPEND=">=app-shells/gentoo-bashcomp-20140911"
69 -
70 -strip_completions() {
71 - # Remove unwanted completions.
72 - local strip_completions=(
73 - # Slackware package stuff, quite generic names cause collisions
74 - # (e.g. with sys-apps/pacman)
75 - explodepkg installpkg makepkg pkgtool removepkg upgradepkg
76 -
77 - # Debian/Red Hat network stuff
78 - ifdown ifup ifquery ifstatus
79 -
80 - # Installed in app-editors/vim-core
81 - xxd
82 -
83 - # Now-dead symlinks to deprecated completions
84 - hd ncal
85 - )
86 - if [[ ${ARCH} != *-fbsd && ${ARCH} != *-freebsd ]]; then
87 - strip_completions+=(
88 - freebsd-update kldload kldunload portinstall portsnap
89 - pkg_deinstall pkg_delete pkg_info
90 - )
91 - fi
92 -
93 - local file
94 - for file in "${strip_completions[@]}"; do
95 - rm "${ED}"/usr/share/bash-completion/completions/${file} ||
96 - die "stripping ${file} failed"
97 - done
98 -
99 - # remove deprecated completions (moved to other packages)
100 - rm "${ED}"/usr/share/bash-completion/completions/_* || die
101 -}
102 -
103 -pkg_setup() {
104 - use test && python-any-r1_pkg_setup
105 -}
106 -
107 -python_check_deps() {
108 - has_version "dev-python/pexpect[${PYTHON_USEDEP}]" &&
109 - has_version "dev-python/pytest[${PYTHON_USEDEP}]"
110 -}
111 -
112 -src_prepare() {
113 - eapply "${WORKDIR}/${BASHCOMP_P}/${PN}"-2.1_p*.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 - insinto /usr/share/eselect/modules
156 - doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect"
157 - doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5"
158 -}
159 -
160 -pkg_postinst() {
161 - local v
162 - for v in ${REPLACING_VERSIONS}; do
163 - if ver_test "${v}" -lt 2.1-r90; then
164 - ewarn "For bash-completion autoloader to work, all completions need to"
165 - ewarn "be installed in /usr/share/bash-completion/completions. You may"
166 - ewarn "need to rebuild packages that installed completions in the old"
167 - ewarn "location. You can do this using:"
168 - ewarn
169 - ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +"
170 - ewarn
171 - ewarn "After the rebuild, you should remove the old setup symlinks:"
172 - ewarn
173 - ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete"
174 - fi
175 - done
176 -
177 - if has_version 'app-shells/zsh'; then
178 - elog
179 - elog "If you are interested in using the provided bash completion functions with"
180 - elog "zsh, valuable tips on the effective use of bashcompinit are available:"
181 - elog " http://www.zsh.org/mla/workers/2003/msg00046.html"
182 - elog
183 - fi
184 -}