Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Sat, 29 Aug 2015 16:47:44
Message-Id: 1440866834.42479b34cb8b971543deaa473600989ed352b1f1.kensington@gentoo
1 commit: 42479b34cb8b971543deaa473600989ed352b1f1
2 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
3 AuthorDate: Sat Aug 29 16:33:42 2015 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 29 16:47:14 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42479b34
7
8 kde4-base.eclass: kde-l10n -> kde4-l10n
9
10 Fixes https://bugs.gentoo.org/show_bug.cgi?id=559086
11
12 eclass/kde4-base.eclass | 10 +++++-----
13 1 file changed, 5 insertions(+), 5 deletions(-)
14
15 diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
16 index 8a81c55..e9dfef8 100644
17 --- a/eclass/kde4-base.eclass
18 +++ b/eclass/kde4-base.eclass
19 @@ -331,13 +331,13 @@ if [[ ${PN} != oxygen-icons ]]; then
20 kderdepend+=" kde-apps/oxygen-icons"
21 fi
22
23 -# add a dependency over kde-l10n
24 +# add a dependency over kde4-l10n
25 if [[ ${KDEBASE} != "kde-base" && -n ${KDE_LINGUAS} ]]; then
26 for _lingua in ${KDE_LINGUAS}; do
27 - # if our package has linguas, pull in kde-l10n with selected lingua enabled,
28 + # if our package has linguas, pull in kde4-l10n with selected lingua enabled,
29 # but only for selected ones.
30 # this can't be done on one line because if user doesn't use any localisation
31 - # then he is probably not interested in kde-l10n at all.
32 + # then he is probably not interested in kde4-l10n at all.
33 kderdepend+="
34 linguas_${_lingua}? ( $(add_kdeapps_dep kde4-l10n "linguas_${_lingua}(+)") )
35 "
36 @@ -681,11 +681,11 @@ kde4-base_src_prepare() {
37 fi
38
39 # Enable/disable handbooks for kde4-base packages
40 - # kde-l10n inherits kde4-base but is metpackage, so no check for doc
41 + # kde4-l10n inherits kde4-base but is metapackage, so no check for doc
42 # kdelibs inherits kde4-base but handle installing the handbook itself
43 if ! has kde4-meta ${INHERITED} && in_iuse handbook; then
44 if [[ ${KDEBASE} == kde-base ]]; then
45 - if [[ ${PN} != kde-l10n && ${PN} != kdepim-l10n && ${PN} != kdelibs ]] && use !handbook; then
46 + if [[ ${PN} != kde4-l10n && ${PN} != kdepim-l10n && ${PN} != kdelibs ]] && use !handbook; then
47 # documentation in kde4-functions
48 : ${KDE_DOC_DIRS:=doc}
49 local dir