11 files changed, 17 insertions, 21 deletions
diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 3d5e9b4a7f74..b476fe839240 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,12 @@
 # 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.35 2005/05/05 22:46:11 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.36 2005/05/05 23:19:47 latexer Exp $
+
+  05 May 2005; Peter Johanson <latexer@gentoo.org> cairo-0.1.18.ebuild,
+  cairo-0.1.18-r1.ebuild, cairo-0.1.23.ebuild, cairo-0.1.23-r1.ebuild,
+  cairo-0.2.0.ebuild, cairo-0.2.0-r1.ebuild, cairo-0.3.0.ebuild,
+  cairo-0.3.0-r1.ebuild, cairo-0.3.0-r2.ebuild, cairo-0.4.0.ebuild:
+  Remove references to xfree (makes dependancies easier)
 
   05 May 2005; Sven Wegener <swegener@gentoo.org> cairo-0.1.18.ebuild,
   cairo-0.1.18-r1.ebuild, cairo-0.1.23.ebuild, cairo-0.1.23-r1.ebuild,
diff --git a/x11-libs/cairo/cairo-0.1.18-r1.ebuild b/x11-libs/cairo/cairo-0.1.18-r1.ebuild
index 00c3787eef95..cc361fe13dff 100644
--- a/x11-libs/cairo/cairo-0.1.18-r1.ebuild
+++ b/x11-libs/cairo/cairo-0.1.18-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.18-r1.ebuild,v 1.6 2005/05/05 22:46:11 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-0.1.18-r1.ebuild,v 1.7 2005/05/05 23:19:47 latexer Exp $
 
 DESCRIPTION="A vector graphics library with cross-device output support"
 HOMEPAGE="http://cairographics.org/"
@@ -10,7 +10,6 @@ SLOT="0"
 KEYWORDS="~x86 ppc"
 IUSE=""
 DEPEND="virtual/x11
-	|| ( >=x11-base/xfree-4.3.0-r7 x11-base/xorg-x11 )
 	virtual/xft
 	media-libs/fontconfig
 	>=media-libs/freetype-2
diff --git a/x11-libs/cairo/cairo-0.1.18.ebuild b/x11-libs/cairo/cairo-0.1.18.ebuild
index 4e75ca24630e..bf3f8a7ee0bd 100644
--- a/x11-libs/cairo/cairo-0.1.18.ebuild
+++ b/x11-libs/cairo/cairo-0.1.18.ebuild
@@ -1,6 +1,6 @@
 # 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.1.18.ebuild,v 1.12 2005/05/05 22:46:11 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-0.1.18.ebuild,v 1.13 2005/05/05 23:19:47 latexer Exp $
 
 DESCRIPTION="A vector graphics library with cross-device output support"
 HOMEPAGE="http://cairographics.org/"
@@ -10,7 +10,6 @@ SLOT="0"
 KEYWORDS="x86 ppc"
 IUSE=""
 DEPEND="virtual/x11
-	!>=x11-base/xfree-4.3.0-r7
 	virtual/xft
 	media-libs/fontconfig
 	>=media-libs/freetype-2
diff --git a/x11-libs/cairo/cairo-0.1.23-r1.ebuild b/x11-libs/cairo/cairo-0.1.23-r1.ebuild
index a533388d20e9..3b99533e6e12 100644
--- a/x11-libs/cairo/cairo-0.1.23-r1.ebuild
+++ b/x11-libs/cairo/cairo-0.1.23-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.23-r1.ebuild,v 1.15 2005/05/05 22:46:11 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-0.1.23-r1.ebuild,v 1.16 2005/05/05 23:19:47 latexer Exp $
 
 DESCRIPTION="A vector graphics library with cross-device output support"
 HOMEPAGE="http://cairographics.org/"
@@ -12,7 +12,6 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc sparc x86"
 IUSE=""
 
 DEPEND="virtual/x11
-	|| ( >=x11-base/xfree-4.3.0-r7 x11-base/xorg-x11 )
 	virtual/xft
 	media-libs/fontconfig
 	>=media-libs/freetype-2
diff --git a/x11-libs/cairo/cairo-0.1.23.ebuild b/x11-libs/cairo/cairo-0.1.23.ebuild
index 67803a418067..9b8ca47f98a7 100644
--- a/x11-libs/cairo/cairo-0.1.23.ebuild
+++ b/x11-libs/cairo/cairo-0.1.23.ebuild
@@ -1,6 +1,6 @@
 # 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.1.23.ebuild,v 1.12 2005/05/05 22:46:11 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-0.1.23.ebuild,v 1.13 2005/05/05 23:19:47 latexer Exp $
 
 DESCRIPTION="A vector graphics library with cross-device output support"
 HOMEPAGE="http://cairographics.org/"
@@ -10,7 +10,6 @@ SLOT="0"
 KEYWORDS="x86 ~ppc ~amd64 ~sparc"
 IUSE=""
 DEPEND="virtual/x11
-	!>=x11-base/xfree-4.3.0-r7
 	!x11-base/xorg-x11
 	virtual/xft
 	media-libs/fontconfig
diff --git a/x11-libs/cairo/cairo-0.2.0-r1.ebuild b/x11-libs/cairo/cairo-0.2.0-r1.ebuild
index eaf7da58a503..764bfa73fdbb 100644
--- a/x11-libs/cairo/cairo-0.2.0-r1.ebuild
+++ b/x11-libs/cairo/cairo-0.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.2.0-r1.ebuild,v 1.2 2005/05/05 22:46:11 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-0.2.0-r1.ebuild,v 1.3 2005/05/05 23:19:47 latexer Exp $
 
 DESCRIPTION="A vector graphics library with cross-device output support"
 HOMEPAGE="http://cairographics.org/"
@@ -14,7 +14,6 @@ IUSE="glitz png X"
 DEPEND="X? (
 			virtual/xft
 			virtual/x11
-			|| ( >=x11-base/xfree-4.3.0-r7 x11-base/xorg-x11 )
 		)
 		media-libs/fontconfig
 		>=media-libs/freetype-2
diff --git a/x11-libs/cairo/cairo-0.2.0.ebuild b/x11-libs/cairo/cairo-0.2.0.ebuild
index a4e2ba7d6f04..d472884797cd 100644
--- a/x11-libs/cairo/cairo-0.2.0.ebuild
+++ b/x11-libs/cairo/cairo-0.2.0.ebuild
@@ -1,6 +1,6 @@
 # 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.2.0.ebuild,v 1.9 2005/05/05 22:46:11 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-0.2.0.ebuild,v 1.10 2005/05/05 23:19:47 latexer Exp $
 
 DESCRIPTION="A vector graphics library with cross-device output support"
 HOMEPAGE="http://cairographics.org/"
@@ -12,7 +12,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~ppc64"
 IUSE="glitz png"
 
 DEPEND="virtual/x11
-	|| ( >=x11-base/xfree-4.3.0-r7 x11-base/xorg-x11 )
 	virtual/xft
 	media-libs/fontconfig
 	>=media-libs/freetype-2
diff --git a/x11-libs/cairo/cairo-0.3.0-r1.ebuild b/x11-libs/cairo/cairo-0.3.0-r1.ebuild
index 50b597881b26..6815d6476cf0 100644
--- a/x11-libs/cairo/cairo-0.3.0-r1.ebuild
+++ b/x11-libs/cairo/cairo-0.3.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.3.0-r1.ebuild,v 1.2 2005/05/05 22:46:11 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-0.3.0-r1.ebuild,v 1.3 2005/05/05 23:19:47 latexer Exp $
 
 DESCRIPTION="A vector graphics library with cross-device output support"
 HOMEPAGE="http://cairographics.org/"
@@ -14,7 +14,6 @@ IUSE="glitz png X"
 DEPEND="X? (
 			virtual/x11
 			virtual/xft
-			|| ( >=x11-base/xfree-4.3.0-r7 x11-base/xorg-x11 )
 		)
 		media-libs/fontconfig
 		>=media-libs/freetype-2
diff --git a/x11-libs/cairo/cairo-0.3.0-r2.ebuild b/x11-libs/cairo/cairo-0.3.0-r2.ebuild
index a0b0ba2421c6..092cadb2fad6 100644
--- a/x11-libs/cairo/cairo-0.3.0-r2.ebuild
+++ b/x11-libs/cairo/cairo-0.3.0-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.3.0-r2.ebuild,v 1.2 2005/05/05 22:46:11 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-0.3.0-r2.ebuild,v 1.3 2005/05/05 23:19:47 latexer Exp $
 
 inherit eutils
 
@@ -16,7 +16,6 @@ IUSE="glitz png X"
 DEPEND="X? (
 			virtual/x11
 			virtual/xft
-			|| ( >=x11-base/xfree-4.3.0-r7 x11-base/xorg-x11 )
 		)
 		media-libs/fontconfig
 		>=media-libs/freetype-2
diff --git a/x11-libs/cairo/cairo-0.3.0.ebuild b/x11-libs/cairo/cairo-0.3.0.ebuild
index 3b0c95d01925..08bc4f03ebd6 100644
--- a/x11-libs/cairo/cairo-0.3.0.ebuild
+++ b/x11-libs/cairo/cairo-0.3.0.ebuild
@@ -1,6 +1,6 @@
 # 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.3.0.ebuild,v 1.6 2005/05/05 22:46:11 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-0.3.0.ebuild,v 1.7 2005/05/05 23:19:47 latexer Exp $
 
 DESCRIPTION="A vector graphics library with cross-device output support"
 HOMEPAGE="http://cairographics.org/"
@@ -12,7 +12,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ppc64"
 IUSE="glitz png"
 
 DEPEND="virtual/x11
-	|| ( >=x11-base/xfree-4.3.0-r7 x11-base/xorg-x11 )
 	virtual/xft
 	media-libs/fontconfig
 	>=media-libs/freetype-2
diff --git a/x11-libs/cairo/cairo-0.4.0.ebuild b/x11-libs/cairo/cairo-0.4.0.ebuild
index 01c73d7bca70..d525ce4cc9c7 100644
--- a/x11-libs/cairo/cairo-0.4.0.ebuild
+++ b/x11-libs/cairo/cairo-0.4.0.ebuild
@@ -1,6 +1,6 @@
 # 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.4.0.ebuild,v 1.2 2005/05/05 22:46:11 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-0.4.0.ebuild,v 1.3 2005/05/05 23:19:47 latexer Exp $
 
 inherit eutils
 
@@ -16,7 +16,6 @@ IUSE="glitz png X"
 DEPEND="X? (
 			virtual/x11
 			virtual/xft
-			|| ( >=x11-base/xfree-4.3.0-r7 x11-base/xorg-x11 )
 		)
 		media-libs/fontconfig
 		>=media-libs/freetype-2