summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2008-10-02 14:58:37 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2008-10-02 14:58:37 +0000
commit3d41c6c34a01999d040ee0cc31c1bccc44c50162 (patch)
tree8fcb01c3052e2535a7d2b5cbf65ba4c070862721 /media-libs/fontconfig
parentclean up for bug #237302 (diff)
downloadhistorical-3d41c6c34a01999d040ee0cc31c1bccc44c50162.tar.gz
historical-3d41c6c34a01999d040ee0cc31c1bccc44c50162.tar.bz2
historical-3d41c6c34a01999d040ee0cc31c1bccc44c50162.zip
Because opfer was so thoughtful as to change the name of a useflag on stable package :-), people who had built docbook-sgml-utils before September 2nd would have built it with tetex to get docbook2pdf. This changes the built_with_use logic to take that into consideration.
Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.27-rc8 x86_64
Diffstat (limited to 'media-libs/fontconfig')
-rw-r--r--media-libs/fontconfig/ChangeLog9
-rw-r--r--media-libs/fontconfig/Manifest4
-rw-r--r--media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild7
3 files changed, 15 insertions, 5 deletions
diff --git a/media-libs/fontconfig/ChangeLog b/media-libs/fontconfig/ChangeLog
index 437e7d34cb52..29750046aeca 100644
--- a/media-libs/fontconfig/ChangeLog
+++ b/media-libs/fontconfig/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for media-libs/fontconfig
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.127 2008/10/01 15:42:34 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/ChangeLog,v 1.128 2008/10/02 14:58:37 loki_val Exp $
+
+ 02 Oct 2008; Peter Alfredsen <loki_val@gentoo.org>
+ fontconfig-2.6.0-r2.ebuild:
+ Because opfer was so thoughtful as to change the name of a useflag on
+ stable package, people who had built docbook-sgml-utils before September
+ 2nd would have built it with tetex to get docbook2pdf. This changes the
+ built_with_use logic to take that into consideration.
01 Oct 2008; Peter Alfredsen <loki_val@gentoo.org>
ChangeLog, fontconfig-2.6.0-r2.ebuild:
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 47e5b895db31..d67665714abf 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -6,6 +6,6 @@ DIST fontconfig-2.5.0.tar.gz 1385058 RMD160 2c61ba3adc49aa5dd4eb081e13a849cc1d62
DIST fontconfig-2.6.0.tar.gz 1403857 RMD160 2fea7fa3fe1757b58ce53c4225b9f8e6ec7507bf SHA1 93752566b8327485b153bd156049614f779b4c57 SHA256 a9a639eaa0e5666606a4657cc1494eb6df820fac7e5a2aa0c3f7e703b7c8d8a5
EBUILD fontconfig-2.4.2.ebuild 2414 RMD160 4c7488d70c9e4380ae73525e7f15a122de85f2b5 SHA1 479f03bcf14b76e10e67950a5925991f00494388 SHA256 e0274d8c6fb723b4f0bc39e2e6596c4b61b8c6d15f0a79ab160d4945c0ac3ee0
EBUILD fontconfig-2.5.0-r1.ebuild 2505 RMD160 e65b8588e50e6f56ddaebbe9e75f0600e18e98a9 SHA1 55f256b214f5d2bef1d78ef61a747d61b6f77266 SHA256 2b6ecdb834a51f4ef21dd265127e82eb60474edc1dc83dceec4f1c987b64c5b5
-EBUILD fontconfig-2.6.0-r2.ebuild 3311 RMD160 f9b06fa38350271d7fb7619cde7b1a27a5636ff4 SHA1 6093cf887ca2612f229d16d2b99c23af2587bd67 SHA256 4cc0934beee3268114b9b21ad94fcfc43c4c053609bfeb8f612ae4f30f45ea30
-MISC ChangeLog 19887 RMD160 5d6352bf879d2888d705c864a88cdb4a734989da SHA1 67a6b561933ed17631916e9940cc4a53b40105c7 SHA256 57ba18324be27a6b4f47d66f33e726c9d7b99a3a530dc816e3640afaf2e2a010
+EBUILD fontconfig-2.6.0-r2.ebuild 3415 RMD160 f8abd203a51927861be13036835c5a61943c7985 SHA1 3339165718a248b6fa8a2a733d8402ca3b6c564a SHA256 b20a12733d926297c3f080cd8c27f7a8781d172843bcba9cb7ddeb92f13837b5
+MISC ChangeLog 20248 RMD160 220b26e725dc65336ec9efb1ee5180d99d66659c SHA1 3ad6600772d8f09f32be040691e369998cab4c98 SHA256 6eb016934534938d4e9d393da8ceebc710f23b9c349e846360414eb2bf27507f
MISC metadata.xml 419 RMD160 898b8233ab233060d8137dadf28c291b83a65500 SHA1 ee62c352812f8765122e5a65b7df5f8794c6c485 SHA256 859faa6fc0c008e92a6432f0fd50a760170d724b15997e557d5d73088277c4db
diff --git a/media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild b/media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild
index a6fa620d7b09..1082b0f012e2 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.8 2008/10/01 15:39:01 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fontconfig/fontconfig-2.6.0-r2.ebuild,v 1.9 2008/10/02 14:58:37 loki_val Exp $
WANT_AUTOMAKE=1.9
@@ -32,7 +32,10 @@ PDEPEND="app-admin/eselect-fontconfig"
pkg_setup() {
#To get docbook2pdf
- if use doc && ! built_with_use app-text/docbook-sgml-utils jadetex
+ if use doc && ! { built_with_use --missing false app-text/docbook-sgml-utils jadetex \
+ || \
+ built_with_use --missing false app-text/docbook-sgml-utils tetex;
+ }
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