1 |
commit: da7379a5aab71db3e13d444e7e8da7fc97d38078 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jan 6 14:40:57 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 5 14:39:11 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da7379a5 |
7 |
|
8 |
kde5-functions.eclass: Assume slot 5 for add_qt_dep unless defined |
9 |
|
10 |
So far we relied on ${SLOT} (4|5) to depend on the correct Qt slot, but |
11 |
this is not always the case. If an ebuild inherits kde5-functions and |
12 |
uses add_qt_dep then it is safe to assume it will depend on Qt5. |
13 |
|
14 |
eclass/kde5-functions.eclass | 9 +++++++-- |
15 |
1 file changed, 7 insertions(+), 2 deletions(-) |
16 |
|
17 |
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass |
18 |
index 2012c53..06a7bf6 100644 |
19 |
--- a/eclass/kde5-functions.eclass |
20 |
+++ b/eclass/kde5-functions.eclass |
21 |
@@ -271,14 +271,19 @@ add_qt_dep() { |
22 |
fi |
23 |
|
24 |
local version |
25 |
+ local slot=${4} |
26 |
|
27 |
if [[ -n ${3} ]]; then |
28 |
version=${3} |
29 |
- elif [[ -z "${version}" ]] ; then |
30 |
+ elif [[ -z "${version}" ]]; then |
31 |
version=${QT_MINIMAL} |
32 |
fi |
33 |
|
34 |
- _add_category_dep dev-qt "${1}" "${2}" "${version}" "${4}" |
35 |
+ if [[ -z ${slot} ]]; then |
36 |
+ slot="5" |
37 |
+ fi |
38 |
+ |
39 |
+ _add_category_dep dev-qt "${1}" "${2}" "${version}" "${slot}" |
40 |
} |
41 |
|
42 |
# @FUNCTION: get_kde_version |