From ac67876184b989a262d198d4afbaacf3be6ab84c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Manuel=20R=C3=BCger?= Date: Tue, 9 Dec 2014 18:38:57 +0000 Subject: [PATCH] Sync kde4-base.eclass with overlay. --- eclass/ChangeLog | 5 ++++- 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 kde4-base.eclass: + Sync kde4-base.eclass with overlay. 07 Dec 2014; Michał Górny 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 -- 2.26.2