commit: becf07543e1dcc97fc5c3d099c0d393f77997b32
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat May 7 19:51:47 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun May 8 20:30:39 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=becf0754
l10n.eclass: Sort and normalize PLOCALES in l10n_find_plocales_change
l10n_find_plocales_change assumes that PLOCALES is sorted
alphanumerically with a single space between each entry and no
surrounding whitespace. This is not a bad assumption but it isn't
documented and it's inconvenient in at least one particular case.
MakeMKV uses non-standard locale names and I intend to map these using
an associative array, which is possible as of EAPI 6. This allows me
to do the following, though only with the above change as associative
arrays are not ordered.
declare -A MY_LOCALES
MY_LOCALES=( [zh]=chi [da]=dan … )
PLOCALES="${!MY_LOCALES[@]}"
inherit l10n
src_prepare() {
PLOCALES="${MY_LOCALES[@]}" l10n_find_plocales_changes …
}
src_install() {
for locale in $(l10n_get_locales); do
doins makemkv_${MY_LOCALES[${locale}]}.mo.gz
done
}
Fixes bug #513242.
eclass/l10n.eclass | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/eclass/l10n.eclass b/eclass/l10n.eclass
index a7a6a26..0f29d56 100644
--- a/eclass/l10n.eclass
+++ b/eclass/l10n.eclass
@@ -86,7 +86,9 @@ l10n_find_plocales_changes() {
current+="${x} "
done
popd >/dev/null
- if [[ ${PLOCALES} != ${current%[[:space:]]} ]] ; then
+ # RHS will be sorted with single spaces so ensure the LHS is too
+ # before attempting to compare them for equality. See bug #513242.
+ if [[ $(tr -s "[:space:]" "\n" <<< "${PLOCALES}" | sort | xargs echo)
!= ${current%[[:space:]]} ]] ; then
einfo "There are changes in locales! This ebuild should be
updated to:"
einfo "PLOCALES=\"${current%[[:space:]]}\""
else
