summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarinus Schraal <foser@gentoo.org>2005-07-31 10:56:28 +0000
committerMarinus Schraal <foser@gentoo.org>2005-07-31 10:56:28 +0000
commitc34b22c237e597e4b5df7e3bd727957fd158ed41 (patch)
treef8bb2bdde5ea4a33bc1af4548228f7f577b9ddec /x11-libs/cairo
parentppc stable (diff)
downloadgentoo-2-c34b22c237e597e4b5df7e3bd727957fd158ed41.tar.gz
gentoo-2-c34b22c237e597e4b5df7e3bd727957fd158ed41.tar.bz2
gentoo-2-c34b22c237e597e4b5df7e3bd727957fd158ed41.zip
real fix
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'x11-libs/cairo')
-rw-r--r--x11-libs/cairo/ChangeLog4
-rw-r--r--x11-libs/cairo/cairo-0.6.0.ebuild21
2 files changed, 14 insertions, 11 deletions
diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index c361328354d5..b246ba983471 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,11 +1,11 @@
# ChangeLog for x11-libs/cairo
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.38 2005/07/31 10:34:00 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.39 2005/07/31 10:56:28 foser Exp $
*cairo-0.6.0 (31 Jul 2005)
31 Jul 2005; Marinus Schraal <foser@gentoo.org> cairo-0.6.0.ebuild :
- New release
+ New release, add block instead of patch (see #85285 for details)
09 May 2005; Aron Griffis <agriffis@gentoo.org> cairo-0.3.0.ebuild:
stable on ia64
diff --git a/x11-libs/cairo/cairo-0.6.0.ebuild b/x11-libs/cairo/cairo-0.6.0.ebuild
index 793bb34223e7..a7a415646b5a 100644
--- a/x11-libs/cairo/cairo-0.6.0.ebuild
+++ b/x11-libs/cairo/cairo-0.6.0.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-0.6.0.ebuild,v 1.2 2005/07/31 10:50:20 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-0.6.0.ebuild,v 1.3 2005/07/31 10:56:28 foser Exp $
-#inherit eutils
+inherit eutils
DESCRIPTION="A vector graphics library with cross-device output support"
HOMEPAGE="http://cairographics.org/"
@@ -20,21 +20,24 @@ RDEPEND="X? (
media-libs/fontconfig
>=media-libs/freetype-2
>=media-libs/libpixman-0.1.5
- png? ( media-libs/libpng )"
-# no snapshot available
+ png? ( media-libs/libpng )
+ !<x11-libs/cairo-0.2"
+# the block fixes the issue described in #85285 without patching
+
+# no snapshot available yet
# glitz? ( >=media-libs/glitz-0.4.4 )
DEPEND="${RDEPEND}
dev-util/pkgconfig"
-#src_unpack() {
+src_unpack() {
-# unpack ${A}
+ unpack ${A}
-# cd ${S}
-# epatch ${FILESDIR}/${P}-makefile.patch
+ cd ${S}
+ epatch ${FILESDIR}/${PN}-0.4.0-makefile.patch
-#}
+}
src_compile() {