summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@gentoo.org>2006-07-10 06:05:27 +0000
committerDoug Goldstein <cardoe@gentoo.org>2006-07-10 06:05:27 +0000
commitab920adbd8d63258b7e02124e980697c56ee7c4d (patch)
tree040962270acda322970798d5662e4eac4ec538b0
parentInitial import. (diff)
downloadhistorical-ab920adbd8d63258b7e02124e980697c56ee7c4d.tar.gz
historical-ab920adbd8d63258b7e02124e980697c56ee7c4d.tar.bz2
historical-ab920adbd8d63258b7e02124e980697c56ee7c4d.zip
remove beta versions, RESTRICT=test and drop those depends which caused circular deps
Package-Manager: portage-2.1.1_pre2-r6
-rw-r--r--x11-libs/cairo/ChangeLog7
-rw-r--r--x11-libs/cairo/cairo-1.2.0.ebuild8
2 files changed, 10 insertions, 5 deletions
diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 5aa7380e8277..79db53c4dddf 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-libs/cairo
# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.75 2006/07/09 07:21:38 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.76 2006/07/10 06:05:27 cardoe Exp $
+
+ 10 Jul 2006; Doug Goldstein <cardoe@gentoo.org>
+ -files/cairo-1.1.6-poppler-revert.patch, -cairo-1.1.6.ebuild,
+ -cairo-1.1.6-r1.ebuild, -cairo-1.1.8.ebuild:
+ remove beta versions, RESTRICT=test and drop those depends which caused circular deps
09 Jul 2006; Doug Goldstein <cardoe@gentoo.org> cairo-1.2.0.ebuild:
add notice about revdep-rebuild. add DirectFB backend support. Clean up warnings.
diff --git a/x11-libs/cairo/cairo-1.2.0.ebuild b/x11-libs/cairo/cairo-1.2.0.ebuild
index bd6fc1c5cfba..21df5db2ed0c 100644
--- a/x11-libs/cairo/cairo-1.2.0.ebuild
+++ b/x11-libs/cairo/cairo-1.2.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.2.0.ebuild,v 1.2 2006/07/09 07:21:38 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.2.0.ebuild,v 1.3 2006/07/10 06:05:27 cardoe Exp $
inherit eutils flag-o-matic
@@ -13,6 +13,9 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="directfb doc glitz pdf png svg X"
+# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
+RESTRICT="test"
+
RDEPEND="media-libs/fontconfig
>=media-libs/freetype-2.1.4
X? ( || (
@@ -26,9 +29,6 @@ RDEPEND="media-libs/fontconfig
directfb? ( dev-libs/DirectFB )
glitz? ( >=media-libs/glitz-0.5.1 )
png? ( media-libs/libpng )
- pdf? ( >=app-text/poppler-bindings-0.4.1
- x11-libs/pango
- >=x11-libs/gtk+-2 )
svg? ( dev-libs/libxml2 )
!<x11-libs/cairo-0.2"
DEPEND="${RDEPEND}