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, 02 Jan 2016 15:00:14
Message-Id: 1451698571.b56904fffadd50e7f13d49d47797604fd0ecbc87.kensington@gentoo
1 commit: b56904fffadd50e7f13d49d47797604fd0ecbc87
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Sat Jan 2 01:36:11 2016 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 2 01:36:11 2016 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b56904ff
7
8 kde5.eclass: In kde5_src_prepare, place cmake-utils_src_prepare on top
9
10 This change makes PATCHES handling less error prone, as epatch will find
11 a pristine directory before there is punting and commenting.
12
13 eclass/kde5.eclass | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16 diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
17 index fdc5128..1e429f2 100644
18 --- a/eclass/kde5.eclass
19 +++ b/eclass/kde5.eclass
20 @@ -449,6 +449,8 @@ kde5_src_unpack() {
21 kde5_src_prepare() {
22 debug-print-function ${FUNCNAME} "$@"
23
24 + cmake-utils_src_prepare
25 +
26 # only build examples when required
27 if ! use_if_iuse examples || ! use examples ; then
28 comment_add_subdirectory examples
29 @@ -525,8 +527,6 @@ kde5_src_prepare() {
30 comment_add_subdirectory tests
31 fi
32 fi
33 -
34 - cmake-utils_src_prepare
35 }
36
37 # @FUNCTION: kde5_src_configure