diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2017-01-06 15:40:57 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-01-06 16:45:12 +0100 |
| commit | 5f80efa768f765f0f31f3956545c13fa7573284d (patch) | |
| tree | c4133cbccbc2489d445db490ec64d1fe46e152ca /eclass/kde5-functions.eclass | |
| parent | 4a235e841715a9a91c845454ba03a16fe6d27e51 (diff) | |
| download | kde-5f80efa768f765f0f31f3956545c13fa7573284d.tar.gz kde-5f80efa768f765f0f31f3956545c13fa7573284d.tar.bz2 kde-5f80efa768f765f0f31f3956545c13fa7573284d.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/kde5-functions.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 ad576c6fd29..26e981190d6 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -280,14 +280,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 |