kde5-functions.eclass: Assume slot 5 for add_qt_dep unless defined
authorAndreas Sturmlechner <asturm@gentoo.org>
Fri, 6 Jan 2017 14:40:57 +0000 (15:40 +0100)
committerAndreas Sturmlechner <asturm@gentoo.org>
Sun, 5 Feb 2017 14:39:11 +0000 (15:39 +0100)
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

index 2012c53535e2b4331bbbeb2cfd0032c532ddb21e..06a7bf617fe1f3a2fbfab3f8f91c8e729deb3264 100644 (file)
@@ -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