diff options
| author |   Peter Alfredsen <loki_val@gentoo.org> | 2008-10-01 15:39:01 +0000 |
|---|---|---|
| committer | Peter Alfredsen <loki_val@gentoo.org> | 2008-10-01 15:39:01 +0000 |
| commit | a57d8cccc3612d611c2167c4b2fbfd4679b54e9a (patch) | |
| tree | 637647998760a9f9a48704b8bc02542afcf06485 /media-libs | |
| parent | add missing patch files (bug #239134) (diff) | |
| download | gentoo-2-a57d8cccc3612d611c2167c4b2fbfd4679b54e9a.tar.gz gentoo-2-a57d8cccc3612d611c2167c4b2fbfd4679b54e9a.tar.bz2 gentoo-2-a57d8cccc3612d611c2167c4b2fbfd4679b54e9a.zip | |
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.
(Portage version: 2.2_rc11/cvs/Linux 2.6.27-rc8 x86_64)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild b/media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild index 480000919cb3..a6fa620d7b09 100644 --- a/media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild +++ b/media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $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 $ +# $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 $ WANT_AUTOMAKE=1.9 @@ -26,9 +26,18 @@ RDEPEND=">=media-libs/freetype-2.1.4 >=dev-libs/expat-1.95.3" DEPEND="${RDEPEND} dev-util/pkgconfig - doc? ( app-text/docbook-sgml-utils )" + doc? ( app-text/docbook-sgml-utils + =app-text/docbook-sgml-dtd-3.1* )" PDEPEND="app-admin/eselect-fontconfig" +pkg_setup() { + #To get docbook2pdf + if use doc && ! built_with_use app-text/docbook-sgml-utils jadetex + then + 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" + fi +} + src_unpack() { unpack ${A} cd "${S}" @@ -75,7 +84,7 @@ src_install() { if use doc; then doman doc/Fc*.3 - dohtml doc/fontconfig-devel.html doc + dohtml doc/fontconfig-devel.html dodoc doc/fontconfig-devel.{txt,pdf} fi |