diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-04-22 11:18:34 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-04-22 11:18:34 +0000 |
| commit | 900a7c7f6f386e95208df6e54dc8eae71cb91f27 (patch) | |
| tree | 84d9b5a4c7bd0c020e9b6b212669d66ad9668bb0 /eclass | |
| parent | upstream bugl (diff) | |
| download | gentoo-2-900a7c7f6f386e95208df6e54dc8eae71cb91f27.tar.gz gentoo-2-900a7c7f6f386e95208df6e54dc8eae71cb91f27.tar.bz2 gentoo-2-900a7c7f6f386e95208df6e54dc8eae71cb91f27.zip | |
Rework the kde-l10n handling so it is less annoying for users with no lingua selected.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde4-base.eclass | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 2a0a5ad0f6f9..175025cbfbf7 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.88 2011/04/21 20:01:23 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.89 2011/04/22 11:18:34 scarabeus Exp $ # @ECLASS: kde4-base.eclass # @MAINTAINER: @@ -378,14 +378,16 @@ fi # add a dependency over kde-l10n if EAPI4 is around if [[ ${KDEBASE} != "kde-base" ]] && [[ -n ${KDE_LINGUAS} ]] && has "${EAPI:-0}" 4; then - usedep='' for _lingua in ${KDE_LINGUAS}; do - [[ -n ${usedep} ]] && usedep+="," - usedep+="linguas_${_lingua}(+)?" + # if our package has lignuas, pull in kde-l10n with selected lingua enabled, + # but only for selected ones. + # this can't be done on one line because if user doesn't use any localisation + # then he is probably not interested in kde-l10n at all. + kderdepend+=" + linguas_${_lingua}? ( $(add_kdebase_dep kde-l10n linguas_${_lingua}(+)?) ) + " done - # if our package has lignuas pull in kde-l10n with selected lingua - kderdepend+=" $(add_kdebase_dep kde-l10n ${usedep})" - unset usedep _lingua + unset _lingua fi kdehandbookdepend=" |