Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sat, 02 Apr 2016 14:59:37
Message-Id: 1459609161.c27feb9ce5bdc9b1a1cdd06d8cafac218fddbcb1.kensington@gentoo
1 commit: c27feb9ce5bdc9b1a1cdd06d8cafac218fddbcb1
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Sat Mar 26 17:56:55 2016 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 2 14:59:21 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c27feb9c
7
8 kde5.eclass: Improve translation handling
9
10 Do not remove unconditionally po file for non release versions.
11
12 eclass/kde5.eclass | 34 ++++++++++++++++------------------
13 1 file changed, 16 insertions(+), 18 deletions(-)
14
15 diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
16 index 47ced09..db331cb 100644
17 --- a/eclass/kde5.eclass
18 +++ b/eclass/kde5.eclass
19 @@ -387,24 +387,24 @@ kde5_src_prepare() {
20
21 # enable only the requested translations
22 # when required
23 - if [[ ${KDE_BUILD_TYPE} = release ]] ; then
24 - if [[ -d po ]] ; then
25 - pushd po > /dev/null || die
26 - for lang in *; do
27 - if [[ -d ${lang} ]] && ! has ${lang} ${LINGUAS} ; then
28 - rm -r ${lang} || die
29 - if [[ -e CMakeLists.txt ]] ; then
30 - cmake_comment_add_subdirectory ${lang}
31 - fi
32 - elif ! has ${lang/.po/} ${LINGUAS} ; then
33 - if [[ ${lang} != CMakeLists.txt ]] ; then
34 - rm ${lang} || die
35 - fi
36 + if [[ -d po ]] ; then
37 + pushd po > /dev/null || die
38 + for lang in *; do
39 + if [[ -d ${lang} ]] && ! has ${lang} ${LINGUAS} ; then
40 + rm -r ${lang} || die
41 + if [[ -e CMakeLists.txt ]] ; then
42 + cmake_comment_add_subdirectory ${lang}
43 fi
44 - done
45 - popd > /dev/null || die
46 - fi
47 + elif ! has ${lang/.po/} ${LINGUAS} ; then
48 + if [[ ${lang} != CMakeLists.txt ]] ; then
49 + rm ${lang} || die
50 + fi
51 + fi
52 + done
53 + popd > /dev/null || die
54 + fi
55
56 + if [[ ${KDE_BUILD_TYPE} = release ]] ; then
57 if [[ ${KDE_HANDBOOK} != false && -d ${KDE_DOC_DIR} && ${CATEGORY} != kde-apps ]] ; then
58 pushd ${KDE_DOC_DIR} > /dev/null || die
59 for lang in *; do
60 @@ -414,8 +414,6 @@ kde5_src_prepare() {
61 done
62 popd > /dev/null || die
63 fi
64 - else
65 - rm -rf po
66 fi
67
68 # in frameworks, tests = manual tests so never build them