Remove another instance of the xft blocker (Glen Martin).

Package-Manager: portage-2.1_pre9-r5

5 files changed, 27 insertions, 26 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 32832124bc13..d2f961a2183f 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.535 2006/04/28 15:02:01 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.536 2006/04/28 18:51:34 spyderous Exp $
+
+  28 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.2-r4.ebuild, xorg-x11-6.8.2-r6.ebuild, xorg-x11-6.9.0.ebuild:
+  Remove another instance of the xft blocker (Glen Martin).
 
   28 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-x11-6.8.2-r4.ebuild, xorg-x11-6.8.2-r6.ebuild, xorg-x11-6.9.0.ebuild:
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index f788e1f48113..a03215335ff5 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -9,26 +9,26 @@ DIST xorg-x11-6.8.2-patches-0.1.10.2.tar.bz2 166360 size 166360
 DIST xorg-x11-6.8.2-patches-0.1.13.tar.bz2 191763 RMD160 d0d363afcf26f78005e380a49ff7c7be4301f6cd SHA256 aebc58cd8e85a50c39f33ca9a1dbb300e972ca8fa50bd1527c71d52864dcc09f size 191763
 DIST xorg-x11-6.9.0-files-0.1.tar.bz2 9930 RMD160 0bf43b280db86b28f4ee93b1c47959f4372d71fc SHA256 207f366cd69ae1b828206f227bd600d5ec9e9dfddb0cab8e418f222f4b787755 size 9930
 DIST xorg-x11-6.9.0-patches-0.1.1.tar.bz2 114332 RMD160 ff9b0f2cd969ccfb1078c5b6f3b2d4a7e5085b10 SHA256 fb6a652fcbf6c8416b675766960850ed104fbd44b71440dcd335f0d3a2f069d3 size 114332
-EBUILD xorg-x11-6.8.2-r4.ebuild 54983 RMD160 0ef91a2ceaa0fa6699dd41b66bb6cc78e83a24a9 SHA1 0e1bbb78e84ce15a5202abfa4d48400c086a0200 SHA256 be6fd869c73f94d4f393dc5f8297ae0a6beaf4675077d91e96156250e96c8db9 size 54983
-MD5 98f898985bf05d49dccf83a3d0f87fa3 xorg-x11-6.8.2-r4.ebuild 54983
-RMD160 0ef91a2ceaa0fa6699dd41b66bb6cc78e83a24a9 xorg-x11-6.8.2-r4.ebuild 54983
-SHA256 be6fd869c73f94d4f393dc5f8297ae0a6beaf4675077d91e96156250e96c8db9 xorg-x11-6.8.2-r4.ebuild 54983
-EBUILD xorg-x11-6.8.2-r6.ebuild 55088 RMD160 eeeffbd2de7538b8ab7017ceb6e9fcf8fa7c0cac SHA1 a64ae1f2abf6070eb8f12b5eca7f82dea405351e SHA256 e0c5b46ce99b8a162479b52a88c8633dd125249df6331bcca5077b821e9730cf size 55088
-MD5 40600d93c4ba89b169e8529d190a3f3c xorg-x11-6.8.2-r6.ebuild 55088
-RMD160 eeeffbd2de7538b8ab7017ceb6e9fcf8fa7c0cac xorg-x11-6.8.2-r6.ebuild 55088
-SHA256 e0c5b46ce99b8a162479b52a88c8633dd125249df6331bcca5077b821e9730cf xorg-x11-6.8.2-r6.ebuild 55088
-EBUILD xorg-x11-6.9.0.ebuild 53313 RMD160 c1389a024fa3407cf6e23fe4ed68db86611aa2f3 SHA1 d71849bb98d5a14855d6911bdf3246c43f6f3b18 SHA256 b9b3050eb61e4ac26e573158adfae6be2dd731ecbce58a960ee3904682b41343 size 53313
-MD5 aec87115876d9199edd6f9d60ac59e17 xorg-x11-6.9.0.ebuild 53313
-RMD160 c1389a024fa3407cf6e23fe4ed68db86611aa2f3 xorg-x11-6.9.0.ebuild 53313
-SHA256 b9b3050eb61e4ac26e573158adfae6be2dd731ecbce58a960ee3904682b41343 xorg-x11-6.9.0.ebuild 53313
+EBUILD xorg-x11-6.8.2-r4.ebuild 54968 RMD160 39f72fefe68b0909b26a8245636c4ff818835e35 SHA1 dd940f4472d94a7d122acf607c6b2adf06609de9 SHA256 171948879f4ef3f0d1a69ec276ca576b17a16e4a94dced9dadd0516ca34b89b6 size 54968
+MD5 1a9d3d597a2030857b93c40251adbc12 xorg-x11-6.8.2-r4.ebuild 54968
+RMD160 39f72fefe68b0909b26a8245636c4ff818835e35 xorg-x11-6.8.2-r4.ebuild 54968
+SHA256 171948879f4ef3f0d1a69ec276ca576b17a16e4a94dced9dadd0516ca34b89b6 xorg-x11-6.8.2-r4.ebuild 54968
+EBUILD xorg-x11-6.8.2-r6.ebuild 55073 RMD160 47340aec34fe66925fdd2aebe6a07805af827a74 SHA1 075f22ec7b6376dacf0dd775b84b420c75e2be49 SHA256 aa34c991b772c33887e2b8b8854d0166123c43885edd549705e7f5894dd79614 size 55073
+MD5 3b01f475ac07f8a7aeb2cedbb95c02e8 xorg-x11-6.8.2-r6.ebuild 55073
+RMD160 47340aec34fe66925fdd2aebe6a07805af827a74 xorg-x11-6.8.2-r6.ebuild 55073
+SHA256 aa34c991b772c33887e2b8b8854d0166123c43885edd549705e7f5894dd79614 xorg-x11-6.8.2-r6.ebuild 55073
+EBUILD xorg-x11-6.9.0.ebuild 53298 RMD160 25ab33940c343df02dfcfad4bbe0aadbe5525071 SHA1 399091f962ba580fea781843a1001bc92303cd93 SHA256 267c5e1310749eba967b16139d6de0c378d29174ead6fe277ba810d2e6f579b8 size 53298
+MD5 749c87c917fbda8002bb08eb8bcc92db xorg-x11-6.9.0.ebuild 53298
+RMD160 25ab33940c343df02dfcfad4bbe0aadbe5525071 xorg-x11-6.9.0.ebuild 53298
+SHA256 267c5e1310749eba967b16139d6de0c378d29174ead6fe277ba810d2e6f579b8 xorg-x11-6.9.0.ebuild 53298
 EBUILD xorg-x11-7.0-r1.ebuild 17006 RMD160 627992b23d09536feb904c2128ea253a8e7d8ddc SHA1 fbe945488681a970c88e3403aa7438cbbd491478 SHA256 338b63eabee74f764f6739db8cd341cd7bf9e3f821ca07ee7ad4c214ccec867f size 17006
 MD5 67e7474cfcb772d58190a8a5131ce02f xorg-x11-7.0-r1.ebuild 17006
 RMD160 627992b23d09536feb904c2128ea253a8e7d8ddc xorg-x11-7.0-r1.ebuild 17006
 SHA256 338b63eabee74f764f6739db8cd341cd7bf9e3f821ca07ee7ad4c214ccec867f xorg-x11-7.0-r1.ebuild 17006
-MISC ChangeLog 117981 RMD160 af517e7c6cb5d26af7d9278aff0227b83fd1fce3 SHA1 c3ea047553ad1eb29cb2843acc2e47a5cb77eed4 SHA256 b19ab57108c427f2ea4c4c61c764f9ec6f7b44dd5ea70b6c57d50a1d1e18efa2 size 117981
-MD5 19f35c5c30144bdd3970694a585e1764 ChangeLog 117981
-RMD160 af517e7c6cb5d26af7d9278aff0227b83fd1fce3 ChangeLog 117981
-SHA256 b19ab57108c427f2ea4c4c61c764f9ec6f7b44dd5ea70b6c57d50a1d1e18efa2 ChangeLog 117981
+MISC ChangeLog 118174 RMD160 ac2c0f158d81c5ad523db48ea24ebb67b602b20a SHA1 b0e749320d6eb5e36a5b372d953f5d2093f75370 SHA256 d247d583cdc8b61aedf96dc49907ed5fc18b693404ec41ce917b37f9a3fbf194 size 118174
+MD5 c0fe6bdf8732d967e7d5f88c6af8dd27 ChangeLog 118174
+RMD160 ac2c0f158d81c5ad523db48ea24ebb67b602b20a ChangeLog 118174
+SHA256 d247d583cdc8b61aedf96dc49907ed5fc18b693404ec41ce917b37f9a3fbf194 ChangeLog 118174
 MISC metadata.xml 230 RMD160 a293db25b0a2b203eb1b788ee62601190618066e SHA1 c54cfbf65124c6abed943e76d0e3e6c976fc4f12 SHA256 92ca18d8e0533e35b2537904c3d02051148894ef05496a26db29fecc0066a6e0 size 230
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
 RMD160 a293db25b0a2b203eb1b788ee62601190618066e metadata.xml 230
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild
index d61b55cc5eb3..ff6a74dde9d3 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.2-r4.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-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild,v 1.10 2006/04/28 15:02:01 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r4.ebuild,v 1.11 2006/04/28 18:51:34 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -103,8 +103,7 @@ RDEPEND="
 		!nocxx? ( >=x11-apps/ttmkfdir-3.0.9-r2 )
 		media-libs/libpng
 		>=sys-libs/ncurses-5.1
-		!<=app-emulation/emul-linux-x86-xlibs-1.2-r3
-		!virtual/xft"
+		!<=app-emulation/emul-linux-x86-xlibs-1.2-r3"
 
 PDEPEND="x86? (
 			input_devices_synaptics? ( x11-drivers/synaptics )
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.2-r6.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.2-r6.ebuild
index 27a0b1bbb295..d91b4e0bd4f8 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.2-r6.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.2-r6.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-base/xorg-x11/xorg-x11-6.8.2-r6.ebuild,v 1.15 2006/04/28 15:02:01 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r6.ebuild,v 1.16 2006/04/28 18:51:34 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -103,8 +103,7 @@ RDEPEND="
 		!nocxx? ( >=x11-apps/ttmkfdir-3.0.9-r2 )
 		media-libs/libpng
 		>=sys-libs/ncurses-5.1
-		!<=app-emulation/emul-linux-x86-xlibs-1.2-r3
-		!virtual/xft"
+		!<=app-emulation/emul-linux-x86-xlibs-1.2-r3"
 
 PDEPEND="x86? (
 			input_devices_synaptics? ( x11-drivers/synaptics )
diff --git a/x11-base/xorg-x11/xorg-x11-6.9.0.ebuild b/x11-base/xorg-x11/xorg-x11-6.9.0.ebuild
index a131c58aa812..e3e22ed5af3b 100644
--- a/x11-base/xorg-x11/xorg-x11-6.9.0.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.9.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-base/xorg-x11/xorg-x11-6.9.0.ebuild,v 1.3 2006/04/28 15:02:01 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.9.0.ebuild,v 1.4 2006/04/28 18:51:34 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -95,8 +95,7 @@ RDEPEND="
 		!nocxx? ( >=x11-apps/ttmkfdir-3.0.9-r2 )
 		media-libs/libpng
 		>=sys-libs/ncurses-5.1
-		!<=app-emulation/emul-linux-x86-xlibs-1.2-r3
-		!virtual/xft"
+		!<=app-emulation/emul-linux-x86-xlibs-1.2-r3"
 
 PDEPEND="x86? (
 			input_devices_synaptics? ( x11-drivers/synaptics )