From: | "Tobias Heinlein (keytoaster)" <keytoaster@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in eclass: kde.eclass |
Date: | Wed, 02 Jan 2008 15:56:03 |
Message-Id: | E1JA5wi-000632-Is@stork.gentoo.org |
1 | keytoaster 08/01/02 15:55:56 |
2 | |
3 | Modified: kde.eclass |
4 | Log: |
5 | Place docs in /usr/share/doc/kde/ rather than /usr/kde/share/doc/, by zlin |
6 | |
7 | Revision Changes Path |
8 | 1.202 eclass/kde.eclass |
9 | |
10 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde.eclass?rev=1.202&view=markup |
11 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde.eclass?rev=1.202&content-type=text/plain |
12 | diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde.eclass?r1=1.201&r2=1.202 |
13 | |
14 | Index: kde.eclass |
15 | =================================================================== |
16 | RCS file: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v |
17 | retrieving revision 1.201 |
18 | retrieving revision 1.202 |
19 | diff -u -r1.201 -r1.202 |
20 | --- kde.eclass 8 Dec 2007 11:11:17 -0000 1.201 |
21 | +++ kde.eclass 2 Jan 2008 15:55:55 -0000 1.202 |
22 | @@ -1,6 +1,6 @@ |
23 | # Copyright 1999-2004 Gentoo Foundation |
24 | # Distributed under the terms of the GNU General Public License v2 |
25 | -# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.201 2007/12/08 11:11:17 keytoaster Exp $ |
26 | +# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.202 2008/01/02 15:55:55 keytoaster Exp $ |
27 | # |
28 | # Author Dan Armak <danarmak@g.o> |
29 | # |
30 | @@ -376,11 +376,11 @@ |
31 | shift |
32 | done |
33 | |
34 | - if [[ -n ${KDEBASE} ]] && [[ "${PN}" != "arts" ]] ; then |
35 | + if [[ -n ${KDEBASE} && "${PN}" != "arts" && -d "${D}"/usr/share/doc/${PF} ]]; then |
36 | # work around bug #97196 |
37 | - dodir ${KDEDIR}/share/doc/ |
38 | - [[ -d "${D}/usr/share/doc/${PF}" ]] && \ |
39 | - mv "${D}/usr/share/doc/${PF}" "${D}/${KDEDIR}/share/doc/" |
40 | + dodir /usr/share/doc/kde && \ |
41 | + mv "${D}"/usr/share/doc/${PF} "${D}"/usr/share/doc/kde/ || \ |
42 | + die "Failed to move docs to kde/ failed." |
43 | fi |
44 | } |
45 | |
46 | |
47 | |
48 | |
49 | -- |
50 | gentoo-commits@g.o mailing list |