Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: eclass/
Date: Sat, 04 Oct 2014 19:02:26
Message-Id: 1412449299.cd04c5bd4629929907af1c4abc574b6cef99f249.kensington@gentoo
1 commit: cd04c5bd4629929907af1c4abc574b6cef99f249
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 4 19:01:39 2014 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 4 19:01:39 2014 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=cd04c5bd
7
8 [eclass] Respect version parameter if it is passed.
9
10 ---
11 eclass/kde5-functions.eclass | 6 ++++--
12 1 file changed, 4 insertions(+), 2 deletions(-)
13
14 diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
15 index 4d48d0b..bc5afd4 100644
16 --- a/eclass/kde5-functions.eclass
17 +++ b/eclass/kde5-functions.eclass
18 @@ -98,9 +98,11 @@ _add_kdecategory_dep() {
19 add_frameworks_dep() {
20 debug-print-function ${FUNCNAME} "$@"
21
22 - local version=${3}
23 + local version
24
25 - if [[ ${CATEGORY} = kde-frameworks ]]; then
26 + if [[ -n ${3} ]]; then
27 + version=${3}
28 + elif [[ ${CATEGORY} = kde-frameworks ]]; then
29 version=${PV}
30 elif [[ -z "${version}" ]] ; then
31 version=5.2.0