Gentoo Archives: gentoo-commits

From: "Andreas HAttel (dilfridge)" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: kde4-base.eclass
Date: Wed, 24 Nov 2010 23:55:03
Message-Id: 20101124235455.92B1320057@flycatcher.gentoo.org
1 dilfridge 10/11/24 23:54:55
2
3 Modified: kde4-base.eclass
4 Log:
5 Restrict patching of dtd reference to ebuilds outside kde-proper
6
7 Revision Changes Path
8 1.77 eclass/kde4-base.eclass
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.77&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?rev=1.77&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-base.eclass?r1=1.76&r2=1.77
13
14 Index: kde4-base.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
17 retrieving revision 1.76
18 retrieving revision 1.77
19 diff -u -r1.76 -r1.77
20 --- kde4-base.eclass 27 Oct 2010 21:24:22 -0000 1.76
21 +++ kde4-base.eclass 24 Nov 2010 23:54:55 -0000 1.77
22 @@ -1,6 +1,6 @@
23 # Copyright 1999-2010 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.76 2010/10/27 21:24:22 dilfridge Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.77 2010/11/24 23:54:55 dilfridge Exp $
27
28 # @ECLASS: kde4-base.eclass
29 # @MAINTAINER:
30 @@ -656,11 +656,13 @@
31 load_library_dependencies
32 fi
33
34 - # Hack for manuals relying on outdated DTD
35 - find "${S}" -name "*.docbook" \
36 - -exec sed -i -r \
37 - -e 's:-//KDE//DTD DocBook XML V4\.1(\..)?-Based Variant V1\.[01]//EN:-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN:g' {} + \
38 - || die 'failed to fix DocBook variant version'
39 + # Hack for manuals relying on outdated DTD, only outside kde-base/koffice/...
40 + if [ -z ${KDEBASE} ]; then
41 + find "${S}" -name "*.docbook" \
42 + -exec sed -i -r \
43 + -e 's:-//KDE//DTD DocBook XML V4\.1(\..)?-Based Variant V1\.[01]//EN:-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN:g' {} + \
44 + || die 'failed to fix DocBook variant version'
45 + fi
46 }
47
48 # @FUNCTION: kde4-base_src_configure