1 |
commit: 6c41592f071af455074e646b1c670f8ec7e1e536 |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Nov 17 14:24:16 2016 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Nov 26 16:14:01 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c41592f |
7 |
|
8 |
kde5-functions.eclass: Move *_MINIMAL setup here from kde5.eclass |
9 |
|
10 |
Makes sure that 5.8 LTS stable branch does not raise FRAMEWORKS_MINIMAL |
11 |
Also bumping FRAMEWORKS_MINIMAL to 5.28.0 for >=Plasma-5.9 |
12 |
|
13 |
eclass/kde5-functions.eclass | 37 +++++++++++++++++++++++++++++-------- |
14 |
eclass/kde5.eclass | 27 --------------------------- |
15 |
2 files changed, 29 insertions(+), 35 deletions(-) |
16 |
|
17 |
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass |
18 |
index a6bf976..1724a69 100644 |
19 |
--- a/eclass/kde5-functions.eclass |
20 |
+++ b/eclass/kde5-functions.eclass |
21 |
@@ -23,6 +23,35 @@ case ${EAPI} in |
22 |
*) die "EAPI=${EAPI:-0} is not supported" ;; |
23 |
esac |
24 |
|
25 |
+# determine the build type |
26 |
+if [[ ${PV} = *9999* ]]; then |
27 |
+ KDE_BUILD_TYPE="live" |
28 |
+else |
29 |
+ KDE_BUILD_TYPE="release" |
30 |
+fi |
31 |
+export KDE_BUILD_TYPE |
32 |
+ |
33 |
+case ${CATEGORY} in |
34 |
+ kde-frameworks) |
35 |
+ [[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999} |
36 |
+ ;; |
37 |
+ kde-plasma) |
38 |
+ if [[ $(get_version_component_range 2) -eq 8 && $(get_version_component_range 3) -lt 50 ]]; then |
39 |
+ : ${FRAMEWORKS_MINIMAL:=5.26.0} # special 5.8 LTS rule to not get overwritten below |
40 |
+ elif ! [[ $(get_version_component_range 2) -le 8 && $(get_version_component_range 3) -lt 50 ]]; then |
41 |
+ : ${FRAMEWORKS_MINIMAL:=5.28.0} |
42 |
+ fi |
43 |
+ [[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999} |
44 |
+ ;; |
45 |
+ kde-apps) |
46 |
+ local vcr2=$((10#$(get_version_component_range 2))) |
47 |
+ if ! [[ $(get_version_component_range 1) -le 16 && ${vcr2} -lt 9 ]]; then |
48 |
+ : ${FRAMEWORKS_MINIMAL:=5.28.0} |
49 |
+ fi |
50 |
+ unset vcr2 |
51 |
+ ;; |
52 |
+esac |
53 |
+ |
54 |
# @ECLASS-VARIABLE: QT_MINIMAL |
55 |
# @DESCRIPTION: |
56 |
# Minimal Qt version to require for the package. |
57 |
@@ -70,14 +99,6 @@ case ${KDE_SCM} in |
58 |
*) die "KDE_SCM: ${KDE_SCM} is not supported" ;; |
59 |
esac |
60 |
|
61 |
-# determine the build type |
62 |
-if [[ ${PV} = *9999* ]]; then |
63 |
- KDE_BUILD_TYPE="live" |
64 |
-else |
65 |
- KDE_BUILD_TYPE="release" |
66 |
-fi |
67 |
-export KDE_BUILD_TYPE |
68 |
- |
69 |
# @FUNCTION: _check_gcc_version |
70 |
# @INTERNAL |
71 |
# @DESCRIPTION: |
72 |
|
73 |
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass |
74 |
index 9ef7c15..4876d7c 100644 |
75 |
--- a/eclass/kde5.eclass |
76 |
+++ b/eclass/kde5.eclass |
77 |
@@ -142,33 +142,6 @@ fi |
78 |
case ${KDE_AUTODEPS} in |
79 |
false) ;; |
80 |
*) |
81 |
- if [[ ${KDE_BUILD_TYPE} = live ]]; then |
82 |
- case ${CATEGORY} in |
83 |
- kde-frameworks) |
84 |
- : ${FRAMEWORKS_MINIMAL:=9999} |
85 |
- ;; |
86 |
- kde-plasma) |
87 |
- |
88 |
- : ${FRAMEWORKS_MINIMAL:=9999} |
89 |
- ;; |
90 |
- *) ;; |
91 |
- esac |
92 |
- fi |
93 |
- |
94 |
- if [[ ${CATEGORY} = kde-plasma && ${FRAMEWORKS_MINIMAL} != 9999 ]]; then |
95 |
- if ! [[ $(get_version_component_range 2) -le 8 && $(get_version_component_range 3) -lt 50 ]]; then |
96 |
- : ${FRAMEWORKS_MINIMAL:=5.27.0} |
97 |
- fi |
98 |
- fi |
99 |
- |
100 |
- if [[ ${CATEGORY} = kde-apps ]]; then |
101 |
- local vcr2=$((10#$(get_version_component_range 2))) |
102 |
- if ! [[ $(get_version_component_range 1) -le 16 && ${vcr2} -lt 9 ]]; then |
103 |
- : ${FRAMEWORKS_MINIMAL:=5.28.0} |
104 |
- fi |
105 |
- unset vcr2 |
106 |
- fi |
107 |
- |
108 |
DEPEND+=" $(add_frameworks_dep extra-cmake-modules)" |
109 |
RDEPEND+=" >=kde-frameworks/kf-env-3" |
110 |
COMMONDEPEND+=" $(add_qt_dep qtcore)" |