[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/

[Ian Delaney]

commit:     1f6942f87b1a1517b1f65936e399ac3a8ba38f3b
Author:     Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Wed Apr 27 11:57:35 2016 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 15:26:00 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f6942f8

media-video/mpv: elog re bash completion

Polynomial-C made a request via #gentoo-proxy-maint IRC channel to
notify zsh users about mpv-bash-completion too. After some discussion
this change seems reasonable.

This effectively reverts 8e81330.

Package-Manager: portage-2.2.28

Signed-off-by: Ian Delaney <idella4 <AT> gentoo.org>

 media-video/mpv/mpv-0.17.0-r2.ebuild | 5 ++---
 media-video/mpv/mpv-9999.ebuild      | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/media-video/mpv/mpv-0.17.0-r2.ebuild 
b/media-video/mpv/mpv-0.17.0-r2.ebuild
index 495b748..6d56557 100644
--- a/media-video/mpv/mpv-0.17.0-r2.ebuild
+++ b/media-video/mpv/mpv-0.17.0-r2.ebuild
@@ -281,9 +281,8 @@ pkg_postinst() {
        fdo-mime_desktop_database_update
        gnome2_icon_cache_update
 
-       # bash-completion prior to 2.3-r1 installs (mostly broken) mpv 
completion.
-       if use cli && ! use zsh-completion && \
-               ! has_version '<app-shells/bash-completion-2.3-r1' && \
+       # bash-completion < 2.3-r1 already installs (mostly broken) mpv 
completion.
+       if use cli && ! has_version '<app-shells/bash-completion-2.3-r1' && \
                ! has_version 'app-shells/mpv-bash-completion'; then
                elog "If you want to have command-line completion via 
bash-completion,"
                elog "please install app-shells/mpv-bash-completion."

diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index 5cfce9c..ff0cecd 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -267,9 +267,8 @@ pkg_postinst() {
        fdo-mime_desktop_database_update
        gnome2_icon_cache_update
 
-       # bash-completion prior to 2.3-r1 installs (mostly broken) mpv 
completion.
-       if use cli && ! use zsh-completion && \
-               ! has_version '<app-shells/bash-completion-2.3-r1' && \
+       # bash-completion < 2.3-r1 already installs (mostly broken) mpv 
completion.
+       if use cli && ! has_version '<app-shells/bash-completion-2.3-r1' && \
                ! has_version 'app-shells/mpv-bash-completion'; then
                elog "If you want to have command-line completion via 
bash-completion,"
                elog "please install app-shells/mpv-bash-completion."