* [gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/files/, app-shells/bash-completion/
@ 2016-04-11 20:15 Patrice Clement
0 siblings, 0 replies; 3+ messages in thread
From: Patrice Clement @ 2016-04-11 20:15 UTC (permalink / raw
To: gentoo-commits
commit: 86877f9039a3cffd3edab353d217a248250dee90
Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com>
AuthorDate: Sun Apr 10 17:25:01 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 20:01:10 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86877f90
app-shells/bash-completion: fix mpv completion
Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1229
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
...-completion-2.3.ebuild => bash-completion-2.3-r1.ebuild} | 3 +++
.../files/bash-completion-2.3-remove-mpv-symlink.patch | 13 +++++++++++++
2 files changed, 16 insertions(+)
diff --git a/app-shells/bash-completion/bash-completion-2.3.ebuild b/app-shells/bash-completion/bash-completion-2.3-r1.ebuild
similarity index 95%
rename from app-shells/bash-completion/bash-completion-2.3.ebuild
rename to app-shells/bash-completion/bash-completion-2.3-r1.ebuild
index f403f51..9242caf 100644
--- a/app-shells/bash-completion/bash-completion-2.3.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.3-r1.ebuild
@@ -43,6 +43,9 @@ src_prepare() {
eapply "${WORKDIR}/${BASHCOMP_P}/${PN}"-2.1_p*.patch
# Bug 543100
eapply "${FILESDIR}/${PN}-2.1-escape-characters.patch"
+ # backport from
+ # https://github.com/scop/bash-completion/commit/0382773bbfc21dc1fb5467c1c0426ea3c984b6ec
+ eapply "${FILESDIR}/${P}-remove-mpv-symlink.patch"
eapply_user
}
diff --git a/app-shells/bash-completion/files/bash-completion-2.3-remove-mpv-symlink.patch b/app-shells/bash-completion/files/bash-completion-2.3-remove-mpv-symlink.patch
new file mode 100644
index 0000000..62cddf7
--- /dev/null
+++ b/app-shells/bash-completion/files/bash-completion-2.3-remove-mpv-symlink.patch
@@ -0,0 +1,13 @@
+diff --git a/completions/Makefile.in b/completions/Makefile.in
+index 940e873..f9aaaa7 100644
+--- a/completions/Makefile.in
++++ b/completions/Makefile.in
+@@ -1237,7 +1237,7 @@ symlinks: $(targetdir) $(DATA)
+ rm -f $(targetdir)/$$file && \
+ $(LN_S) mcrypt $(targetdir)/$$file ; \
+ done
+- for file in mplayer2 mencoder gmplayer kplayer mpv ; do \
++ for file in mplayer2 mencoder gmplayer kplayer ; do \
+ rm -f $(targetdir)/$$file && \
+ $(LN_S) mplayer $(targetdir)/$$file ; \
+ done
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/files/, app-shells/bash-completion/
@ 2016-04-13 4:20 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2016-04-13 4:20 UTC (permalink / raw
To: gentoo-commits
commit: 9bfa703c6260cd3290bd1b0e6851e70ed3652fdd
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 13 04:18:25 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Apr 13 04:19:57 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bfa703c
app-shells/bash-completion: rm mount, umount, #579766, simplify mpv rm
Remove mount & umount completions that are now installed by util-linux.
Simplify mpv symlink removal to use our STRIP_COMPLETIONS mechanism
rather than a Makefile patch.
Bug: https://bugs.gentoo.org/579766
...mpletion-2.3-r1.ebuild => bash-completion-2.3-r2.ebuild} | 9 ++++++---
.../files/bash-completion-2.3-remove-mpv-symlink.patch | 13 -------------
2 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/app-shells/bash-completion/bash-completion-2.3-r1.ebuild b/app-shells/bash-completion/bash-completion-2.3-r2.ebuild
similarity index 95%
rename from app-shells/bash-completion/bash-completion-2.3-r1.ebuild
rename to app-shells/bash-completion/bash-completion-2.3-r2.ebuild
index 9242caf..9a1aecb 100644
--- a/app-shells/bash-completion/bash-completion-2.3-r1.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.3-r2.ebuild
@@ -37,15 +37,18 @@ STRIP_COMPLETIONS=(
# Now-dead symlinks to deprecated completions
hd ncal
+
+ # Installed by sys-apps/util-linux-2.28
+ mount umount mount.linux umount.linux
+
+ # Dumb symlink to mplayer, removed upstream in git
+ mpv
)
src_prepare() {
eapply "${WORKDIR}/${BASHCOMP_P}/${PN}"-2.1_p*.patch
# Bug 543100
eapply "${FILESDIR}/${PN}-2.1-escape-characters.patch"
- # backport from
- # https://github.com/scop/bash-completion/commit/0382773bbfc21dc1fb5467c1c0426ea3c984b6ec
- eapply "${FILESDIR}/${P}-remove-mpv-symlink.patch"
eapply_user
}
diff --git a/app-shells/bash-completion/files/bash-completion-2.3-remove-mpv-symlink.patch b/app-shells/bash-completion/files/bash-completion-2.3-remove-mpv-symlink.patch
deleted file mode 100644
index 62cddf7..0000000
--- a/app-shells/bash-completion/files/bash-completion-2.3-remove-mpv-symlink.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/completions/Makefile.in b/completions/Makefile.in
-index 940e873..f9aaaa7 100644
---- a/completions/Makefile.in
-+++ b/completions/Makefile.in
-@@ -1237,7 +1237,7 @@ symlinks: $(targetdir) $(DATA)
- rm -f $(targetdir)/$$file && \
- $(LN_S) mcrypt $(targetdir)/$$file ; \
- done
-- for file in mplayer2 mencoder gmplayer kplayer mpv ; do \
-+ for file in mplayer2 mencoder gmplayer kplayer ; do \
- rm -f $(targetdir)/$$file && \
- $(LN_S) mplayer $(targetdir)/$$file ; \
- done
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/files/, app-shells/bash-completion/
@ 2016-11-29 12:37 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2016-11-29 12:37 UTC (permalink / raw
To: gentoo-commits
commit: 3c7ff5b0a5a073956e153ce8a3eb8e1d80a1d44d
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 29 12:27:05 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 12:37:01 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c7ff5b0
app-shells/bash-completion: Fix unquoted ~ in readline patch, #601194
.../bash-completion/bash-completion-2.4-r1.ebuild | 99 ++++++++++++++++++++++
.../bash-completion-2.1-escape-characters-r1.patch | 27 ++++++
2 files changed, 126 insertions(+)
diff --git a/app-shells/bash-completion/bash-completion-2.4-r1.ebuild b/app-shells/bash-completion/bash-completion-2.4-r1.ebuild
new file mode 100644
index 00000000..bb6f5ed
--- /dev/null
+++ b/app-shells/bash-completion/bash-completion-2.4-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+BASHCOMP_P=bashcomp-2.0.2
+inherit versionator
+
+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 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+IUSE=""
+
+RDEPEND=">=app-shells/bash-4.3_p30-r1
+ sys-apps/miscfiles
+ !app-eselect/eselect-bashcomp"
+DEPEND="app-arch/xz-utils"
+PDEPEND=">=app-shells/gentoo-bashcomp-20140911"
+
+# Remove unwanted completions.
+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
+
+ # Installed by sys-apps/util-linux-2.28
+ mount umount mount.linux umount.linux
+)
+
+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() { :; } # Skip testsuite because of interactive shell wrt #477066
+
+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
+
+ local file
+ for file in "${STRIP_COMPLETIONS[@]}"; do
+ rm "${ED}"/usr/share/bash-completion/completions/${file} || die
+ done
+ # remove deprecated completions (moved to other packages)
+ rm "${ED}"/usr/share/bash-completion/completions/_* || die
+
+ 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 ! version_is_at_least 2.1-r90 ${v}; 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
+}
diff --git a/app-shells/bash-completion/files/bash-completion-2.1-escape-characters-r1.patch b/app-shells/bash-completion/files/bash-completion-2.1-escape-characters-r1.patch
new file mode 100644
index 00000000..27a8550
--- /dev/null
+++ b/app-shells/bash-completion/files/bash-completion-2.1-escape-characters-r1.patch
@@ -0,0 +1,27 @@
+--- bash-completion-2.1/bash_completion.orig 2014-03-09 17:38:14 +0000
++++ bash-completion-2.1/bash_completion 2014-03-13 23:26:44 +0000
+@@ -536,13 +536,23 @@
+ # @param $2 Name of variable to return result to
+ _quote_readline_by_ref()
+ {
+- if [[ $1 == \'* ]]; then
++ if [ -z "$1" ]; then
++ # avoid quoting if empty
++ printf -v $2 %s "$1"
++ elif [[ $1 == \'* ]]; then
+ # Leave out first character
+ printf -v $2 %s "${1:1}"
++ elif [[ $1 == \~* ]]; then
++ # avoid escaping first ~
++ printf -v $2 \~%q "${1:1}"
+ else
+ printf -v $2 %q "$1"
+ fi
+
++ # Replace double escaping ( \\ ) by single ( \ )
++ # This happens always when argument is already escaped at cmdline,
++ # and passed to this function as e.g.: file\ with\ spaces
++ [[ ${!2} == *\\* ]] && printf -v $2 %s "${1//\\\\/\\}"
+ # If result becomes quoted like this: $'string', re-evaluate in order to
+ # drop the additional quoting. See also: http://www.mail-archive.com/
+ # bash-completion-devel@lists.alioth.debian.org/msg01942.html
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-11-29 12:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-29 12:37 [gentoo-commits] repo/gentoo:master commit in: app-shells/bash-completion/files/, app-shells/bash-completion/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2016-04-13 4:20 Michał Górny
2016-04-11 20:15 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox