Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sun, 28 May 2017 09:35:21
Message-Id: 1495964102.ee091aee139709096dfb06af429de8c88105b69a.asturm@gentoo
1 commit: ee091aee139709096dfb06af429de8c88105b69a
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed May 17 20:26:54 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun May 28 09:35:02 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee091aee
7
8 kde5.eclass: Don't remove cmake_modules, simplify filtering LINGUAS
9
10 Recent changes in KDE Applications packaging added a new directory
11 'cmake_modules' for some type of data content inside po/${lang}/
12
13 eclass/kde5.eclass | 13 +++++++------
14 1 file changed, 7 insertions(+), 6 deletions(-)
15
16 diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
17 index 60d8f131f1c..71839733485 100644
18 --- a/eclass/kde5.eclass
19 +++ b/eclass/kde5.eclass
20 @@ -566,17 +566,18 @@ kde5_src_prepare() {
21 pushd ${po} > /dev/null || die
22 local lang
23 for lang in *; do
24 - if [[ -d ${lang} ]] && ! has ${lang} ${LINGUAS} ; then
25 - rm -r ${lang} || die
26 + if [[ -e ${lang} ]] && ! has ${lang/.po/} ${LINGUAS} ; then
27 + case ${lang} in
28 + cmake_modules | \
29 + CMakeLists.txt | \
30 + ${PN}.pot) ;;
31 + *) rm -r ${lang} || die ;;
32 + esac
33 if [[ -e CMakeLists.txt ]] ; then
34 cmake_comment_add_subdirectory ${lang}
35 sed -e "/add_subdirectory([[:space:]]*${lang}\/.*[[:space:]]*)/d" \
36 -i CMakeLists.txt || die
37 fi
38 - elif [[ -f ${lang} ]] && ! has ${lang/.po/} ${LINGUAS} ; then
39 - if [[ ${lang} != CMakeLists.txt && ${lang} != ${PN}.pot ]] ; then
40 - rm ${lang} || die
41 - fi
42 fi
43 done
44 popd > /dev/null || die