Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/kdepim-l10n/
Date: Sun, 03 Jul 2016 16:09:04
Message-Id: 1467562115.167c45876320bbea3bcbd9d749bcd438b6832c25.mgorny@gentoo
1 commit: 167c45876320bbea3bcbd9d749bcd438b6832c25
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 2 12:52:09 2016 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 3 16:08:35 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=167c4587
7
8 kde-apps/kdepim-l10n: Migrate to L10N
9
10 kde-apps/kdepim-l10n/kdepim-l10n-15.12.3.ebuild | 14 ++++++--------
11 kde-apps/kdepim-l10n/kdepim-l10n-4.14.3-r1.ebuild | 16 +++++++---------
12 kde-apps/kdepim-l10n/kdepim-l10n-4.4.11.1-r2.ebuild | 14 ++++++--------
13 3 files changed, 19 insertions(+), 25 deletions(-)
14
15 diff --git a/kde-apps/kdepim-l10n/kdepim-l10n-15.12.3.ebuild b/kde-apps/kdepim-l10n/kdepim-l10n-15.12.3.ebuild
16 index 57055dc..e8c8248 100644
17 --- a/kde-apps/kdepim-l10n/kdepim-l10n-15.12.3.ebuild
18 +++ b/kde-apps/kdepim-l10n/kdepim-l10n-15.12.3.ebuild
19 @@ -35,8 +35,8 @@ URI_BASE="${SRC_URI/-${PV}.tar.xz/}"
20 SRC_URI=""
21
22 for MY_LANG in ${MY_LANGS} ; do
23 - IUSE="${IUSE} linguas_${MY_LANG}"
24 - SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE/kdepim/kde}/kde-l10n-${MY_LANG}-${PV}.tar.xz )"
25 + IUSE="${IUSE} l10n_${MY_LANG/[@_]/-}"
26 + SRC_URI="${SRC_URI} l10n_${MY_LANG/[@_]/-}? ( ${URI_BASE/kdepim/kde}/kde-l10n-${MY_LANG}-${PV}.tar.xz )"
27 done
28
29 S="${WORKDIR}"
30 @@ -44,12 +44,10 @@ S="${WORKDIR}"
31 src_unpack() {
32 if [[ -z ${A} ]]; then
33 elog
34 - elog "You either have the LINGUAS variable unset, or it only"
35 - elog "contains languages not supported by ${P}."
36 - elog "You won't have any additional language support."
37 + elog "None of the requested L10N are supported by ${P}."
38 elog
39 elog "${P} supports these language codes:"
40 - elog "${MY_LANGS}"
41 + elog "${MY_LANGS//[@_]/-}"
42 elog
43 fi
44
45 @@ -60,9 +58,9 @@ src_prepare() {
46 default
47
48 local LNG DIR
49 - # add all linguas to cmake
50 + # add all l10n to cmake
51 if [[ -n ${A} ]]; then
52 - for LNG in ${LINGUAS}; do
53 + for LNG in ${MY_LANGS}; do
54 DIR="kde-l10n-${LNG}-${PV}"
55 SDIR="${S}/${DIR}/5/${LNG}"
56 if [[ -d "${DIR}" ]] ; then
57
58 diff --git a/kde-apps/kdepim-l10n/kdepim-l10n-4.14.3-r1.ebuild b/kde-apps/kdepim-l10n/kdepim-l10n-4.14.3-r1.ebuild
59 index 66fbf72..523c2b8 100644
60 --- a/kde-apps/kdepim-l10n/kdepim-l10n-4.14.3-r1.ebuild
61 +++ b/kde-apps/kdepim-l10n/kdepim-l10n-4.14.3-r1.ebuild
62 @@ -1,4 +1,4 @@
63 -# Copyright 1999-2015 Gentoo Foundation
64 +# Copyright 1999-2016 Gentoo Foundation
65 # Distributed under the terms of the GNU General Public License v2
66 # $Id$
67
68 @@ -31,8 +31,8 @@ URI_BASE="${SRC_URI/-${PV}.tar.xz/}"
69 SRC_URI=""
70
71 for MY_LANG in ${MY_LANGS} ; do
72 - IUSE="${IUSE} linguas_${MY_LANG}"
73 - SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE/kdepim/kde}/kde-l10n-${MY_LANG}-${PV}.tar.xz )"
74 + IUSE="${IUSE} l10n_${MY_LANG/[@_]/-}"
75 + SRC_URI="${SRC_URI} l10n_${MY_LANG/[@_]/-}? ( ${URI_BASE/kdepim/kde}/kde-l10n-${MY_LANG}-${PV}.tar.xz )"
76 done
77
78 S="${WORKDIR}"
79 @@ -40,12 +40,10 @@ S="${WORKDIR}"
80 src_unpack() {
81 if [[ -z ${A} ]]; then
82 elog
83 - elog "You either have the LINGUAS variable unset, or it only"
84 - elog "contains languages not supported by ${P}."
85 - elog "You won't have any additional language support."
86 + elog "None of the requested L10N are supported by ${P}."
87 elog
88 elog "${P} supports these language codes:"
89 - elog "${MY_LANGS}"
90 + elog "${MY_LANGS//[@_]/-}"
91 elog
92 fi
93
94 @@ -55,9 +53,9 @@ src_unpack() {
95
96 src_prepare() {
97 local LNG DIR
98 - # add all linguas to cmake
99 + # add all l10n to cmake
100 if [[ -n ${A} ]]; then
101 - for LNG in ${LINGUAS}; do
102 + for LNG in ${MY_LANGS}; do
103 DIR="kde-l10n-${LNG}-${PV}"
104 if [[ -d "${DIR}" ]] ; then
105 echo "add_subdirectory( ${DIR} )" >> "${S}"/CMakeLists.txt
106
107 diff --git a/kde-apps/kdepim-l10n/kdepim-l10n-4.4.11.1-r2.ebuild b/kde-apps/kdepim-l10n/kdepim-l10n-4.4.11.1-r2.ebuild
108 index 3f02b70..56d98aa 100644
109 --- a/kde-apps/kdepim-l10n/kdepim-l10n-4.4.11.1-r2.ebuild
110 +++ b/kde-apps/kdepim-l10n/kdepim-l10n-4.4.11.1-r2.ebuild
111 @@ -32,8 +32,8 @@ URI_BASE="mirror://kde/Attic/4.4.5/src/kde-l10n"
112 SRC_URI=""
113
114 for MY_LANG in ${MY_LANGS} ; do
115 - IUSE="${IUSE} linguas_${MY_LANG}"
116 - SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE}/kde-l10n-${MY_LANG}-4.4.5.tar.bz2 )"
117 + IUSE="${IUSE} l10n_${MY_LANG/[@_]/-}"
118 + SRC_URI="${SRC_URI} l10n_${MY_LANG/[@_]/-}? ( ${URI_BASE}/kde-l10n-${MY_LANG}-4.4.5.tar.bz2 )"
119 done
120
121 S="${WORKDIR}"
122 @@ -42,12 +42,10 @@ src_unpack() {
123 local LNG DIR
124 if [[ -z ${A} ]]; then
125 elog
126 - elog "You either have the LINGUAS variable unset, or it only"
127 - elog "contains languages not supported by ${P}."
128 - elog "You won't have any additional language support."
129 + elog "None of the requested L10N are supported by ${P}."
130 elog
131 elog "${P} supports these language codes:"
132 - elog "${MY_LANGS}"
133 + elog "${MY_LANGS//[@_]/-}"
134 elog
135 fi
136
137 @@ -55,9 +53,9 @@ src_unpack() {
138 [[ -n ${A} ]] && unpack ${A}
139 cd "${S}"
140
141 - # for all linguas do:
142 + # for all l10n do:
143 if [[ -n ${A} ]]; then
144 - for LNG in ${LINGUAS}; do
145 + for LNG in ${MY_LANGS}; do
146 einfo "Processing ${LNG} localization"
147 DIR="kde-l10n-${LNG}-4.4.5"