public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/
Date: Sun, 28 Apr 2019 08:42:13 +0000 (UTC)	[thread overview]
Message-ID: <1556440922.f5f9b0967b80dd78b587883c30ec729c0dd587e7.mgorny@gentoo> (raw)

commit:     f5f9b0967b80dd78b587883c30ec729c0dd587e7
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 28 08:34:23 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Apr 28 08:42:02 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5f9b096

app-shells/bash-completion: Bump to 2.9

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-shells/bash-completion/Manifest                |   1 +
 .../bash-completion/bash-completion-2.9.ebuild     | 148 +++++++++++++++++++++
 2 files changed, 149 insertions(+)

diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest
index 203d0a92140..cfe339f613e 100644
--- a/app-shells/bash-completion/Manifest
+++ b/app-shells/bash-completion/Manifest
@@ -1,3 +1,4 @@
 DIST bash-completion-2.7.tar.xz 280048 BLAKE2B 88b09f451fd4e14daf8e139951a4b65aaa9d9b1d86dceade388a726ac7f3caff2546597695c3f0cbd5dd64e20472d0cf3e98e0f367898b81d696d4ccb8f2fb73 SHA512 514709ad2e5f6bd4e20027c7049a1144c1854a37b653d5c11fad1cdf7a46d0e1afca725d6ce75d49691149e0de57be85747f704ac1c429ef4cea114bfbff8fcd
 DIST bash-completion-2.8.tar.xz 286128 BLAKE2B a99faeb3c9ee2ea6d1cc9988e61951f4e688ac0b3c6837d1fd43381519fedf5f95167e8dbc166543b0235f3ac61d92af35eb8399efc0cd297a62849071dee5c7 SHA512 d839ef5a98811a2aade7ebdc0bc84c84a41c74db384f89913b06f3c25add1ba22528ac25392b19d27280685d258c74dcdc11247cbaae5b8d82f2c0b546abc268
+DIST bash-completion-2.9.tar.xz 305788 BLAKE2B c8a05bbb16fb671d73025c2fc579f77569251974a57fa4125a8e0aebcbed4e50fc1a47b9743abab0264599ffdef30b33cb540c6c3ab0d8a3577c6dda95f622b6 SHA512 e864091196d670699bdb2af3fc40464788e79c932fa564afa7ba34a637aa1583db7dbceab0e7ba6718fac99e9fd2dfb03d1ee51d7cf279d925ad63f60401d7d5
 DIST bashcomp-2.0.2.tar.gz 3625 BLAKE2B ebd835e23634e8a7491467ad66c53941763cea43bad75fe24982d3885be2d2ba132e5273a655fec34705224315d7a3f0248c030fb7685fc613ac4f489cde5bf5 SHA512 46bc1bcc32263135f44be68569459a409250dd2c81c18190735f11e13a26508e9d3cb91d24a8fe7b21bdea678347873b7ac1b67d5e8c78c8444011f85dfdcdce

diff --git a/app-shells/bash-completion/bash-completion-2.9.ebuild b/app-shells/bash-completion/bash-completion-2.9.ebuild
new file mode 100644
index 00000000000..41547998e7a
--- /dev/null
+++ b/app-shells/bash-completion/bash-completion-2.9.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+BASHCOMP_P=bashcomp-2.0.2
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit python-any-r1
+
+DESCRIPTION="Programmable Completion for bash"
+HOMEPAGE="https://github.com/scop/bash-completion"
+SRC_URI="
+	https://github.com/scop/bash-completion/releases/download/${PV}/${P}.tar.xz
+	https://bitbucket.org/mgorny/bashcomp2/downloads/${BASHCOMP_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+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"
+IUSE="test"
+RESTRICT="test"
+
+# completion collision with net-fs/mc
+RDEPEND=">=app-shells/bash-4.3_p30-r1:0
+	sys-apps/miscfiles
+	!app-eselect/eselect-bashcomp
+	!!net-fs/mc"
+DEPEND="app-arch/xz-utils
+	test? (
+		${RDEPEND}
+		app-misc/dtach
+		dev-util/dejagnu
+		dev-tcltk/tcllib
+		$(python_gen_any_dep '
+			dev-python/pexpect[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)"
+PDEPEND=">=app-shells/gentoo-bashcomp-20140911"
+
+strip_completions() {
+	# Remove unwanted completions.
+	local strip_completions=(
+		# Slackware package stuff, quite generic names cause collisions
+		# (e.g. with sys-apps/pacman)
+		explodepkg installpkg makepkg pkgtool removepkg upgradepkg
+
+		# Debian/Red Hat network stuff
+		ifdown ifup ifstatus
+
+		# Installed in app-editors/vim-core
+		xxd
+
+		# Now-dead symlinks to deprecated completions
+		hd ncal
+	)
+	if [[ ${ARCH} != *-fbsd && ${ARCH} != *-freebsd ]]; then
+		strip_completions+=(
+			freebsd-update kldload kldunload portinstall portsnap
+			pkg_deinstall pkg_delete pkg_info
+		)
+	fi
+
+	local file
+	for file in "${strip_completions[@]}"; do
+		rm "${ED}"/usr/share/bash-completion/completions/${file} ||
+			die "stripping ${file} failed"
+	done
+
+	# remove deprecated completions (moved to other packages)
+	rm "${ED}"/usr/share/bash-completion/completions/_* || die
+}
+
+python_check_deps() {
+	has_version "dev-python/pexpect[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	eapply "${WORKDIR}/${BASHCOMP_P}/${PN}"-2.1_p*.patch
+	# Bug 543100, update bug 601194
+	eapply "${FILESDIR}/${PN}-2.1-escape-characters-r1.patch"
+	eapply_user
+}
+
+src_test() {
+	# Tests need an interactive shell, #477066
+	# idea stolen from:
+	# http://pkgs.fedoraproject.org/cgit/rpms/bash-completion.git/tree/bash-completion.spec
+
+	# real-time output of the log ;-)
+	touch "${T}/dtach-test.log" || die
+	tail -f "${T}/dtach-test.log" &
+	local tail_pid=${!}
+
+	# override the default expect timeout and buffer size to avoid tests
+	# failing randomly due to cold cache, busy system or just more output
+	# than upstream anticipated (they run tests on pristine docker
+	# installs of binary distros)
+	nonfatal dtach -N "${T}/dtach.sock" \
+		bash -c 'emake check RUNTESTFLAGS="OPT_TIMEOUT=300 OPT_BUFFER_SIZE=1000000" PYTESTFLAGS="-vv" \
+			&> "${T}"/dtach-test.log; echo ${?} > "${T}"/dtach-test.out'
+
+	kill "${tail_pid}"
+	[[ -f ${T}/dtach-test.out ]] || die "Unable to run tests"
+	[[ $(<"${T}"/dtach-test.out) == 0 ]] || die "Tests failed"
+}
+
+src_install() {
+	# work-around race conditions, bug #526996
+	mkdir -p "${ED}"/usr/share/bash-completion/{completions,helpers} || die
+
+	emake DESTDIR="${D}" profiledir="${EPREFIX}"/etc/bash/bashrc.d install
+
+	strip_completions
+
+	dodoc AUTHORS CHANGES CONTRIBUTING.md README.md
+
+	# install the eselect module
+	insinto /usr/share/eselect/modules
+	doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect"
+	doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5"
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "${v}" -lt 2.1-r90; then
+			ewarn "For bash-completion autoloader to work, all completions need to"
+			ewarn "be installed in /usr/share/bash-completion/completions. You may"
+			ewarn "need to rebuild packages that installed completions in the old"
+			ewarn "location. You can do this using:"
+			ewarn
+			ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +"
+			ewarn
+			ewarn "After the rebuild, you should remove the old setup symlinks:"
+			ewarn
+			ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete"
+		fi
+	done
+
+	if has_version 'app-shells/zsh'; then
+		elog
+		elog "If you are interested in using the provided bash completion functions with"
+		elog "zsh, valuable tips on the effective use of bashcompinit are available:"
+		elog "  http://www.zsh.org/mla/workers/2003/msg00046.html"
+		elog
+	fi
+}


             reply	other threads:[~2019-04-28  8:42 UTC|newest]

Thread overview: 149+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-28  8:42 Michał Górny [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-02-16  7:22 [gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/ Ulrich Müller
2025-02-07  9:27 Arthur Zamarin
2025-01-10  7:38 Arthur Zamarin
2024-12-06 19:45 Arthur Zamarin
2024-12-06 19:45 Arthur Zamarin
2024-07-08  0:48 Sam James
2024-07-06 17:40 Arthur Zamarin
2024-06-08 11:12 Arthur Zamarin
2024-06-08 11:06 Arthur Zamarin
2024-06-07 13:35 Arthur Zamarin
2024-06-07 13:35 Arthur Zamarin
2024-06-07  6:26 Joonas Niilola
2024-06-07  6:26 Joonas Niilola
2024-06-06 17:30 Arthur Zamarin
2024-06-06 17:30 Arthur Zamarin
2024-06-06 17:30 Arthur Zamarin
2024-06-06 17:30 Arthur Zamarin
2024-06-06 17:30 Arthur Zamarin
2024-05-10 12:56 Joonas Niilola
2024-05-03 12:45 Sam James
2024-05-03 12:39 Sam James
2024-05-03 12:38 Sam James
2024-05-03 12:36 Sam James
2024-05-03 10:48 Arthur Zamarin
2024-05-03 10:48 Arthur Zamarin
2024-05-03 10:48 Arthur Zamarin
2024-03-03 15:55 Michał Górny
2024-03-03 15:25 Michał Górny
2023-06-10 10:25 Sam James
2023-03-03 13:29 Michał Górny
2023-03-03 13:29 Michał Górny
2023-03-03 13:29 Michał Górny
2023-03-03 13:29 Michał Górny
2023-03-03 13:29 Michał Górny
2023-03-03 13:29 Michał Górny
2023-03-03 13:29 Michał Górny
2023-03-03 13:29 Michał Górny
2023-03-03 13:29 Michał Górny
2022-12-05 20:00 Michał Górny
2022-08-28  7:41 WANG Xuerui
2022-05-07  7:44 Sam James
2022-04-23 15:15 Mike Gilbert
2021-09-18 22:50 James Le Cuirot
2021-07-22  3:19 Georgy Yakovlev
2021-04-14  7:36 Michał Górny
2021-01-06 13:26 Fabian Groffen
2020-12-27 14:01 Fabian Groffen
2020-09-18  9:38 Michał Górny
2020-09-02 22:48 Sam James
2020-07-27 10:02 Michał Górny
2020-07-27  8:30 Michał Górny
2020-05-04  9:37 Michał Górny
2020-05-04  9:37 Michał Górny
2020-03-31 17:51 Mart Raudsepp
2020-02-24 11:31 Agostino Sarubbo
2020-02-20 18:47 Sergei Trofimovich
2020-02-17 12:17 Agostino Sarubbo
2020-02-17 12:13 Agostino Sarubbo
2020-02-17 12:09 Agostino Sarubbo
2020-02-17 11:47 Agostino Sarubbo
2020-02-17 11:45 Agostino Sarubbo
2019-12-07 16:59 Michał Górny
2019-12-07  9:15 Michał Górny
2019-11-03 15:29 Michał Górny
2019-10-30 21:56 Sergei Trofimovich
2019-09-22  7:01 Matt Turner
2019-09-13 17:51 Mikle Kolyada
2019-09-09  6:02 Agostino Sarubbo
2019-09-09  6:00 Agostino Sarubbo
2019-09-09  5:54 Agostino Sarubbo
2019-09-09  5:50 Agostino Sarubbo
2019-09-09  0:24 Aaron Bauman
2019-09-08 19:15 Thomas Deutschmann
2019-09-08 18:26 Sergei Trofimovich
2019-09-08  6:43 Michał Górny
2019-07-28 11:09 Mikle Kolyada
2019-06-25 20:05 Sergei Trofimovich
2019-06-06  6:46 Agostino Sarubbo
2019-06-05 11:14 Agostino Sarubbo
2019-06-04 14:48 Agostino Sarubbo
2019-05-30 20:30 Sergei Trofimovich
2019-05-26 22:27 Thomas Deutschmann
2019-05-26 11:07 Mikle Kolyada
2019-05-26  8:27 Sergei Trofimovich
2019-05-25 21:11 Michał Górny
2019-05-25 21:11 Michał Górny
2019-05-25 19:57 Michał Górny
2019-05-25 18:45 Aaron Bauman
2019-04-30  6:11 Michał Górny
2019-04-28 12:16 Michał Górny
2019-04-28 10:54 Michał Górny
2019-04-28  8:42 Michał Górny
2019-04-28  8:42 Michał Górny
2019-04-28  8:42 Michał Górny
2019-04-28  8:42 Michał Górny
2019-04-28  8:42 Michał Górny
2019-04-08 13:20 Aaron Bauman
2019-04-08  6:42 Mikle Kolyada
2019-03-16 21:57 Sergei Trofimovich
2019-03-16 14:06 Mikle Kolyada
2019-03-14 21:53 Sergei Trofimovich
2019-03-10 20:35 Sergei Trofimovich
2019-03-10 13:37 Mikle Kolyada
2019-03-10 13:35 Mikle Kolyada
2018-09-28  9:30 Michał Górny
2018-09-28  9:30 Michał Górny
2018-09-28  9:30 Michał Górny
2018-09-28  9:30 Michał Górny
2018-09-06 21:22 Michał Górny
2018-09-06 21:22 Michał Górny
2018-05-26  9:57 Mikle Kolyada
2018-05-15 21:58 Patrice Clement
2018-05-08 18:43 Sergei Trofimovich
2018-05-03  7:06 Mart Raudsepp
2018-04-21  9:20 Mikle Kolyada
2018-04-19 22:14 Sergei Trofimovich
2018-04-10 14:48 Michał Górny
2018-04-10 14:48 Michał Górny
2018-04-01 11:09 Tobias Klausmann
2018-03-30 13:32 Aaron Bauman
2018-03-27 22:32 Sergei Trofimovich
2018-03-26 16:14 Michał Górny
2018-03-26 16:14 Michał Górny
2018-03-13 22:18 Michał Górny
2018-03-12 17:49 Michał Górny
2018-03-11 15:56 Michał Górny
2018-01-05  9:43 Michał Górny
2018-01-02  6:19 Michał Górny
2017-11-25 19:55 David Seifert
2017-10-23 21:31 Michał Górny
2017-07-02 21:46 Michał Górny
2017-07-02 18:22 Michał Górny
2017-06-28  8:23 Michał Górny
2017-06-28  8:23 Michał Górny
2017-06-20 13:15 Alexis Ballier
2017-04-24 18:29 Michał Górny
2017-02-18  5:50 Markus Meier
2017-01-16 19:56 Tobias Klausmann
2017-01-14 11:44 Jeroen Roovers
2017-01-08  5:07 Aaron Bauman
2016-08-13 18:32 Michał Górny
2016-04-09 10:16 Michał Górny
2016-03-26 15:55 Michał Górny
2016-03-26 15:54 Michał Górny
2016-03-26 15:54 Michał Górny
2016-02-19 13:41 Michał Górny
2016-01-28 15:37 Ian Delaney
2016-01-28 15:37 Ian Delaney

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1556440922.f5f9b0967b80dd78b587883c30ec729c0dd587e7.mgorny@gentoo \
    --to=mgorny@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox