1 |
commit: 7b921d451e1c05c35e811eff4be93f423d8cb60b |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jul 2 15:17:51 2014 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jul 2 15:17:51 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7b921d45 |
7 |
|
8 |
[eclass] Improve add_frameworks_dep minimum version handling. |
9 |
|
10 |
Packages in kde-frameworks depending on other frameworks should require a |
11 |
version equal or greater to their own. Packages in all other categories should |
12 |
require some minimal version (like KDE_MINIMAL from KDE4). |
13 |
|
14 |
This solves an issue where live Plasma 5 packages require live Frameworks |
15 |
packages, when really a recent release works fine. |
16 |
|
17 |
--- |
18 |
eclass/kde5-functions.eclass | 10 +++++++++- |
19 |
1 file changed, 9 insertions(+), 1 deletion(-) |
20 |
|
21 |
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass |
22 |
index d54e748..f9638bb 100644 |
23 |
--- a/eclass/kde5-functions.eclass |
24 |
+++ b/eclass/kde5-functions.eclass |
25 |
@@ -105,7 +105,15 @@ _add_kdecategory_dep() { |
26 |
add_frameworks_dep() { |
27 |
debug-print-function ${FUNCNAME} "$@" |
28 |
|
29 |
- _add_kdecategory_dep kde-frameworks "${1}" "${2}" "${3}" |
30 |
+ local version=${3} |
31 |
+ |
32 |
+ if [[ ${CATEGORY} = kde-frameworks ]]; then |
33 |
+ version=${PV} |
34 |
+ elif [[ -z "${version}" ]] ; then |
35 |
+ version=4.100.0 |
36 |
+ fi |
37 |
+ |
38 |
+ _add_kdecategory_dep kde-frameworks "${1}" "${2}" "${version}" |
39 |
} |
40 |
|
41 |
# @FUNCTION: add_kdebase_dep |