From: Michał Górny <mgorny@gentoo.org>
Date: Wed, 13 Apr 2016 04:18:25 +0000 (+0200)
Subject: app-shells/bash-completion: rm mount, umount, #579766, simplify mpv rm
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9bfa703c6260cd3290bd1b0e6851e70ed3652fdd;p=gentoo.git

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
---

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 9242caf39263..9a1aecbb7e2c 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 62cddf789ad5..000000000000
--- 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