From: Louis Sautier <sautier.louis@gmail.com>
Date: Sun, 10 Apr 2016 17:25:01 +0000 (+0200)
Subject: app-shells/bash-completion: fix mpv completion
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=86877f9039a3cffd3edab353d217a248250dee90;p=gentoo.git

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@gentoo.org>
---

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 f403f5199313..9242caf39263 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 000000000000..62cddf789ad5
--- /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