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

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.27-gentoo-r4 i686

4 files changed, 19 insertions, 16 deletions

diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog
index f8d895aa5251..120f16c8e38d 100644
--- a/app-office/abiword/ChangeLog
+++ b/app-office/abiword/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/abiword
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.206 2008/12/14 18:42:30 eva Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.207 2009/01/04 22:51:26 ulm Exp $
+
+  04 Jan 2009; Ulrich Mueller <ulm@gentoo.org> abiword-2.4.6.ebuild,
+  abiword-2.6.4.ebuild, abiword-2.6.5.ebuild:
+  Change virtual/xft dependency to x11-libs/libXft, bug 253771.
+  Remove duplicate x11-libs/pango dependency.
 
 *abiword-2.6.5 (14 Dec 2008)
 
diff --git a/app-office/abiword/abiword-2.4.6.ebuild b/app-office/abiword/abiword-2.4.6.ebuild
index 3a8a407a3866..6d483237578b 100644
--- a/app-office/abiword/abiword-2.4.6.ebuild
+++ b/app-office/abiword/abiword-2.4.6.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/app-office/abiword/abiword-2.4.6.ebuild,v 1.14 2007/06/26 07:25:10 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.4.6.ebuild,v 1.15 2009/01/04 22:51:26 ulm Exp $
 
 inherit alternatives eutils fdo-mime
 
@@ -13,12 +13,12 @@ SLOT="2"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="debug gnome spell xml"
 
-RDEPEND="virtual/xft
-		 dev-libs/popt
+RDEPEND="dev-libs/popt
 		 sys-libs/zlib
 		 >=dev-libs/glib-2
 		 >=x11-libs/gtk+-2.4
 		 >=x11-libs/pango-1.2
+		 x11-libs/libXft
 		 >=gnome-base/libglade-2
 		 >=gnome-base/libgnomeprint-2.2
 		 >=gnome-base/libgnomeprintui-2.2
diff --git a/app-office/abiword/abiword-2.6.4.ebuild b/app-office/abiword/abiword-2.6.4.ebuild
index 23ca94f1db0b..e36003d1a892 100644
--- a/app-office/abiword/abiword-2.6.4.ebuild
+++ b/app-office/abiword/abiword-2.6.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/app-office/abiword/abiword-2.6.4.ebuild,v 1.9 2008/09/18 00:26:44 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.6.4.ebuild,v 1.10 2009/01/04 22:51:26 ulm Exp $
 
 EAPI="1"
 
@@ -19,11 +19,11 @@ IUSE="debug gnome spell xml"
 
 # FIXME: gsf could probably be conditional
 
-RDEPEND="virtual/xft
-	dev-libs/popt
+RDEPEND="dev-libs/popt
 	sys-libs/zlib
 	>=dev-libs/glib-2
 	>=x11-libs/gtk+-2.6
+	x11-libs/libXft
 	>=x11-libs/pango-1.2
 	>=gnome-base/libglade-2
 	>=gnome-base/libgnomeprint-2.2
@@ -32,7 +32,6 @@ RDEPEND="virtual/xft
 	>=media-libs/libpng-1.2
 	>=media-libs/fontconfig-2.1
 	>=media-libs/freetype-2.1
-	>=x11-libs/pango-1.2
 	>=app-text/wv-1.2
 	>=dev-libs/fribidi-0.10.4
 	xml? ( >=dev-libs/libxml2-2.4.10 )
diff --git a/app-office/abiword/abiword-2.6.5.ebuild b/app-office/abiword/abiword-2.6.5.ebuild
index eadea031a98e..8f3c4e0590a2 100644
--- a/app-office/abiword/abiword-2.6.5.ebuild
+++ b/app-office/abiword/abiword-2.6.5.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/app-office/abiword/abiword-2.6.5.ebuild,v 1.1 2008/12/14 18:42:30 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/abiword-2.6.5.ebuild,v 1.2 2009/01/04 22:51:26 ulm Exp $
 
 EAPI="1"
 
@@ -19,11 +19,11 @@ IUSE="debug gnome spell xml"
 
 # FIXME: gsf could probably be conditional
 
-RDEPEND="virtual/xft
-	dev-libs/popt
+RDEPEND="dev-libs/popt
 	sys-libs/zlib
 	>=dev-libs/glib-2
 	>=x11-libs/gtk+-2.6
+	x11-libs/libXft
 	>=x11-libs/pango-1.2
 	>=gnome-base/libglade-2
 	>=gnome-base/libgnomeprint-2.2
@@ -32,7 +32,6 @@ RDEPEND="virtual/xft
 	>=media-libs/libpng-1.2
 	>=media-libs/fontconfig-2.1
 	>=media-libs/freetype-2.1
-	>=x11-libs/pango-1.2
 	>=app-text/wv-1.2
 	>=dev-libs/fribidi-0.10.4
 	xml? ( >=dev-libs/libxml2-2.4.10 )