[gentoo-commits] repo/gentoo:master commit in: kde-apps/ktp-l10n/

[Michał Górny]

commit:     41fbee0c58e685f254c1a1feae7165e4a41db96d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  2 12:54:39 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 16:08:35 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41fbee0c

kde-apps/ktp-l10n: Migrate to L10N

 kde-apps/ktp-l10n/ktp-l10n-15.12.3.ebuild | 14 ++++++--------
 kde-apps/ktp-l10n/ktp-l10n-16.04.2.ebuild | 14 ++++++--------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/kde-apps/ktp-l10n/ktp-l10n-15.12.3.ebuild 
b/kde-apps/ktp-l10n/ktp-l10n-15.12.3.ebuild
index 48c9d6b..7cc85eb 100644
--- a/kde-apps/ktp-l10n/ktp-l10n-15.12.3.ebuild
+++ b/kde-apps/ktp-l10n/ktp-l10n-15.12.3.ebuild
@@ -42,8 +42,8 @@ URI_BASE="${SRC_URI/-${PV}.tar.xz/}"
 SRC_URI=""
 
 for MY_LANG in ${MY_LANGS} ; do
-       IUSE="${IUSE} linguas_${MY_LANG}"
-       SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( 
${URI_BASE/ktp/kde}/kde-l10n-${MY_LANG}-${PV}.tar.xz )"
+       IUSE="${IUSE} l10n_${MY_LANG/[@_]/-}"
+       SRC_URI="${SRC_URI} l10n_${MY_LANG/[@_]/-}? ( 
${URI_BASE/ktp/kde}/kde-l10n-${MY_LANG}-${PV}.tar.xz )"
 done
 
 S="${WORKDIR}"
@@ -51,12 +51,10 @@ S="${WORKDIR}"
 src_unpack() {
        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
 
@@ -67,9 +65,9 @@ src_prepare() {
        default
 
        local LNG DIR
-       # add all linguas to cmake
+       # add all l10n to cmake
        if [[ -n ${A} ]]; then
-               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

diff --git a/kde-apps/ktp-l10n/ktp-l10n-16.04.2.ebuild 
b/kde-apps/ktp-l10n/ktp-l10n-16.04.2.ebuild
index edb0931..e662e14 100644
--- a/kde-apps/ktp-l10n/ktp-l10n-16.04.2.ebuild
+++ b/kde-apps/ktp-l10n/ktp-l10n-16.04.2.ebuild
@@ -35,12 +35,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/ktp/kde}/kde-l10n-${MY_LANG}-${PV}.tar.xz )"
+       SRC_URI="${SRC_URI} l10n_${MY_LANG/[@_]/-}? ( 
${URI_BASE/ktp/kde}/kde-l10n-${MY_LANG}-${PV}.tar.xz )"
 done
 
 S="${WORKDIR}"
@@ -48,12 +48,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
@@ -71,7 +69,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)
@@ -91,7 +89,7 @@ EOF
 
        # Remove everything except kdenetwork/ktp translations
        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