diff options
| author | Tomas Chvatal <scarabeus@gentoo.org> | 2011-04-22 13:26:45 +0200 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-04-22 13:26:45 +0200 |
| commit | d96c54ba7d615340aea90f10b1f4ff99c133fe01 (patch) | |
| tree | daff9672703c605216166f5bfc58bf7ee8ae3d36 /eclass | |
| parent | e8bae0d84b7d5fc34034af7a83d69eb96218f0f4 (diff) | |
| download | kde-d96c54ba7d615340aea90f10b1f4ff99c133fe01.tar.gz kde-d96c54ba7d615340aea90f10b1f4ff99c133fe01.tar.bz2 kde-d96c54ba7d615340aea90f10b1f4ff99c133fe01.zip | |
[eclass] Sync with main tree.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde4-base.eclass | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 3e263826700..a877f5525f6 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -379,14 +379,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=" @@ -472,7 +474,7 @@ _calculate_src_uri() { # KDEPIM IS SPECIAL [[ ${KMNAME} == "kdepim" || ${KMNAME} == "kdepim-runtime" ]] && SRC_URI="mirror://kde/unstable/kdepim/${PV}/${_kmname_pv}.tar.bz2" ;; - 4.4.[6789] | 4.4.1?) + 4.4.[6789] | 4.4.1?*) # Stable kdepim releases SRC_URI="mirror://kde/stable/kdepim-${PV}/src/${_kmname_pv}.tar.bz2" ;; @@ -939,7 +941,7 @@ kde4-base_src_install() { # In EAPI 4+, we don't want ${PREFIX}/share/doc/HTML to be compressed, # because then khelpcenter can't find the docs - [[ ${EAPI} != 3 && -d ${ED}/${PREFIX}/share/doc/HTML ]] && + [[ ${EAPI:-0} != 3 && -d ${ED}/${PREFIX}/share/doc/HTML ]] && docompress -x ${PREFIX}/share/doc/HTML } |