1 |
commit: 92872d197f5987e8db47c109c91b49930dfbc813 |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Jan 31 23:16:58 2016 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 31 23:16:58 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=92872d19 |
7 |
|
8 |
kde5-functions.eclass: add_{frameworks,plasma,kdeapps}_dep slot overrides |
9 |
|
10 |
eclass/kde5-functions.eclass | 24 +++++++++++++++--------- |
11 |
1 file changed, 15 insertions(+), 9 deletions(-) |
12 |
|
13 |
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass |
14 |
index 932c2b8..d87ca20 100644 |
15 |
--- a/eclass/kde5-functions.eclass |
16 |
+++ b/eclass/kde5-functions.eclass |
17 |
@@ -129,9 +129,11 @@ _add_category_dep() { |
18 |
# @USAGE: <package> [USE flags] [minimum version] |
19 |
# @DESCRIPTION: |
20 |
# Create proper dependency for kde-frameworks/ dependencies. |
21 |
-# This takes 1 to 3 arguments. The first being the package name, the optional |
22 |
+# This takes 1 to 4 arguments. The first being the package name, the optional |
23 |
# second is additional USE flags to append, and the optional third is the |
24 |
-# version to use instead of the automatic version (use sparingly). |
25 |
+# version to use instead of the automatic version (use sparingly). In addition, |
26 |
+# the optional fourth argument defines slot+operator instead of automatic slot |
27 |
+# (use even more sparingly). |
28 |
# The output of this should be added directly to DEPEND/RDEPEND, and may be |
29 |
# wrapped in a USE conditional (but not an || conditional without an extra set |
30 |
# of parentheses). |
31 |
@@ -148,16 +150,18 @@ add_frameworks_dep() { |
32 |
version=${FRAMEWORKS_MINIMAL} |
33 |
fi |
34 |
|
35 |
- _add_category_dep kde-frameworks "${1}" "${2}" "${version}" |
36 |
+ _add_category_dep kde-frameworks "${1}" "${2}" "${version}" "${4}" |
37 |
} |
38 |
|
39 |
# @FUNCTION: add_plasma_dep |
40 |
# @USAGE: <package> [USE flags] [minimum version] |
41 |
# @DESCRIPTION: |
42 |
# Create proper dependency for kde-base/ dependencies. |
43 |
-# This takes 1 to 3 arguments. The first being the package name, the optional |
44 |
+# This takes 1 to 4 arguments. The first being the package name, the optional |
45 |
# second is additional USE flags to append, and the optional third is the |
46 |
-# version to use instead of the automatic version (use sparingly). |
47 |
+# version to use instead of the automatic version (use sparingly). In addition, |
48 |
+# the optional fourth argument defines slot+operator instead of automatic slot |
49 |
+# (use even more sparingly). |
50 |
# The output of this should be added directly to DEPEND/RDEPEND, and may be |
51 |
# wrapped in a USE conditional (but not an || conditional without an extra set |
52 |
# of parentheses). |
53 |
@@ -174,16 +178,18 @@ add_plasma_dep() { |
54 |
version=${PLASMA_MINIMAL} |
55 |
fi |
56 |
|
57 |
- _add_category_dep kde-plasma "${1}" "${2}" "${version}" |
58 |
+ _add_category_dep kde-plasma "${1}" "${2}" "${version}" "${4}" |
59 |
} |
60 |
|
61 |
# @FUNCTION: add_kdeapps_dep |
62 |
# @USAGE: <package> [USE flags] [minimum version] |
63 |
# @DESCRIPTION: |
64 |
# Create proper dependency for kde-apps/ dependencies. |
65 |
-# This takes 1 to 3 arguments. The first being the package name, the optional |
66 |
+# This takes 1 to 4 arguments. The first being the package name, the optional |
67 |
# second is additional USE flags to append, and the optional third is the |
68 |
-# version to use instead of the automatic version (use sparingly). |
69 |
+# version to use instead of the automatic version (use sparingly). In addition, |
70 |
+# the optional fourth argument defines slot+operator instead of automatic slot |
71 |
+# (use even more sparingly). |
72 |
# The output of this should be added directly to DEPEND/RDEPEND, and may be |
73 |
# wrapped in a USE conditional (but not an || conditional without an extra set |
74 |
# of parentheses). |
75 |
@@ -205,7 +211,7 @@ add_kdeapps_dep() { |
76 |
fi |
77 |
fi |
78 |
|
79 |
- _add_category_dep kde-apps "${1}" "${2}" "${version}" |
80 |
+ _add_category_dep kde-apps "${1}" "${2}" "${version}" "${4}" |
81 |
} |
82 |
|
83 |
# @FUNCTION: add_qt_dep |