commit:     d2194b951c8a8fbdce77ccafae4356d44c2a29c7
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 23 05:20:10 2021 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Jul 23 05:35:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2194b95

eclass/vim-plugin.eclass: delete if has_version condition.

... and replace it with a test against the REPLACING_VERSIONS variable.

See https://projects.gentoo.org/pms/8/pms.html#x1-10900011.1.

This is an updated version of the same patch discussed previously on this ML.

Suggested-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Reviewed-by: Ulrich Mueller <ulm <AT> gentoo.org>
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 eclass/vim-plugin.eclass | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/eclass/vim-plugin.eclass b/eclass/vim-plugin.eclass
index 6b72d66111d..50e727e98f4 100644
--- a/eclass/vim-plugin.eclass
+++ b/eclass/vim-plugin.eclass
@@ -126,31 +126,31 @@ update_vim_afterscripts() {
 display_vim_plugin_help() {
        local h
 
-       if ! has_version ${CATEGORY}/${PN} ; then
-               if [[ -n "${VIM_PLUGIN_HELPFILES}" ]] ; then
+       if [[ -z ${REPLACING_VERSIONS} ]]; then
+               if [[ -n ${VIM_PLUGIN_HELPFILES} ]]; then
                        elog " "
                        elog "This plugin provides documentation via vim's help 
system. To"
                        elog "view it, use:"
-                       for h in ${VIM_PLUGIN_HELPFILES} ; do
+                       for h in ${VIM_PLUGIN_HELPFILES}; do
                                elog "    :help ${h}"
                        done
                        elog " "
 
-               elif [[ -n "${VIM_PLUGIN_HELPTEXT}" ]] ; then
+               elif [[ -n ${VIM_PLUGIN_HELPTEXT} ]]; then
                        elog " "
                        while read h ; do
                                elog "$h"
                        done <<<"${VIM_PLUGIN_HELPTEXT}"
                        elog " "
 
-               elif [[ -n "${VIM_PLUGIN_HELPURI}" ]] ; then
+               elif [[ -n ${VIM_PLUGIN_HELPURI} ]]; then
                        elog " "
                        elog "Documentation for this plugin is available online 
at:"
                        elog "    ${VIM_PLUGIN_HELPURI}"
                        elog " "
                fi
 
-               if has "filetype" "${VIM_PLUGIN_MESSAGES}" ; then
+               if has filetype ${VIM_PLUGIN_MESSAGES}; then
                        elog "This plugin makes use of filetype settings. To 
enable these,"
                        elog "add lines like:"
                        elog "    filetype plugin on"

Reply via email to