| 1 |
commit: 30acc29edb868d0c68d6152bf29db1a63d685e49 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 2 12:45:35 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=30acc29e |
| 7 |
|
| 8 |
kde-apps/kde4-l10n: Migrate to L10N |
| 9 |
|
| 10 |
kde-apps/kde4-l10n/kde4-l10n-15.12.3-r1.ebuild | 20 ++++++------ |
| 11 |
kde-apps/kde4-l10n/kde4-l10n-16.04.2.ebuild | 42 ++++++++++++-------------- |
| 12 |
2 files changed, 29 insertions(+), 33 deletions(-) |
| 13 |
|
| 14 |
diff --git a/kde-apps/kde4-l10n/kde4-l10n-15.12.3-r1.ebuild b/kde-apps/kde4-l10n/kde4-l10n-15.12.3-r1.ebuild |
| 15 |
index a49561d..45a8a0c 100644 |
| 16 |
--- a/kde-apps/kde4-l10n/kde4-l10n-15.12.3-r1.ebuild |
| 17 |
+++ b/kde-apps/kde4-l10n/kde4-l10n-15.12.3-r1.ebuild |
| 18 |
@@ -39,13 +39,13 @@ LURI_BASE="mirror://kde/stable/${LV}/src/${KMNAME}" |
| 19 |
SRC_URI="" |
| 20 |
|
| 21 |
for MY_LANG in ${LEGACY_LANGS} ; do |
| 22 |
- IUSE="${IUSE} linguas_${MY_LANG}" |
| 23 |
- SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${LURI_BASE}/${KMNAME}-${MY_LANG}-${LV}.tar.xz )" |
| 24 |
+ IUSE="${IUSE} l10n_${MY_LANG/[@_]/-}" |
| 25 |
+ SRC_URI="${SRC_URI} l10n_${MY_LANG/[@_]/-}? ( ${LURI_BASE}/${KMNAME}-${MY_LANG}-${LV}.tar.xz )" |
| 26 |
done |
| 27 |
|
| 28 |
for MY_LANG in ${MY_LANGS} ; do |
| 29 |
- IUSE="${IUSE} linguas_${MY_LANG}" |
| 30 |
- SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE}/${KMNAME}-${MY_LANG}-${PV}.tar.xz )" |
| 31 |
+ IUSE="${IUSE} l10n_${MY_LANG/[@_]/-}" |
| 32 |
+ SRC_URI="${SRC_URI} l10n_${MY_LANG/[@_]/-}? ( ${URI_BASE}/${KMNAME}-${MY_LANG}-${PV}.tar.xz )" |
| 33 |
done |
| 34 |
|
| 35 |
S="${WORKDIR}" |
| 36 |
@@ -53,12 +53,10 @@ S="${WORKDIR}" |
| 37 |
src_unpack() { |
| 38 |
if [[ -z ${A} ]]; then |
| 39 |
elog |
| 40 |
- elog "You either have the LINGUAS variable unset, or it only" |
| 41 |
- elog "contains languages not supported by ${P}." |
| 42 |
- elog "You won't have any additional language support." |
| 43 |
+ elog "None of the requested L10N are supported by ${P}." |
| 44 |
elog |
| 45 |
elog "${P} supports these language codes:" |
| 46 |
- elog "${MY_LANGS}" |
| 47 |
+ elog "${MY_LANGS//[@_]/-}" |
| 48 |
elog |
| 49 |
fi |
| 50 |
|
| 51 |
@@ -67,9 +65,9 @@ src_unpack() { |
| 52 |
|
| 53 |
src_prepare() { |
| 54 |
local LNG DIR LDIR SDIR |
| 55 |
- # add all linguas to cmake |
| 56 |
+ # add all l10n to cmake |
| 57 |
if [[ -n ${A} ]]; then |
| 58 |
- for LNG in ${LINGUAS}; do |
| 59 |
+ for LNG in ${MY_LANGS} ; do |
| 60 |
DIR="${KMNAME}-${LNG}-${PV}" |
| 61 |
LDIR="${KMNAME}-${LNG}-${LV}" |
| 62 |
SDIR="${S}/${DIR}/4/${LNG}" |
| 63 |
@@ -97,7 +95,7 @@ src_prepare() { |
| 64 |
einfo " messages..." |
| 65 |
for path in $(grep -v "^#" "${REMOVE_MSGS}") ; do |
| 66 |
rm -f "${SDIR}"/messages/${path} |
| 67 |
- # Quirk for LINGUAS=sr variants |
| 68 |
+ # Quirk for L10N=sr variants |
| 69 |
if [[ ${LNG} = "sr" ]] ; then |
| 70 |
rm -f "${SDIR}"/${LNG}\@*/messages/${path} || die |
| 71 |
fi |
| 72 |
|
| 73 |
diff --git a/kde-apps/kde4-l10n/kde4-l10n-16.04.2.ebuild b/kde-apps/kde4-l10n/kde4-l10n-16.04.2.ebuild |
| 74 |
index 959c6a2..b4a2e81 100644 |
| 75 |
--- a/kde-apps/kde4-l10n/kde4-l10n-16.04.2.ebuild |
| 76 |
+++ b/kde-apps/kde4-l10n/kde4-l10n-16.04.2.ebuild |
| 77 |
@@ -34,18 +34,18 @@ MY_LANGS="ar ast bg bs ca ca@valencia cs da de el en_GB eo es et eu fa fi fr ga |
| 78 |
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 |
| 79 |
ru sk sl sr sv tr ug uk wa zh_CN zh_TW" |
| 80 |
|
| 81 |
-IUSE="+minimal test $(printf 'linguas_%s ' ${MY_LANGS})" |
| 82 |
+IUSE="+minimal test $(printf 'l10n_%s ' ${MY_LANGS//[@_]/-})" |
| 83 |
|
| 84 |
URI_BASE="${SRC_URI/-${PV}.tar.xz/}" |
| 85 |
LURI_BASE="mirror://kde/stable/${LV}/src/${KMNAME}" |
| 86 |
SRC_URI="" |
| 87 |
|
| 88 |
for MY_LANG in ${LEGACY_LANGS} ; do |
| 89 |
- SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${LURI_BASE}/${KMNAME}-${MY_LANG}-${LV}.tar.xz )" |
| 90 |
+ SRC_URI="${SRC_URI} l10n_${MY_LANG/[@_]/-}? ( ${LURI_BASE}/${KMNAME}-${MY_LANG}-${LV}.tar.xz )" |
| 91 |
done |
| 92 |
|
| 93 |
for MY_LANG in ${MY_LANGS} ; do |
| 94 |
- SRC_URI="${SRC_URI} linguas_${MY_LANG}? ( ${URI_BASE}/${KMNAME}-${MY_LANG}-${PV}.tar.xz )" |
| 95 |
+ SRC_URI="${SRC_URI} l10n_${MY_LANG/[@_]/-}? ( ${URI_BASE}/${KMNAME}-${MY_LANG}-${PV}.tar.xz )" |
| 96 |
done |
| 97 |
|
| 98 |
S="${WORKDIR}" |
| 99 |
@@ -53,12 +53,10 @@ S="${WORKDIR}" |
| 100 |
pkg_setup() { |
| 101 |
if [[ -z ${A} ]]; then |
| 102 |
elog |
| 103 |
- elog "You either have the LINGUAS variable unset, or it only" |
| 104 |
- elog "contains languages not supported by ${P}." |
| 105 |
- elog "You won't have any additional language support." |
| 106 |
+ elog "None of the requested L10N are supported by ${P}." |
| 107 |
elog |
| 108 |
elog "${P} supports these language codes:" |
| 109 |
- elog "${MY_LANGS}" |
| 110 |
+ elog "${MY_LANGS//[@_]/-}" |
| 111 |
elog |
| 112 |
fi |
| 113 |
[[ -n ${A} ]] && kde4-base_pkg_setup |
| 114 |
@@ -78,27 +76,27 @@ src_prepare() { |
| 115 |
default |
| 116 |
[[ -n ${A} ]] || return |
| 117 |
|
| 118 |
- # LINGUAS=sr variants are subdirs within sr/ ... |
| 119 |
+ # L10N=sr variants are subdirs within sr/ ... |
| 120 |
if use minimal && [[ -d "${KMNAME}-sr-${PV}" ]] ; then |
| 121 |
for variant in "${KMNAME}"-sr-${PV}/4/sr/sr@*; do |
| 122 |
mkdir -p "${KMNAME}-${variant##*/}-${PV}/4" || |
| 123 |
- die "Failed to create LINGUAS=${variant##*/} subdir" |
| 124 |
+ die "Failed to create L10N=${variant##*/} subdir" |
| 125 |
mv ${variant} "${KMNAME}-${variant##*/}-${PV}/4/${variant##*/}" || |
| 126 |
- die "Failed to move LINGUAS=${variant##*/}" |
| 127 |
+ die "Failed to move L10N=${variant##*/}" |
| 128 |
cp -f "${KMNAME}-sr-${PV}"/CMakeLists.txt "${KMNAME}-${variant##*/}-${PV}" || |
| 129 |
- die "Failed to prepare LINGUAS=${variant##*/} subdir" |
| 130 |
+ die "Failed to prepare L10N=${variant##*/} subdir" |
| 131 |
echo "add_subdirectory(${variant##*/})" > "${KMNAME}-${variant##*/}-${PV}"/4/CMakeLists.txt || |
| 132 |
- die "Failed to prepare LINGUAS=${variant##*/} subdir" |
| 133 |
+ die "Failed to prepare L10N=${variant##*/} subdir" |
| 134 |
cp -f "${KMNAME}-sr-${PV}"/4/sr/CMakeLists.txt "${KMNAME}-${variant##*/}-${PV}"/4/${variant##*/} || |
| 135 |
- die "Failed to prepare LINGUAS=${variant##*/} subdir" |
| 136 |
+ die "Failed to prepare L10N=${variant##*/} subdir" |
| 137 |
sed -e "/^macro.*sr/d" \ |
| 138 |
-e "s/sr/${variant##*/}/" \ |
| 139 |
-i "${KMNAME}-${variant##*/}-${PV}"/4/${variant##*/}/CMakeLists.txt || |
| 140 |
- die "Failed to prepare LINGUAS=${variant##*/} subdir" |
| 141 |
+ die "Failed to prepare L10N=${variant##*/} subdir" |
| 142 |
done |
| 143 |
fi |
| 144 |
|
| 145 |
- # add all linguas to cmake |
| 146 |
+ # add all l10n to cmake |
| 147 |
cat <<-EOF > CMakeLists.txt || die |
| 148 |
project(kde4-l10n) |
| 149 |
cmake_minimum_required(VERSION 2.8.12) |
| 150 |
@@ -115,9 +113,9 @@ EOF |
| 151 |
|
| 152 |
einfo "Directories..." |
| 153 |
while read path; do |
| 154 |
- if use test ; then # build a report w/ LINGUAS="*" to submit @upstream |
| 155 |
+ if use test ; then # build a report w/ L10N="*" to submit @upstream |
| 156 |
local lngs |
| 157 |
- for lng in ${LINGUAS}; do |
| 158 |
+ for lng in ${MY_LANGS}; do |
| 159 |
SDIR="${S}/${KMNAME}-${lng}-${PV}/4/${lng}" |
| 160 |
if [[ -d "${SDIR}"/${path%\ *}/${path#*\ } ]] ; then |
| 161 |
lngs+=" ${lng}" |
| 162 |
@@ -131,15 +129,15 @@ EOF |
| 163 |
-i ./*/4/*/${path%\ *}/CMakeLists.txt || \ |
| 164 |
die "Failed to comment out ${path}" |
| 165 |
else |
| 166 |
- einfo "F: ${path}" # run with LINGUAS="*" to cut down list |
| 167 |
+ einfo "F: ${path}" # run with L10N="*" to cut down list |
| 168 |
fi |
| 169 |
done < <(grep -ve "^$\|^\s*\#" "${REMOVE_DIRS}") |
| 170 |
einfo |
| 171 |
einfo "Messages..." |
| 172 |
while read path; do |
| 173 |
- if use test ; then # build a report w/ LINGUAS="*" to submit @upstream |
| 174 |
+ if use test ; then # build a report w/ L10N="*" to submit @upstream |
| 175 |
local lngs |
| 176 |
- for lng in ${LINGUAS}; do |
| 177 |
+ for lng in ${MY_LANGS}; do |
| 178 |
SDIR="${S}/${KMNAME}-${lng}-${PV}/4/${lng}" |
| 179 |
if [[ -e "${SDIR}"/messages/${path} ]] ; then |
| 180 |
lngs+=" ${lng}" |
| 181 |
@@ -151,12 +149,12 @@ EOF |
| 182 |
if ls -U ./*/4/*/messages/${path} > /dev/null 2>&1; then |
| 183 |
rm ./*/4/*/messages/${path} || die "Failed to remove ${path}" |
| 184 |
else |
| 185 |
- einfo "F: ${path}" # run with LINGUAS="*" to cut down list |
| 186 |
+ einfo "F: ${path}" # run with L10N="*" to cut down list |
| 187 |
fi |
| 188 |
done < <(grep -ve "^$\|^\s*\#" "${REMOVE_MSGS}") |
| 189 |
else |
| 190 |
local LNG LDIR |
| 191 |
- for LNG in ${LINGUAS}; do |
| 192 |
+ for LNG in ${LEGACY_LANGS}; do |
| 193 |
LDIR="${KMNAME}-${LNG}-${LV}" |
| 194 |
if [[ -d "${KMNAME}-${LNG}-${PV}" && -d "${LDIR}" ]] ; then |
| 195 |
einfo "${LNG}: Adding legacy localisation" |
Archives