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 E10C81382DE for ; Sun, 3 Jul 2016 16:09:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ECAD6E09FF; Sun, 3 Jul 2016 16:09:02 +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 4C354E09D2 for ; Sun, 3 Jul 2016 16:09:01 +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 534BE340D3C for ; Sun, 3 Jul 2016 16:09:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DAECE243F for ; Sun, 3 Jul 2016 16:08:55 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1467562115.c956ebc489ff0f590908a8f11693d01a13122c52.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/kde-l10n/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-apps/kde-l10n/kde-l10n-15.12.3-r2.ebuild kde-apps/kde-l10n/kde-l10n-16.04.2.ebuild X-VCS-Directories: kde-apps/kde-l10n/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: c956ebc489ff0f590908a8f11693d01a13122c52 X-VCS-Branch: master Date: Sun, 3 Jul 2016 16:08:55 +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: 4cd9ceb8-672d-41fb-8344-926562a7e2f6 X-Archives-Hash: a5ddaeeea146b4c3143ada5ecee8e233 commit: c956ebc489ff0f590908a8f11693d01a13122c52 Author: Michał Górny gentoo org> AuthorDate: Fri Jul 1 09:08:14 2016 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Jul 3 16:08:35 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c956ebc4 kde-apps/kde-l10n: Migrate to L10N kde-apps/kde-l10n/kde-l10n-15.12.3-r2.ebuild | 22 ++++++++++------------ kde-apps/kde-l10n/kde-l10n-16.04.2.ebuild | 12 +++++------- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/kde-apps/kde-l10n/kde-l10n-15.12.3-r2.ebuild b/kde-apps/kde-l10n/kde-l10n-15.12.3-r2.ebuild index 41c76ff..c6b07dd 100644 --- a/kde-apps/kde-l10n/kde-l10n-15.12.3-r2.ebuild +++ b/kde-apps/kde-l10n/kde-l10n-15.12.3-r2.ebuild @@ -34,12 +34,12 @@ MY_LANGS="ar 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//[_@]/-})" URI_BASE="${SRC_URI/-${PV}.tar.xz/}" SRC_URI="mirror://kde/stable/plasma/${KHC_PV}/${KHC}.tar.xz" for my_lang in ${MY_LANGS} ; do - SRC_URI="${SRC_URI} linguas_${my_lang}? ( ${URI_BASE}/${PN}-${my_lang}-${PV}.tar.xz )" + SRC_URI="${SRC_URI} l10n_${my_lang//[_@]/-}? ( ${URI_BASE}/${PN}-${my_lang}-${PV}.tar.xz )" done S="${WORKDIR}" @@ -47,12 +47,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 MULTIBUILD_VARIANTS=( l10n khelpcenter-l10n ) @@ -75,9 +73,9 @@ src_unpack() { src_prepare() { default - [[ ${LINGUAS} = "" ]] && return + [[ ${L10N} = "" ]] && return - # add all linguas to cmake + # add all l10n to cmake cat <<-EOF > CMakeLists.txt || die project(kde-l10n) cmake_minimum_required(VERSION 2.8.12) @@ -100,7 +98,7 @@ EOF if [[ -d ${KHC}/po ]] ; then pushd ${KHC}/po > /dev/null || die for lang in *; do - if [[ -d ${lang} ]] && ! has ${lang} ${LINGUAS} ; then + if [[ -d ${lang} ]] && ! has "${lang/[@_]/-}" ${L10N} ; then rm -r ${lang} || die if [[ -e CMakeLists.txt ]] ; then cmake_comment_add_subdirectory ${lang} @@ -148,15 +146,15 @@ src_configure() { fi kde5_src_configure } - [[ ${LINGUAS} != "" ]] && multibuild_foreach_variant myconfigure + [[ ${L10N} != "" ]] && multibuild_foreach_variant myconfigure } src_compile() { - [[ ${LINGUAS} != "" ]] && multibuild_foreach_variant kde5_src_compile + [[ ${L10N} != "" ]] && multibuild_foreach_variant kde5_src_compile } src_test() { :; } src_install() { - [[ ${LINGUAS} != "" ]] && multibuild_foreach_variant kde5_src_install + [[ ${L10N} != "" ]] && multibuild_foreach_variant kde5_src_install } diff --git a/kde-apps/kde-l10n/kde-l10n-16.04.2.ebuild b/kde-apps/kde-l10n/kde-l10n-16.04.2.ebuild index b57d3e0..af44a91 100644 --- a/kde-apps/kde-l10n/kde-l10n-16.04.2.ebuild +++ b/kde-apps/kde-l10n/kde-l10n-16.04.2.ebuild @@ -31,12 +31,12 @@ 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//[_@]/-})" 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}/${PN}-${my_lang}-${PV}.tar.xz )" + SRC_URI="${SRC_URI} l10n_${my_lang//[_@]/-}? ( ${URI_BASE}/${PN}-${my_lang}-${PV}.tar.xz )" done S="${WORKDIR}" @@ -44,12 +44,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 @@ -67,7 +65,7 @@ src_prepare() { default [[ -n ${A} ]] || return - # add all linguas to cmake + # add all l10n to cmake cat <<-EOF > CMakeLists.txt || die project(kde-l10n) cmake_minimum_required(VERSION 2.8.12)