diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2017-01-06 15:40:57 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-02-05 15:39:11 +0100 |
| commit | da7379a5aab71db3e13d444e7e8da7fc97d38078 (patch) | |
| tree | db1098aa86b8919b06af59bc977942326c9fa99e /eclass | |
| parent | kde5-functions.eclass: raise FRAMEWORKS_MINIMAL to latest stable (diff) | |
| download | gentoo-da7379a5aab71db3e13d444e7e8da7fc97d38078.tar.gz gentoo-da7379a5aab71db3e13d444e7e8da7fc97d38078.tar.bz2 gentoo-da7379a5aab71db3e13d444e7e8da7fc97d38078.zip | |
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.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde5-functions.eclass | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index 2012c53535e2..06a7bf617fe1 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 |