[gentoo-commits] repo/gentoo:master commit in: eclass/

[Andreas Sturmlechner]

commit:     da7379a5aab71db3e13d444e7e8da7fc97d38078
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  6 14:40:57 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb  5 14:39:11 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da7379a5

kde5-functions.eclass: Assume slot 5 for add_qt_dep unless defined

So far we relied on ${SLOT} (4|5) to depend on the correct Qt slot, but
this is not always the case. If an ebuild inherits kde5-functions and
uses add_qt_dep then it is safe to assume it will depend on Qt5.

 eclass/kde5-functions.eclass | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 2012c53..06a7bf6 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -271,14 +271,19 @@ add_qt_dep() {
        fi
 
        local version
+       local slot=${4}
 
        if [[ -n ${3} ]]; then
                version=${3}
-       elif [[ -z "${version}" ]] ; then
+       elif [[ -z "${version}" ]]; then
                version=${QT_MINIMAL}
        fi
 
-       _add_category_dep dev-qt "${1}" "${2}" "${version}" "${4}"
+       if [[ -z ${slot} ]]; then
+               slot="5"
+       fi
+
+       _add_category_dep dev-qt "${1}" "${2}" "${version}" "${slot}"
 }
 
 # @FUNCTION: get_kde_version