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 0B18A1382DE for ; Sun, 3 Jul 2016 17:53:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3FED6E0994; Sun, 3 Jul 2016 17:53:27 +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 DAE7AE0994 for ; Sun, 3 Jul 2016 17:53:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 73E5E340D39 for ; Sun, 3 Jul 2016 17:53:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 12C3B13FF for ; Sun, 3 Jul 2016 17:53:20 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1467568370.78565ea3fdb167fa375e352f70ad5eb22c0318a4.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kdepim-l10n/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/kdepim-l10n/kdepim-l10n-16.04.2.ebuild X-VCS-Directories: kde-apps/kdepim-l10n/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 78565ea3fdb167fa375e352f70ad5eb22c0318a4 X-VCS-Branch: master Date: Sun, 3 Jul 2016 17:53:20 +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: b4ceecc4-7822-4dca-b448-c0ca2b87223d X-Archives-Hash: 3f8a4fe6fd661f9646e93b55d7098b0c commit: 78565ea3fdb167fa375e352f70ad5eb22c0318a4 Author: Andreas Sturmlechner gmail com> AuthorDate: Sun Jul 3 09:36:48 2016 +0000 Commit: Johannes Huber gentoo org> CommitDate: Sun Jul 3 17:52:50 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=78565ea3 kde-apps/kdepim-l10n: Sync LINGUAS->L10N with tree Package-Manager: portage-2.2.28 Signed-off-by: Johannes Huber gentoo.org> kde-apps/kdepim-l10n/kdepim-l10n-16.04.2.ebuild | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/kde-apps/kdepim-l10n/kdepim-l10n-16.04.2.ebuild b/kde-apps/kdepim-l10n/kdepim-l10n-16.04.2.ebuild index 6f7fe07..69c0e23 100644 --- a/kde-apps/kdepim-l10n/kdepim-l10n-16.04.2.ebuild +++ b/kde-apps/kdepim-l10n/kdepim-l10n-16.04.2.ebuild @@ -27,14 +27,14 @@ MY_LANGS="ar ast bg bs ca ca@valencia cs da de el en_GB eo es et eu fa fi fr ga gl he hi hr hu ia id is it ja kk km ko lt lv mr nb nds nl nn pa pl pt pt_BR ro ru sk sl sr sv tr ug uk wa zh_CN zh_TW" -IUSE="$(printf 'linguas_%s ' ${MY_LANGS})" +IUSE="$(printf 'l10n_%s ' ${MY_LANGS//[@_]/-})" PIM_L10N="kdepim kdepimlibs kdepim-runtime pim" URI_BASE="${SRC_URI/-${PV}.tar.xz/}" SRC_URI="" for my_lang in ${MY_LANGS} ; do - SRC_URI="${SRC_URI} linguas_${my_lang}? ( ${URI_BASE/kdepim/kde}/kde-l10n-${my_lang}-${PV}.tar.xz )" + SRC_URI="${SRC_URI} l10n_${my_lang/[@_]/-}? ( ${URI_BASE/kdepim/kde}/kde-l10n-${my_lang}-${PV}.tar.xz )" done S="${WORKDIR}" @@ -42,12 +42,10 @@ S="${WORKDIR}" pkg_setup() { if [[ -z ${A} ]]; then elog - elog "You either have the LINGUAS variable unset, or it only" - elog "contains languages not supported by ${P}." - elog "You won't have any additional language support." + elog "None of the requested L10N are supported by ${P}." elog elog "${P} supports these language codes:" - elog "${MY_LANGS}" + elog "${MY_LANGS//[@_]/-}" elog fi [[ -n ${A} ]] && kde5_pkg_setup @@ -65,7 +63,7 @@ src_prepare() { default [[ -n ${A} ]] || return - # add all linguas to cmake + # add all l10n to cmake cat <<-EOF > CMakeLists.txt || die project(kdepim-l10n) cmake_minimum_required(VERSION 2.8.12) @@ -87,10 +85,11 @@ EOF # Remove everything except kdepim, kdepimlibs, kdepim-runtime and pim local LNG DIR - for LNG in ${LINGUAS}; do + for LNG in ${MY_LANGS}; do DIR="kde-l10n-${LNG}-${PV}" SDIR="${S}/${DIR}/5/${LNG}" if [[ -d "${DIR}" ]] ; then + einfo " L10N: ${LNG/[@_]/-}" for SUBDIR in data docs messages scripts ; do if [[ -d "${SDIR}/${SUBDIR}" ]] ; then