From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 06EBB139695 for ; Sat, 22 Apr 2017 13:15:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 101A9E0C26; Sat, 22 Apr 2017 13:15:45 +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 DC227E0C26 for ; Sat, 22 Apr 2017 13:15:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 AA190340DF9 for ; Sat, 22 Apr 2017 13:15:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2EF59743B for ; Sat, 22 Apr 2017 13:15:41 +0000 (UTC) From: "Andreas Sturmlechner" 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" Message-ID: <1492864736.4aa1f9272910de4b8ed53317aa6c1d6e7fd3335e.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: 4aa1f9272910de4b8ed53317aa6c1d6e7fd3335e X-VCS-Branch: master Date: Sat, 22 Apr 2017 13:15:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8a0fd623-a1a0-430d-b857-0399482b7ced X-Archives-Hash: c4c16765346f78ebbf8160d18ca52296 commit: 4aa1f9272910de4b8ed53317aa6c1d6e7fd3335e Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Apr 22 12:38:56 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Apr 22 12:38:56 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=4aa1f927 kde5.eclass: Filter LINGUAS in poqm as well eclass/kde5.eclass | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index 5e9a731b59..38b0fcda90 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -549,25 +549,30 @@ kde5_src_prepare() { fi fi - # enable only the requested translations - # when required - if [[ -d po && -v LINGUAS ]] ; then - pushd po > /dev/null || die - local lang - for lang in *; do - if [[ -d ${lang} ]] && ! has ${lang} ${LINGUAS} ; then - rm -r ${lang} || die - 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 + # enable only the requested translations when required + if [[ -v LINGUAS ]] ; then + local po + for po in po poqm; do + if [[ -d ${po} ]] ; then + pushd ${po} > /dev/null || die + local lang + for lang in *; do + if [[ -d ${lang} ]] && ! has ${lang} ${LINGUAS} ; then + rm -r ${lang} || die + 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 - fi + done + popd > /dev/null || die + fi done - popd > /dev/null || die fi if [[ ${KDE_BUILD_TYPE} = release && ${CATEGORY} != kde-apps ]] ; then