1 |
commit: 3befb8e2bbbd8be3ebb6045897dd73f2dbcfa1bc |
2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 31 23:24:44 2015 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 31 23:24:44 2015 +0000 |
6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3befb8e2 |
7 |
|
8 |
[eclass] Sort deps function a bit |
9 |
|
10 |
--- |
11 |
eclass/kde5-functions.eclass | 24 ++++++++++++------------ |
12 |
1 file changed, 12 insertions(+), 12 deletions(-) |
13 |
|
14 |
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass |
15 |
index 75ee064..3e444fb 100644 |
16 |
--- a/eclass/kde5-functions.eclass |
17 |
+++ b/eclass/kde5-functions.eclass |
18 |
@@ -141,56 +141,56 @@ add_frameworks_dep() { |
19 |
_add_kdecategory_dep kde-frameworks "${1}" "${2}" "${version}" |
20 |
} |
21 |
|
22 |
-# @FUNCTION: add_kdeapps_dep |
23 |
+# @FUNCTION: add_kdeplasma_dep |
24 |
# @USAGE: <package> [USE flags] [minimum version] |
25 |
# @DESCRIPTION: |
26 |
-# Create proper dependency for kde-apps/ dependencies. |
27 |
+# Create proper dependency for kde-base/ dependencies. |
28 |
# This takes 1 to 3 arguments. The first being the package name, the optional |
29 |
# second is additional USE flags to append, and the optional third is the |
30 |
# version to use instead of the automatic version (use sparingly). |
31 |
# The output of this should be added directly to DEPEND/RDEPEND, and may be |
32 |
# wrapped in a USE conditional (but not an || conditional without an extra set |
33 |
# of parentheses). |
34 |
-add_kdeapps_dep() { |
35 |
+add_kdeplasma_dep() { |
36 |
debug-print-function ${FUNCNAME} "$@" |
37 |
|
38 |
local version |
39 |
|
40 |
if [[ -n ${3} ]]; then |
41 |
version=${3} |
42 |
- elif [[ ${CATEGORY} = kde-apps ]]; then |
43 |
+ elif [[ ${CATEGORY} = kde-plasma ]]; then |
44 |
version=${PV} |
45 |
elif [[ -z "${version}" ]] ; then |
46 |
- version=${KDE_APPS_MINIMAL} |
47 |
+ version=${PLASMA_MINIMAL} |
48 |
fi |
49 |
|
50 |
- _add_kdecategory_dep kde-apps "${1}" "${2}" "${version}" |
51 |
+ _add_kdecategory_dep kde-plasma "${1}" "${2}" "${version}" |
52 |
} |
53 |
|
54 |
-# @FUNCTION: add_kdeplasma_dep |
55 |
+# @FUNCTION: add_kdeapps_dep |
56 |
# @USAGE: <package> [USE flags] [minimum version] |
57 |
# @DESCRIPTION: |
58 |
-# Create proper dependency for kde-base/ dependencies. |
59 |
+# Create proper dependency for kde-apps/ dependencies. |
60 |
# This takes 1 to 3 arguments. The first being the package name, the optional |
61 |
# second is additional USE flags to append, and the optional third is the |
62 |
# version to use instead of the automatic version (use sparingly). |
63 |
# The output of this should be added directly to DEPEND/RDEPEND, and may be |
64 |
# wrapped in a USE conditional (but not an || conditional without an extra set |
65 |
# of parentheses). |
66 |
-add_kdeplasma_dep() { |
67 |
+add_kdeapps_dep() { |
68 |
debug-print-function ${FUNCNAME} "$@" |
69 |
|
70 |
local version |
71 |
|
72 |
if [[ -n ${3} ]]; then |
73 |
version=${3} |
74 |
- elif [[ ${CATEGORY} = kde-plasma ]]; then |
75 |
+ elif [[ ${CATEGORY} = kde-apps ]]; then |
76 |
version=${PV} |
77 |
elif [[ -z "${version}" ]] ; then |
78 |
- version=${PLASMA_MINIMAL} |
79 |
+ version=${KDE_APPS_MINIMAL} |
80 |
fi |
81 |
|
82 |
- _add_kdecategory_dep kde-plasma "${1}" "${2}" "${version}" |
83 |
+ _add_kdecategory_dep kde-apps "${1}" "${2}" "${version}" |
84 |
} |
85 |
|
86 |
# @FUNCTION: get_kde_version |