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

Package-Manager: portage-2.1_pre9-r4

7 files changed, 69 insertions, 40 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/Manifest b/x11-base/xorg-x11/Manifest
index 93bbf3887e2d..f788e1f48113 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,30 +1,47 @@
-MD5 3658faf00fdc61dd8760b98fc42b0a0a ChangeLog 117758
-RMD160 9ffc8091f3fe1dc4dc5188b29b769458718311db ChangeLog 117758
-SHA256 18bceea0a079ab96eb7cc3dae49dde0d3da1e91114e4673c848b047872629618 ChangeLog 117758
-MD5 84ed1084819731e2acef3610f0b6b30a files/digest-xorg-x11-6.8.2-r4 506
-RMD160 15e40bf572842d9b01c60e30f47a19d66344b2fe files/digest-xorg-x11-6.8.2-r4 506
-SHA256 643219bb6d2a6956bf265c678ab16617d74415c1e70efd3b533090ad9ac0e5cb files/digest-xorg-x11-6.8.2-r4 506
+DIST X11R6.8.2-src.tar.bz2 44371402 RMD160 80efdaf74a25e43c77aab1d83e817f03f344d105 SHA256 f02e3c85572dc9ad7cb77c2a638e3be24cc1b5bea9fdbb0b0299c9668475c534 size 44371402
+DIST X11R6.9.0-src.tar.bz2 46220125 RMD160 5c830d43607c4550ad44936d77b5adc56f67dbf5 SHA256 6509e5bee489ab7c8d0c255c12f6ceb8f06be74b57b060b6e9a61497710a3f4c size 46220125
+DIST eurofonts-X11.tar.bz2 8811 RMD160 d3f54324dcfd961dc128a257917a90a5bc9560da SHA256 6028bda00ecf403f1723ca66d24ed3f609bf6d7eaef46e0facb04fb322aac3e3 size 8811
+DIST gemini-koi8-u.tar.bz2 439173 RMD160 861e7048f0ec5136c898976b092b96da8772d70c SHA256 df70d795be2cfbac04647365495e70c84b3a2119db2297a9deca7f939c135811 size 439173
+DIST gentoo-cursors-tad-0.3.1.tar.bz2 1196991 RMD160 cd10e8ffbfd8879e096ba5d31fd16d613c780660 SHA256 90c6775fcd194153b79e06e4232c74054ebf11227a83c5762e6aa539d46ef847 size 1196991
+DIST xfsft-encodings-0.1.tar.bz2 11892 RMD160 d51d2110764484dd49cba393510f2f143a7eb0a2 SHA256 a13acec68d913f42cf49c97113da86a90d15867f799fcaa7e9892759c6b37645 size 11892
+DIST xorg-x11-6.8.2-files-0.8.tar.bz2 9920 RMD160 cacc6ebb392dce9b1274b13c3a87ac62f42e2828 SHA256 51b8f9af14a25ba90e61f61f8a8531b8075a59ac41d4f7d0a1812bcaf9623f02 size 9920
+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-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 metadata.xml 230 RMD160 a293db25b0a2b203eb1b788ee62601190618066e SHA1 c54cfbf65124c6abed943e76d0e3e6c976fc4f12 SHA256 92ca18d8e0533e35b2537904c3d02051148894ef05496a26db29fecc0066a6e0 size 230
+MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
+RMD160 a293db25b0a2b203eb1b788ee62601190618066e metadata.xml 230
+SHA256 92ca18d8e0533e35b2537904c3d02051148894ef05496a26db29fecc0066a6e0 metadata.xml 230
+MD5 8c83c2906d498472b937c27b08eebdf1 files/digest-xorg-x11-6.8.2-r4 1626
+RMD160 4ffcb1b560281067d4c00a1ac75d61014f19b2b9 files/digest-xorg-x11-6.8.2-r4 1626
+SHA256 34d74433ac27ba01d0764510909d162a3de4cc4f7d5abf3b5b8940d8574ad414 files/digest-xorg-x11-6.8.2-r4 1626
 MD5 d62de174f95a61691209aac0a2ff39a6 files/digest-xorg-x11-6.8.2-r6 1834
 RMD160 78eb6ba124ec564a437ac0f8bbea5917495e5596 files/digest-xorg-x11-6.8.2-r6 1834
 SHA256 36f92eea9fd6b4345001fc67164120bcd885267f5ad1dbe81547ffe7230f2f28 files/digest-xorg-x11-6.8.2-r6 1834
 MD5 c3e8a36e06412232a60c8ea285357ece files/digest-xorg-x11-6.9.0 1831
 RMD160 ab84a1d96a2f006310190681c711f8951c46db3c files/digest-xorg-x11-6.9.0 1831
 SHA256 96bcf76fba399a75d943495aabed45e2c7ac7b5ccf511b5a1b4b7897e9928711 files/digest-xorg-x11-6.9.0 1831
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-xorg-x11-7.0-r1 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-xorg-x11-7.0-r1 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-xorg-x11-7.0-r1 0
-MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
-RMD160 a293db25b0a2b203eb1b788ee62601190618066e metadata.xml 230
-SHA256 92ca18d8e0533e35b2537904c3d02051148894ef05496a26db29fecc0066a6e0 metadata.xml 230
-MD5 692ef080f66bba581a5ceaada0b1873e xorg-x11-6.8.2-r4.ebuild 55058
-RMD160 643f2c56b649ad335734ecf36dbd80fefada6963 xorg-x11-6.8.2-r4.ebuild 55058
-SHA256 0e07db1b48a14b4173b8aa733d01c6812540721b862b2c157d928d687450ed36 xorg-x11-6.8.2-r4.ebuild 55058
-MD5 3f3680c4b694f41f21c540714ac872f6 xorg-x11-6.8.2-r6.ebuild 55164
-RMD160 5c135ae5f7aaa7a0d1e13bb551cb4be9208d499c xorg-x11-6.8.2-r6.ebuild 55164
-SHA256 53cbadc7fc4be6659882d887acf0a0a807e448b46a783f648fc7a5d6dea2f61e xorg-x11-6.8.2-r6.ebuild 55164
-MD5 5dbc431fe49036c6e75295e858dbbdc5 xorg-x11-6.9.0.ebuild 53389
-RMD160 1c9034051490f125fce76bdda274fd1668c30f0b xorg-x11-6.9.0.ebuild 53389
-SHA256 2d6d605d683d0b53f6b9b53a2edbb25f41c9ff0996ae93566368b896d44eed49 xorg-x11-6.9.0.ebuild 53389
-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
+MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-xorg-x11-7.0-r1 1
+RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-xorg-x11-7.0-r1 1
+SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-xorg-x11-7.0-r1 1
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="