| 1 |
commit: 040cef12f24e64267d5c60bd0b2fbcc5a3280cec |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 3 16:02:54 2016 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 3 16:07:16 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=040cef12 |
| 7 |
|
| 8 |
kde5.eclass: only set FRAMEWORKS_MINIMAL if undefined |
| 9 |
|
| 10 |
Unconditionally setting FRAMEWORKS_MINIMAL prevents it being overridden in an |
| 11 |
ebuild (or somewhere else...). |
| 12 |
|
| 13 |
eclass/kde5.eclass | 9 +++++---- |
| 14 |
1 file changed, 5 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass |
| 17 |
index a8915d4..9ef7c15 100644 |
| 18 |
--- a/eclass/kde5.eclass |
| 19 |
+++ b/eclass/kde5.eclass |
| 20 |
@@ -145,10 +145,11 @@ case ${KDE_AUTODEPS} in |
| 21 |
if [[ ${KDE_BUILD_TYPE} = live ]]; then |
| 22 |
case ${CATEGORY} in |
| 23 |
kde-frameworks) |
| 24 |
- FRAMEWORKS_MINIMAL=9999 |
| 25 |
+ : ${FRAMEWORKS_MINIMAL:=9999} |
| 26 |
;; |
| 27 |
kde-plasma) |
| 28 |
- FRAMEWORKS_MINIMAL=9999 |
| 29 |
+ |
| 30 |
+ : ${FRAMEWORKS_MINIMAL:=9999} |
| 31 |
;; |
| 32 |
*) ;; |
| 33 |
esac |
| 34 |
@@ -156,14 +157,14 @@ case ${KDE_AUTODEPS} in |
| 35 |
|
| 36 |
if [[ ${CATEGORY} = kde-plasma && ${FRAMEWORKS_MINIMAL} != 9999 ]]; then |
| 37 |
if ! [[ $(get_version_component_range 2) -le 8 && $(get_version_component_range 3) -lt 50 ]]; then |
| 38 |
- FRAMEWORKS_MINIMAL=5.27.0 |
| 39 |
+ : ${FRAMEWORKS_MINIMAL:=5.27.0} |
| 40 |
fi |
| 41 |
fi |
| 42 |
|
| 43 |
if [[ ${CATEGORY} = kde-apps ]]; then |
| 44 |
local vcr2=$((10#$(get_version_component_range 2))) |
| 45 |
if ! [[ $(get_version_component_range 1) -le 16 && ${vcr2} -lt 9 ]]; then |
| 46 |
- FRAMEWORKS_MINIMAL=5.28.0 |
| 47 |
+ : ${FRAMEWORKS_MINIMAL:=5.28.0} |
| 48 |
fi |
| 49 |
unset vcr2 |
| 50 |
fi |
Archives