[gentoo-commits] proj/kde:master commit in: eclass/

[Manuel Rüger]

commit:     fccfff52e6f82600247f4020a750d57ab7a8796c
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  8 12:24:24 2015 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Mon Jun  8 12:24:24 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fccfff52

[eclass] Sync kde4-base.eclass with main tree.

 eclass/kde4-base.eclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index 81a6aec..470a21b 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -339,7 +339,7 @@ if [[ ${KDEBASE} != "kde-base" && -n ${KDE_LINGUAS} ]]; then
                # this can't be done on one line because if user doesn't use 
any localisation
                # then he is probably not interested in kde-l10n at all.
                kderdepend+="
-               linguas_${_lingua}? ( || ( 
kde-apps/kde4-l10n[linguas_${_lingua}(+)] $(add_kdebase_dep kde-l10n 
"linguas_${_lingua}(+)") ) )
+               linguas_${_lingua}? ( $(add_kdeapps_dep kde4-l10n 
"linguas_${_lingua}(+)") )
                "
        done
        unset _lingua
@@ -904,7 +904,7 @@ kde4-base_pkg_postinst() {
                fi
                # for all 3rd party soft tell user that he SHOULD install 
kdebase-startkde or kdebase-runtime-meta
                if [[ ${KDEBASE} != kde-base ]] && \
-                               ! has_version 'kde-base/kdebase-runtime-meta' 
&& \
+                               ! has_version 'kde-apps/kdebase-runtime-meta' 
&& \
                                ! has_version 'kde-base/kdebase-startkde'; then
                        if [[ ${KDE_REQUIRED} == always ]] || ( [[ 
${KDE_REQUIRED} == optional ]] && use kde ); then
                                echo