diff options
| author |   Manuel Rüger <mrueg@gentoo.org> | 2014-12-09 18:38:57 +0000 |
|---|---|---|
| committer | Manuel Rüger <mrueg@gentoo.org> | 2014-12-09 18:38:57 +0000 |
| commit | 291ffdf5c96c7402e40280ae8a0a936db519a5b1 (patch) | |
| tree | aadc019b20cc368173144466058eac1ac6cef36c /eclass | |
| parent | version bump (diff) | |
| download | gentoo-2-291ffdf5c96c7402e40280ae8a0a936db519a5b1.tar.gz gentoo-2-291ffdf5c96c7402e40280ae8a0a936db519a5b1.tar.bz2 gentoo-2-291ffdf5c96c7402e40280ae8a0a936db519a5b1.zip | |
Sync kde4-base.eclass with overlay.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/kde4-base.eclass | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index fdf7fb833b94..75ba17fcb2e1 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1455 2014/12/07 19:15:18 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1456 2014/12/09 18:38:57 mrueg Exp $ + + 09 Dec 2014; Manuel Rüger <mrueg@gentoo.org> kde4-base.eclass: + Sync kde4-base.eclass with overlay. 07 Dec 2014; Michał Górny <mgorny@gentoo.org> distutils-r1.eclass, python-r1.eclass: diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 80e399d7cc31..ddd466db76cc 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.144 2014/12/04 10:32:10 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.145 2014/12/09 18:38:57 mrueg Exp $ # @ECLASS: kde4-base.eclass # @MAINTAINER: @@ -346,7 +346,7 @@ if [[ ${KDEBASE} != "kde-base" && -n ${KDE_LINGUAS} ]]; then # 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}(+)") ) + linguas_${_lingua}? ( || ( kde-apps/kde-l10n[linguas_${_lingua}(+)] $(add_kdebase_dep kde-l10n "linguas_${_lingua}(+)") ) ) " done unset _lingua |