commit: 5af70a56a0427d0ca27a8812dc271fbe0cf26f38 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Tue Jan 9 10:12:18 2018 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Tue Jan 9 13:37:36 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5af70a56
app-office/scribus: Migrate from LINGUAS to L10N. Closes: https://bugs.gentoo.org/643708 Package-Manager: Portage-2.3.19, Repoman-2.3.6 app-office/scribus/scribus-1.4.6.ebuild | 47 +++++++++++++++++++----------- app-office/scribus/scribus-1.5.3-r1.ebuild | 44 ++++++++++++++++++---------- app-office/scribus/scribus-9999.ebuild | 44 ++++++++++++++++++---------- 3 files changed, 86 insertions(+), 49 deletions(-) diff --git a/app-office/scribus/scribus-1.4.6.ebuild b/app-office/scribus/scribus-1.4.6.ebuild index 71e5719cdb1..09084384679 100644 --- a/app-office/scribus/scribus-1.4.6.ebuild +++ b/app-office/scribus/scribus-1.4.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -18,8 +18,27 @@ KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86" IUSE="cairo debug examples hunspell +minimal +pdf scripts templates tk" # a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a} -IUSE_LINGUAS=" af ar bg br ca cs_CZ cy da_DK de@1901 de_CH de el en_AU en_GB en_US eo es_ES et eu fi fr gl hu id it ja ko lt_LT nb_NO nl pl_PL pt_BR pt ru sa sk_SK sl sq sr sv th_TH tr uk zh_CN zh_TW" -IUSE+=" ${IUSE_LINGUAS// / linguas_}" +# Keep this sorted, otherwise eliminating of duplicates below won't work +IUSE_L10N=" af ar bg br ca cs_CZ cy da_DK de_1901 de_CH de el en_AU en_GB en_US eo es_ES et eu fi fr gl hu id it ja ko lt_LT nb_NO nl pl_PL pt_BR pt ru sa sk_SK sl sq sr sv th_TH tr uk zh_CN zh_TW" + +map_lang() { + local lang=${1/_/-} + case $1 in + # Retain the following, which have a specific subtag + de_*|en_*|pt_*|zh_*) ;; + # Consider all other xx_XX as duplicates of the generic xx tag + *_*) lang=${1%%_*} ;; + esac + echo ${lang} +} + +prev_l= +for l in ${IUSE_L10N}; do + l=$(map_lang ${l}) + [[ ${l} != "${prev_l}" ]] && IUSE+=" l10n_${l}" + prev_l=${l} +done +unset l prev_l REQUIRED_USE=" ${PYTHON_REQUIRED_USE} @@ -76,9 +95,9 @@ src_prepare() { src_configure() { local _lang lang langs - for lang in ${IUSE_LINGUAS}; do - _lang=$(translate_lang ${lang}) - if use linguas_${lang}; then + for _lang in ${IUSE_L10N}; do + lang=$(map_lang ${_lang}) + if use l10n_${lang}; then langs+=",${_lang}" else sed -e "/${_lang}/d" -i scribus/doc/CMakeLists.txt || die @@ -110,10 +129,11 @@ src_configure() { src_install() { cmake-utils_src_install - local lang file - for lang in ${IUSE_LINGUAS}; do - file="${ED}"/usr/share/scribus/translations/scribus.${lang}.qm - if ! use linguas_${lang} && [[ -f "${file}" ]]; then + local _lang lang file + for _lang in ${IUSE_L10N}; do + lang=$(map_lang ${_lang}) + file="${ED}"/usr/share/scribus/translations/scribus.${_lang}.qm + if ! use l10n_${lang} && [[ -f "${file}" ]]; then rm "${file}" || die fi done @@ -149,10 +169,3 @@ pkg_postrm() { fdo-mime_desktop_database_update fdo-mime_mime_database_update } - -translate_lang() { - _lang=${1} - [[ ${1} == "ru_RU" ]] && _lang+=_0 - [[ ${1} == "de@1901" ]] && _lang=de_1901 - echo ${_lang} -} diff --git a/app-office/scribus/scribus-1.5.3-r1.ebuild b/app-office/scribus/scribus-1.5.3-r1.ebuild index 98015e52135..0c8f8171b5e 100644 --- a/app-office/scribus/scribus-1.5.3-r1.ebuild +++ b/app-office/scribus/scribus-1.5.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -19,8 +19,27 @@ KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk" #a=$((ls resources/translations/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'; ls resources/loremipsum/*xml | sed -e 's:\.: :g' -e 's:loremipsum\/: :g'| awk '{print $2}'; ls resources/dicts/hyph*dic | sed -e 's:\.: :g' -e 's:hyph_: :g' | awk '{print $2}'; ls resources/dicts/README_*txt | sed -e 's:_hyph::g' -e 's:\.: :g' -e 's:README_: :g' | awk '{print $2}') | sort | uniq); echo $a -IUSE_LINGUAS=" af ar bg br ca ca_ES cs cs_CZ cy cy_GB da da_DK de de@1901 de_CH de_DE el en_AU en_GB en_US eo es es_ES et eu fa_IR fi fi_FI fr gl he he_IL hr hu hu_HU ia id id_ID is is_IS it ja kab kn_IN ko ku la lt lt_LT nb_NO nl nn_NO pl pl_PL pt pt_BR pt_PT ro ro_RO ru ru_RU sa sk sk_SK sl sl_SI so sq sr sv sv_SE te th_TH tr uk uk_UA zh_CN zh_TW" -IUSE+=" ${IUSE_LINGUAS// / linguas_}" +# Keep this sorted, otherwise eliminating of duplicates below won't work +IUSE_L10N=" af ar bg br ca ca_ES cs cs_CZ cy cy_GB da da_DK de de_1901 de_CH de_DE el en_AU en_GB en_US eo es es_ES et eu fa_IR fi fi_FI fr gl he he_IL hr hu hu_HU ia id id_ID is is_IS it ja kab kn_IN ko ku la lt lt_LT nb_NO nl nn_NO pl pl_PL pt pt_BR pt_PT ro ro_RO ru ru_RU_0 sa sk sk_SK sl sl_SI so sq sr sv sv_SE te th_TH tr uk uk_UA zh_CN zh_TW" + +map_lang() { + local lang=${1/_/-} + case $1 in + # Retain the following, which have a specific subtag + de_*|en_*|pt_*|zh_*) ;; + # Consider all other xx_XX as duplicates of the generic xx tag + *_*) lang=${1%%_*} ;; + esac + echo ${lang} +} + +prev_l= +for l in ${IUSE_L10N}; do + l=$(map_lang ${l}) + [[ ${l} != "${prev_l}" ]] && IUSE+=" l10n_${l}" + prev_l=${l} +done +unset l prev_l REQUIRED_USE=" ${PYTHON_REQUIRED_USE} @@ -109,9 +128,9 @@ src_configure() { append-cppflags -DHAVE_MEMRCHR local _lang lang langs - for lang in ${IUSE_LINGUAS}; do - _lang=$(translate_lang ${lang}) - if use linguas_${lang} || [[ ${lang} == "en" ]]; then + for _lang in ${IUSE_L10N}; do + lang=$(map_lang ${_lang}) + if use l10n_${lang}; then # From the CMakeLists.txt # "#Bit of a hack, preprocess all the filenames to generate our language string, needed for -DWANT_GUI_LANG=en_GB;de_DE , etc" langs+=";${_lang}" @@ -162,9 +181,9 @@ src_install() { local lang _lang # en_EN can be deleted always - for lang in ${IUSE_LINGUAS}; do - if ! use linguas_${lang}; then - _lang=$(translate_lang ${lang}) + for _lang in ${IUSE_L10N}; do + lang=$(map_lang ${_lang}) + if ! use l10n_${lang}; then safe_delete "${ED%/}"/usr/share/man/${_lang} fi done @@ -226,10 +245,3 @@ safe_delete () { fi done } - -translate_lang() { - _lang=${1} - [[ ${1} == "ru_RU" ]] && _lang+=_0 - [[ ${1} == "de@1901" ]] && _lang=de_1901 - echo ${_lang} -} diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild index b76eeed83ee..b65e60a412b 100644 --- a/app-office/scribus/scribus-9999.ebuild +++ b/app-office/scribus/scribus-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -22,8 +22,27 @@ KEYWORDS="" IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts templates tk" #a=$((ls resources/translations/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'; ls resources/loremipsum/*xml | sed -e 's:\.: :g' -e 's:loremipsum\/: :g'| awk '{print $2}'; ls resources/dicts/hyph*dic | sed -e 's:\.: :g' -e 's:hyph_: :g' | awk '{print $2}'; ls resources/dicts/README_*txt | sed -e 's:_hyph::g' -e 's:\.: :g' -e 's:README_: :g' | awk '{print $2}') | sort | uniq); echo $a -IUSE_LINGUAS=" af ar bg br ca ca_ES cs cs_CZ cy cy_GB da da_DK de de@1901 de_CH de_DE el en_AU en_GB en_US eo es es_ES et eu fa_IR fi fi_FI fr gl he he_IL hr hu hu_HU ia id id_ID is is_IS it ja kab kn_IN ko ku la lt lt_LT nb_NO nl nn_NO pl pl_PL pt pt_BR pt_PT ro ro_RO ru ru_RU sa sk sk_SK sl sl_SI so sq sr sv sv_SE te th_TH tr uk uk_UA zh_CN zh_TW" -IUSE+=" ${IUSE_LINGUAS// / linguas_}" +# Keep this sorted, otherwise eliminating of duplicates below won't work +IUSE_L10N=" af ar bg br ca ca_ES cs cs_CZ cy cy_GB da da_DK de de_1901 de_CH de_DE el en_AU en_GB en_US eo es es_ES et eu fa_IR fi fi_FI fr gl he he_IL hr hu hu_HU ia id id_ID is is_IS it ja kab kn_IN ko ku la lt lt_LT nb_NO nl nn_NO pl pl_PL pt pt_BR pt_PT ro ro_RO ru ru_RU_0 sa sk sk_SK sl sl_SI so sq sr sv sv_SE te th_TH tr uk uk_UA zh_CN zh_TW" + +map_lang() { + local lang=${1/_/-} + case $1 in + # Retain the following, which have a specific subtag + de_*|en_*|pt_*|zh_*) ;; + # Consider all other xx_XX as duplicates of the generic xx tag + *_*) lang=${1%%_*} ;; + esac + echo ${lang} +} + +prev_l= +for l in ${IUSE_L10N}; do + l=$(map_lang ${l}) + [[ ${l} != "${prev_l}" ]] && IUSE+=" l10n_${l}" + prev_l=${l} +done +unset l prev_l REQUIRED_USE=" ${PYTHON_REQUIRED_USE} @@ -110,9 +129,9 @@ src_configure() { append-cppflags -DHAVE_MEMRCHR local _lang lang langs - for lang in ${IUSE_LINGUAS}; do - _lang=$(translate_lang ${lang}) - if use linguas_${lang} || [[ ${lang} == "en" ]]; then + for _lang in ${IUSE_L10N}; do + lang=$(map_lang ${_lang}) + if use l10n_${lang}; then # From the CMakeLists.txt # "#Bit of a hack, preprocess all the filenames to generate our language string, needed for -DWANT_GUI_LANG=en_GB;de_DE , etc" langs+=";${_lang}" @@ -163,9 +182,9 @@ src_install() { local lang _lang # en_EN can be deleted always - for lang in ${IUSE_LINGUAS}; do - if ! use linguas_${lang}; then - _lang=$(translate_lang ${lang}) + for _lang in ${IUSE_L10N}; do + lang=$(map_lang ${_lang}) + if ! use l10n_${lang}; then safe_delete "${ED%/}"/usr/share/man/${_lang} fi done @@ -227,10 +246,3 @@ safe_delete () { fi done } - -translate_lang() { - _lang=${1} - [[ ${1} == "ru_RU" ]] && _lang+=_0 - [[ ${1} == "de@1901" ]] && _lang=de_1901 - echo ${_lang} -}
