Gentoo Archives: gentoo-commits

From: "Peter Alfredsen (loki_val)" <loki_val@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/fontconfig: fontconfig-2.6.0-r2.ebuild
Date: Wed, 01 Oct 2008 15:39:04
Message-Id: E1Kl3n3-0008R6-VL@stork.gentoo.org
1 loki_val 08/10/01 15:39:01
2
3 Modified: fontconfig-2.6.0-r2.ebuild
4 Log:
5 Fix emerge failure reported in bug 238908. We need to depend on the right DTD when building sgml docs and docbook-sgml-utils must be built with jadetex so we can have docbook2pdf. Incidentally, we get a false QA failure where the build system runs ../missing --run, which looks like maintainer-mode rebuild to portage. That one will have to be fixed in portage. Also rub away minor typo that caused warning about running dohtml on a dir.
6 (Portage version: 2.2_rc11/cvs/Linux 2.6.27-rc8 x86_64)
7
8 Revision Changes Path
9 1.8 media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild?rev=1.8&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild?rev=1.8&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild?r1=1.7&r2=1.8
14
15 Index: fontconfig-2.6.0-r2.ebuild
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild,v
18 retrieving revision 1.7
19 retrieving revision 1.8
20 diff -u -r1.7 -r1.8
21 --- fontconfig-2.6.0-r2.ebuild 1 Oct 2008 14:43:28 -0000 1.7
22 +++ fontconfig-2.6.0-r2.ebuild 1 Oct 2008 15:39:01 -0000 1.8
23 @@ -1,6 +1,6 @@
24 # Copyright 1999-2008 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26 -# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild,v 1.7 2008/10/01 14:43:28 ranger Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild,v 1.8 2008/10/01 15:39:01 loki_val Exp $
28
29 WANT_AUTOMAKE=1.9
30
31 @@ -26,9 +26,18 @@
32 >=dev-libs/expat-1.95.3"
33 DEPEND="${RDEPEND}
34 dev-util/pkgconfig
35 - doc? ( app-text/docbook-sgml-utils )"
36 + doc? ( app-text/docbook-sgml-utils
37 + =app-text/docbook-sgml-dtd-3.1* )"
38 PDEPEND="app-admin/eselect-fontconfig"
39
40 +pkg_setup() {
41 + #To get docbook2pdf
42 + if use doc && ! built_with_use app-text/docbook-sgml-utils jadetex
43 + then
44 + die "For this package to be built with the doc use flag, app-text/docbook-sgml-utils must be built with the jadetex use flag"
45 + fi
46 +}
47 +
48 src_unpack() {
49 unpack ${A}
50 cd "${S}"
51 @@ -75,7 +84,7 @@
52
53 if use doc; then
54 doman doc/Fc*.3
55 - dohtml doc/fontconfig-devel.html doc
56 + dohtml doc/fontconfig-devel.html
57 dodoc doc/fontconfig-devel.{txt,pdf}
58 fi