Remove references to xfree (makes dependancies easier)

Package-Manager: portage-2.0.51.21-r1

12 files changed, 28 insertions, 42 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/Manifest b/x11-libs/cairo/Manifest
index 84891b96cd15..f183f6ae03ae 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,17 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c3d7eb23db1afd9b0bd570a85b458c05 cairo-0.3.0.ebuild 899
-MD5 360b5aa2fb32123518fdcd48e3ec7a59 cairo-0.1.18-r1.ebuild 753
-MD5 40c0451436ced800fe45bcbbd5874f93 cairo-0.1.23.ebuild 827
-MD5 d54df31f2d5dbcc402342773a0e1a2dd cairo-0.4.0.ebuild 1044
-MD5 7676e7360434287ab90a1f7ddd16c6a0 cairo-0.3.0-r2.ebuild 1048
-MD5 76a45d7df9ac7e3d11daa75fc9abd356 cairo-0.2.0-r1.ebuild 950
-MD5 a3129c141d344c1d19875265de2ca3c3 cairo-0.1.23-r1.ebuild 810
-MD5 229a74eb9493e4aeee08d6aa60282ac4 cairo-0.1.18.ebuild 784
-MD5 c038c76abc4d8e2fc4d00e676c49ecfe cairo-0.3.0-r1.ebuild 951
-MD5 58a10ca5b9c2eb6100fab04c5bd06248 cairo-0.2.0.ebuild 899
-MD5 6d7bf5addbe67a0cafbee045f1825207 ChangeLog 4747
+MD5 0c79281b7a522934fa419bd83f191994 cairo-0.3.0.ebuild 846
+MD5 b3c7457b7cd79bcb1f482989a0f44ea5 cairo-0.1.18-r1.ebuild 700
+MD5 89b3424208cfab9960dd1cd378bc40bd cairo-0.1.23.ebuild 798
+MD5 7596ee20d8abb8cec077a7d503af5eb4 cairo-0.4.0.ebuild 989
+MD5 39a1bfa4dd3a33d04887dc16db68aca5 cairo-0.3.0-r2.ebuild 993
+MD5 0a152cc88392976576329e27b34861cf cairo-0.2.0-r1.ebuild 895
+MD5 3a4cce771cdc4714c6931467622c9ddc cairo-0.1.23-r1.ebuild 757
+MD5 6530e3394d4bd4331548a567e79b060d cairo-0.1.18.ebuild 755
+MD5 8c638d567411d38e1237596b91a517d8 cairo-0.3.0-r1.ebuild 896
+MD5 f4d2f2c6da53a8412387d1d18d281217 cairo-0.2.0.ebuild 847
+MD5 a24a8b2bed352c87072b3d7ea7141f12 ChangeLog 5080
 MD5 65d1d5c2aa536148fb35cee02b3a8428 metadata.xml 337
 MD5 4df3bcd9171f83ca24b03ab0f8eefb24 files/cairo-0.3.0-header-fix.diff 697
 MD5 cd449933066600e3ac62fa22651a8120 files/xrender.pc 151
@@ -26,10 +23,3 @@ MD5 8045b9ac7481eb952f3c2fdfda944c65 files/digest-cairo-0.1.23-r1 64
 MD5 ee0e0ddbf61c280106ae3683503054a8 files/digest-cairo-0.2.0-r1 63
 MD5 2a0e4de10c4b8aacdb9b5991825b30d5 files/digest-cairo-0.3.0-r1 63
 MD5 2a0e4de10c4b8aacdb9b5991825b30d5 files/digest-cairo-0.3.0-r2 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCeqI7I1lqEGTUzyQRAs7CAJ9Yr8lgwA9wlN6oON89aFD0hDHJ1wCgnD9f
-uxU+G+dHkz7boAuqhqU2Sxk=
-=4Cz1
------END PGP SIGNATURE-----
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