From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-950446-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 7221D139694
for <garchives@archives.gentoo.org>; Wed, 17 May 2017 20:31:53 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 3C4FEE0C13;
Wed, 17 May 2017 20:31:50 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 16A6FE0C13
for <gentoo-commits@lists.gentoo.org>; Wed, 17 May 2017 20:31:50 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id D98DD3416C2
for <gentoo-commits@lists.gentoo.org>; Wed, 17 May 2017 20:31:48 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 836C6743E
for <gentoo-commits@lists.gentoo.org>; Wed, 17 May 2017 20:31:47 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1495052814.9d1466fdf69c88b90c9d12299a111e6ff97275a9.asturm@gentoo>
Subject: [gentoo-commits] proj/kde:master commit in: eclass/
X-VCS-Repository: proj/kde
X-VCS-Files: eclass/kde5.eclass
X-VCS-Directories: eclass/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 9d1466fdf69c88b90c9d12299a111e6ff97275a9
X-VCS-Branch: master
Date: Wed, 17 May 2017 20:31:47 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 7cea7b7d-9c25-43df-a6f0-d34d8b87cdf2
X-Archives-Hash: 0842a42ff147ce9ecd934381e2ab9023
commit: 9d1466fdf69c88b90c9d12299a111e6ff97275a9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 17 20:26:54 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 17 20:26:54 2017 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9d1466fd
kde5.eclass: Don't remove cmake_modules, simplify filtering LINGUAS
Recent changes in KDE Applications packaging added a new directory
'cmake_modules' for some type of data content inside po/${lang}/
eclass/kde5.eclass | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 60d8f131f1..7183973348 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -566,17 +566,18 @@ kde5_src_prepare() {
pushd ${po} > /dev/null || die
local lang
for lang in *; do
- if [[ -d ${lang} ]] && ! has ${lang} ${LINGUAS} ; then
- rm -r ${lang} || die
+ if [[ -e ${lang} ]] && ! has ${lang/.po/} ${LINGUAS} ; then
+ case ${lang} in
+ cmake_modules | \
+ CMakeLists.txt | \
+ ${PN}.pot) ;;
+ *) rm -r ${lang} || die ;;
+ esac
if [[ -e CMakeLists.txt ]] ; then
cmake_comment_add_subdirectory ${lang}
sed -e "/add_subdirectory([[:space:]]*${lang}\/.*[[:space:]]*)/d" \
-i CMakeLists.txt || die
fi
- elif [[ -f ${lang} ]] && ! has ${lang/.po/} ${LINGUAS} ; then
- if [[ ${lang} != CMakeLists.txt && ${lang} != ${PN}.pot ]] ; then
- rm ${lang} || die
- fi
fi
done
popd > /dev/null || die