x11-libs/cairo: Change virtual/xft dependency to x11-libs/libXft, bug 253771.

(Portage version: 2.2_rc20/cvs/Linux 2.6.27-gentoo-r2 x86_64)

9 files changed, 29 insertions, 23 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 65b96e424b35..f75b5c4292d4 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.207 2009/01/04 17:36:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.208 2009/01/05 13:26:13 remi Exp $
+
+  05 Jan 2009; Rémi Cardona <remi@gentoo.org> cairo-1.4.12.ebuild,
+  cairo-1.4.14.ebuild, cairo-1.6.4.ebuild, cairo-1.6.4-r1.ebuild,
+  cairo-1.8.0.ebuild, cairo-1.8.2.ebuild, cairo-1.8.4.ebuild,
+  cairo-1.8.6.ebuild:
+  Change virtual/xft dependency to x11-libs/libXft, bug 253771.
 
   04 Jan 2009; Raúl Porcel <armin76@gentoo.org> cairo-1.6.4.ebuild,
   cairo-1.6.4-r1.ebuild:
diff --git a/x11-libs/cairo/cairo-1.4.12.ebuild b/x11-libs/cairo/cairo-1.4.12.ebuild
index f124be86a70f..6fa8ab946771 100644
--- a/x11-libs/cairo/cairo-1.4.12.ebuild
+++ b/x11-libs/cairo/cairo-1.4.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.4.12.ebuild,v 1.8 2007/12/11 22:01:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.4.12.ebuild,v 1.9 2009/01/05 13:26:13 remi Exp $
 
 inherit eutils flag-o-matic libtool
 
@@ -23,7 +23,7 @@ RDEPEND="media-libs/fontconfig
 				x11-libs/libXrender
 				x11-libs/libXext
 				x11-libs/libX11
-				virtual/xft
+				x11-libs/libXft
 				xcb? ( x11-libs/libxcb
 						x11-libs/xcb-util )
 			)
diff --git a/x11-libs/cairo/cairo-1.4.14.ebuild b/x11-libs/cairo/cairo-1.4.14.ebuild
index 45317d2c91b1..486cf7b38a5d 100644
--- a/x11-libs/cairo/cairo-1.4.14.ebuild
+++ b/x11-libs/cairo/cairo-1.4.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.4.14.ebuild,v 1.7 2008/04/13 22:49:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.4.14.ebuild,v 1.8 2009/01/05 13:26:13 remi Exp $
 
 inherit eutils flag-o-matic libtool
 
@@ -23,7 +23,7 @@ RDEPEND="media-libs/fontconfig
 				x11-libs/libXrender
 				x11-libs/libXext
 				x11-libs/libX11
-				virtual/xft
+				x11-libs/libXft
 				xcb? ( x11-libs/libxcb
 						x11-libs/xcb-util )
 			)
diff --git a/x11-libs/cairo/cairo-1.6.4-r1.ebuild b/x11-libs/cairo/cairo-1.6.4-r1.ebuild
index a425ff2784e4..868459556b89 100644
--- a/x11-libs/cairo/cairo-1.6.4-r1.ebuild
+++ b/x11-libs/cairo/cairo-1.6.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.6.4-r1.ebuild,v 1.8 2009/01/04 17:36:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.6.4-r1.ebuild,v 1.9 2009/01/05 13:26:13 remi Exp $
 
 inherit eutils flag-o-matic libtool
 
@@ -25,7 +25,7 @@ RDEPEND="media-libs/fontconfig
 				x11-libs/libXrender
 				x11-libs/libXext
 				x11-libs/libX11
-				virtual/xft
+				x11-libs/libXft
 				xcb? ( x11-libs/libxcb
 						x11-libs/xcb-util )
 			)
diff --git a/x11-libs/cairo/cairo-1.6.4.ebuild b/x11-libs/cairo/cairo-1.6.4.ebuild
index 10483de3dc6d..d1cf36aaa9ee 100644
--- a/x11-libs/cairo/cairo-1.6.4.ebuild
+++ b/x11-libs/cairo/cairo-1.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.6.4.ebuild,v 1.13 2009/01/04 17:36:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.6.4.ebuild,v 1.14 2009/01/05 13:26:13 remi Exp $
 
 inherit eutils flag-o-matic libtool
 
@@ -25,7 +25,7 @@ RDEPEND="media-libs/fontconfig
 				x11-libs/libXrender
 				x11-libs/libXext
 				x11-libs/libX11
-				virtual/xft
+				x11-libs/libXft
 				xcb? ( x11-libs/libxcb
 						x11-libs/xcb-util )
 			)
diff --git a/x11-libs/cairo/cairo-1.8.0.ebuild b/x11-libs/cairo/cairo-1.8.0.ebuild
index b18a661f91ee..2c4f231127a5 100644
--- a/x11-libs/cairo/cairo-1.8.0.ebuild
+++ b/x11-libs/cairo/cairo-1.8.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.8.0.ebuild,v 1.7 2008/12/31 21:48:56 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.8.0.ebuild,v 1.8 2009/01/05 13:26:13 remi Exp $
 
 inherit eutils flag-o-matic libtool
 
@@ -27,7 +27,7 @@ RDEPEND="media-libs/fontconfig
 	X? ( 	>=x11-libs/libXrender-0.6
 		x11-libs/libXext
 		x11-libs/libX11
-		virtual/xft )
+		x11-libs/libXft )
 	xcb? (	>=x11-libs/libxcb-0.92
 		x11-libs/xcb-util )"
 #	test? (
diff --git a/x11-libs/cairo/cairo-1.8.2.ebuild b/x11-libs/cairo/cairo-1.8.2.ebuild
index 2743b80d477f..5f182a1c55dd 100644
--- a/x11-libs/cairo/cairo-1.8.2.ebuild
+++ b/x11-libs/cairo/cairo-1.8.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.8.2.ebuild,v 1.3 2008/12/31 21:48:56 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.8.2.ebuild,v 1.4 2009/01/05 13:26:13 remi Exp $
 
 inherit eutils flag-o-matic libtool
 
@@ -27,7 +27,7 @@ RDEPEND="media-libs/fontconfig
 	X? ( 	>=x11-libs/libXrender-0.6
 		x11-libs/libXext
 		x11-libs/libX11
-		virtual/xft )
+		x11-libs/libXft )
 	xcb? (	>=x11-libs/libxcb-0.92
 		x11-libs/xcb-util )"
 #	test? (
diff --git a/x11-libs/cairo/cairo-1.8.4.ebuild b/x11-libs/cairo/cairo-1.8.4.ebuild
index b998da8d7268..44abd9a5613d 100644
--- a/x11-libs/cairo/cairo-1.8.4.ebuild
+++ b/x11-libs/cairo/cairo-1.8.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.8.4.ebuild,v 1.3 2008/12/31 21:48:56 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.8.4.ebuild,v 1.4 2009/01/05 13:26:13 remi Exp $
 
 inherit eutils flag-o-matic libtool
 
@@ -27,7 +27,7 @@ RDEPEND="media-libs/fontconfig
 	X? ( 	>=x11-libs/libXrender-0.6
 		x11-libs/libXext
 		x11-libs/libX11
-		virtual/xft )
+		x11-libs/libXft )
 	xcb? (	>=x11-libs/libxcb-0.92
 		x11-libs/xcb-util )"
 #	test? (
diff --git a/x11-libs/cairo/cairo-1.8.6.ebuild b/x11-libs/cairo/cairo-1.8.6.ebuild
index a4e56eef9a09..44c5c5e67bf7 100644
--- a/x11-libs/cairo/cairo-1.8.6.ebuild
+++ b/x11-libs/cairo/cairo-1.8.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.8.6.ebuild,v 1.3 2008/12/31 21:48:56 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.8.6.ebuild,v 1.4 2009/01/05 13:26:13 remi Exp $
 
 inherit eutils flag-o-matic libtool
 
@@ -27,7 +27,7 @@ RDEPEND="media-libs/fontconfig
 	X? ( 	>=x11-libs/libXrender-0.6
 		x11-libs/libXext
 		x11-libs/libX11
-		virtual/xft )
+		x11-libs/libXft )
 	xcb? (	>=x11-libs/libxcb-0.92
 		x11-libs/xcb-util )"
 #	test? (