Remove blocker on virtual/xft, got multiple email reports that this breaks things.

(Portage version: 2.1_pre9-r4)

6 files changed, 28 insertions, 16 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 4eafe728d2f0..32832124bc13 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,11 @@
 # 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.534 2006/04/23 02:31:12 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.535 2006/04/28 15:02:01 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 blocker on virtual/xft, got multiple email reports that this breaks
+  things.
 
   23 Apr 2006; Stephen P. Becker <geoman@gentoo.org> xorg-x11-7.0-r1.ebuild:
   remove untested video driver RDEPENDs for mips
diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-6.8.2-r4 b/x11-base/xorg-x11/files/digest-xorg-x11-6.8.2-r4
index 242584b5e373..0ed08f7be057 100644
--- a/x11-base/xorg-x11/files/digest-xorg-x11-6.8.2-r4
+++ b/x11-base/xorg-x11/files/digest-xorg-x11-6.8.2-r4
@@ -1,7 +1,19 @@
+MD5 8131cd7ea1e4566e6e05c438a93fcfe1 X11R6.8.2-src.tar.bz2 44371402
+RMD160 80efdaf74a25e43c77aab1d83e817f03f344d105 X11R6.8.2-src.tar.bz2 44371402
+SHA256 f02e3c85572dc9ad7cb77c2a638e3be24cc1b5bea9fdbb0b0299c9668475c534 X11R6.8.2-src.tar.bz2 44371402
 MD5 4d7d5fdc4ed56c144ef998302581478c eurofonts-X11.tar.bz2 8811
-MD5 01a21c248e5ac4ba02cbbea994fc774a xfsft-encodings-0.1.tar.bz2 11892
-MD5 d0fab996daf97adf095e2dad0bd9012e gentoo-cursors-tad-0.3.1.tar.bz2 1196991
+RMD160 d3f54324dcfd961dc128a257917a90a5bc9560da eurofonts-X11.tar.bz2 8811
+SHA256 6028bda00ecf403f1723ca66d24ed3f609bf6d7eaef46e0facb04fb322aac3e3 eurofonts-X11.tar.bz2 8811
 MD5 3d4ee581df78c9dacc6e97aa07a1af72 gemini-koi8-u.tar.bz2 439173
+RMD160 861e7048f0ec5136c898976b092b96da8772d70c gemini-koi8-u.tar.bz2 439173
+SHA256 df70d795be2cfbac04647365495e70c84b3a2119db2297a9deca7f939c135811 gemini-koi8-u.tar.bz2 439173
+MD5 d0fab996daf97adf095e2dad0bd9012e gentoo-cursors-tad-0.3.1.tar.bz2 1196991
+RMD160 cd10e8ffbfd8879e096ba5d31fd16d613c780660 gentoo-cursors-tad-0.3.1.tar.bz2 1196991
+SHA256 90c6775fcd194153b79e06e4232c74054ebf11227a83c5762e6aa539d46ef847 gentoo-cursors-tad-0.3.1.tar.bz2 1196991
+MD5 01a21c248e5ac4ba02cbbea994fc774a xfsft-encodings-0.1.tar.bz2 11892
+RMD160 d51d2110764484dd49cba393510f2f143a7eb0a2 xfsft-encodings-0.1.tar.bz2 11892
+SHA256 a13acec68d913f42cf49c97113da86a90d15867f799fcaa7e9892759c6b37645 xfsft-encodings-0.1.tar.bz2 11892
 MD5 3558cdcca5bdd1d17d468408c794aea6 xorg-x11-6.8.2-files-0.8.tar.bz2 9920
+RMD160 cacc6ebb392dce9b1274b13c3a87ac62f42e2828 xorg-x11-6.8.2-files-0.8.tar.bz2 9920
+SHA256 51b8f9af14a25ba90e61f61f8a8531b8075a59ac41d4f7d0a1812bcaf9623f02 xorg-x11-6.8.2-files-0.8.tar.bz2 9920
 MD5 564db71503016fea940277c36eebe744 xorg-x11-6.8.2-patches-0.1.10.2.tar.bz2 166360
-MD5 8131cd7ea1e4566e6e05c438a93fcfe1 X11R6.8.2-src.tar.bz2 44371402
diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-7.0-r1 b/x11-base/xorg-x11/files/digest-xorg-x11-7.0-r1
index e69de29bb2d1..8b137891791f 100644
--- a/x11-base/xorg-x11/files/digest-xorg-x11-7.0-r1
+++ b/x11-base/xorg-x11/files/digest-xorg-x11-7.0-r1
@@ -0,0 +1 @@
+
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 db3975169ab1..d61b55cc5eb3 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.9 2006/04/03 23:13:52 spyderous Exp $
+# $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 $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -90,9 +90,7 @@ DEPEND=">=sys-libs/ncurses-5.1
 	userland_GNU? ( sys-apps/util-linux )
 	dev-lang/perl
 	media-libs/libpng
-	!<=app-emulation/emul-linux-x86-xlibs-1.2-r3
-	!virtual/xft"
-# x11-libs/xft -- blocked because of interference with xorg's
+	!<=app-emulation/emul-linux-x86-xlibs-1.2-r3"
 # FBSDTODO: need to check that X is not pulled in before freebsd-ubin for 'col' presence
 
 RDEPEND="
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 96548d26e408..27a0b1bbb295 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.14 2006/04/03 23:13:52 spyderous Exp $
+# $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 $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -90,9 +90,7 @@ DEPEND=">=sys-libs/ncurses-5.1
 	userland_GNU? ( sys-apps/util-linux )
 	dev-lang/perl
 	media-libs/libpng
-	!<=app-emulation/emul-linux-x86-xlibs-1.2-r3
-	!virtual/xft"
-# x11-libs/xft -- blocked because of interference with xorg's
+	!<=app-emulation/emul-linux-x86-xlibs-1.2-r3"
 # FBSDTODO: need to check that X is not pulled in before freebsd-ubin for 'col' presence
 
 RDEPEND="
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 625a4739b81f..a131c58aa812 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.2 2006/04/03 23:13:52 spyderous Exp $
+# $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 $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -82,9 +82,7 @@ DEPEND=">=sys-libs/ncurses-5.1
 	userland_GNU? ( sys-apps/util-linux )
 	dev-lang/perl
 	media-libs/libpng
-	!<=app-emulation/emul-linux-x86-xlibs-1.2-r3
-	!virtual/xft"
-# x11-libs/xft -- blocked because of interference with xorg's
+	!<=app-emulation/emul-linux-x86-xlibs-1.2-r3"
 # FBSDTODO: need to check that X is not pulled in before freebsd-ubin for 'col' presence
 
 RDEPEND="