diff options
| author | Tomas Chvatal <scarabeus@gentoo.org> | 2009-02-22 21:42:55 +0100 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-02-22 21:42:55 +0100 |
| commit | d126640d3551ff1eb76073b772eb4ddaecdbcdf6 (patch) | |
| tree | 140ac654ef6810b87229bbc16ffcfcbcf1b12a90 | |
| parent | de33a9fff299cc7ce663d34c64fe1c107e599fba (diff) | |
| download | kde-d126640d3551ff1eb76073b772eb4ddaecdbcdf6.tar.gz kde-d126640d3551ff1eb76073b772eb4ddaecdbcdf6.tar.bz2 kde-d126640d3551ff1eb76073b772eb4ddaecdbcdf6.zip | |
update linguas dep handling. Per bug #258309.
| -rw-r--r-- | eclass/kde4-base.eclass | 13 | ||||
| -rw-r--r-- | eclass/kde4-functions.eclass | 8 |
2 files changed, 11 insertions, 10 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index d0284830344..a7df84c27d4 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -71,14 +71,23 @@ COMMONDEPEND="${COMMONDEPEND} x11-libs/libXxf86vm " +# localization deps +if [[ -n ${KDE_LINGUAS} ]]; then + LNG_DEP="" + for _lng in ${KDE_LINGUAS}; do + # there must be or due to issue if lingua is not present in kde-l10n so + # it wont die but pick kde-l10n as-is. (better than the stab in the eye) + LNG_DEP="${LNG_DEP} || ( kde-base/kde-l10n[linguas_${_lng}] kde-base/kde-l10n )" + done +fi + # Set common dependencies for all ebuilds that inherit this eclass -# Yes, sandbox-1.3.2 is there :P DEPEND="${DEPEND} ${COMMONDEPEND} >=dev-util/cmake-2.6.2 dev-util/pkgconfig >=sys-apps/sandbox-1.3.2 " -RDEPEND="${RDEPEND} ${COMMONDEPEND}" +RDEPEND="${RDEPEND} ${COMMONDEPEND} ${LNG_DEP}" if [[ $BUILD_TYPE = live ]]; then # Disable tests for live ebuilds diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index 45f608c1de5..2804dfb12c2 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -102,14 +102,6 @@ done # but this default can be overridden by defining KDE_LINGUAS_DIR. enable_selected_linguas() { local lingua sr_mess wp - # inform user about kde-l10n for full translation. - if ! has_version kde-base/kde-l10n; then - echo - elog "For fully translated application you should also emerge" - elog "kde-base/kde-l10n package which ships translated kde core" - elog "strings." - echo - fi # ebuild overridable linguas directory definition KDE_LINGUAS_DIR=${KDE_LINGUAS_DIR:=${S}/po} |