Stop using PROVIDE for old-style virtuals. Allow new-style virtuals to pull stuff in as needed.

Package-Manager: portage-2.1.1_rc1-r7

4 files changed, 20 insertions, 25 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index c94cc59b5ce2..cd7943dc7ccb 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.572 2006/09/12 20:42:37 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.573 2006/09/12 20:47:40 dberkholz Exp $
+
+  12 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  xorg-x11-6.8.2-r8.ebuild, xorg-x11-6.9.0-r3.ebuild:
+  Stop using PROVIDE for old-style virtuals. Allow new-style virtuals to pull
+  stuff in as needed.
 
   12 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
   -xorg-x11-6.8.2-r7.ebuild:
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index 6c331daf15c0..0222d6aa9570 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -24,14 +24,14 @@ DIST xorg-x11-6.8.2-files-0.8.tar.bz2 9920 RMD160 cacc6ebb392dce9b1274b13c3a87ac
 DIST xorg-x11-6.8.2-patches-0.1.13.tar.bz2 191763 RMD160 d0d363afcf26f78005e380a49ff7c7be4301f6cd SHA1 21a08218ddaa52a4598ea7d05b690822ecde5c88 SHA256 aebc58cd8e85a50c39f33ca9a1dbb300e972ca8fa50bd1527c71d52864dcc09f
 DIST xorg-x11-6.9.0-files-0.1.tar.bz2 9930 RMD160 0bf43b280db86b28f4ee93b1c47959f4372d71fc SHA1 2b559b2285304c0462e8731104270bbfc9337ab7 SHA256 207f366cd69ae1b828206f227bd600d5ec9e9dfddb0cab8e418f222f4b787755
 DIST xorg-x11-6.9.0-patches-0.1.1.tar.bz2 114332 RMD160 ff9b0f2cd969ccfb1078c5b6f3b2d4a7e5085b10 SHA1 9ab1b5a1d9eaee1f403d5d3c3ae43441a5aa9745 SHA256 fb6a652fcbf6c8416b675766960850ed104fbd44b71440dcd335f0d3a2f069d3
-EBUILD xorg-x11-6.8.2-r8.ebuild 62856 RMD160 3e3491cc28dddb0c484aa585ab949547a40e6b8b SHA1 be70476eeb322cfd7e881b1848002b667204df13 SHA256 3413473a4ab177e20ec5ea82061d0fcfa18e2c381fe51560b1c037ad8d30655b
-MD5 272c34a60e6111482e092bd940682625 xorg-x11-6.8.2-r8.ebuild 62856
-RMD160 3e3491cc28dddb0c484aa585ab949547a40e6b8b xorg-x11-6.8.2-r8.ebuild 62856
-SHA256 3413473a4ab177e20ec5ea82061d0fcfa18e2c381fe51560b1c037ad8d30655b xorg-x11-6.8.2-r8.ebuild 62856
-EBUILD xorg-x11-6.9.0-r3.ebuild 61296 RMD160 136d07112595d00dae23015ea85a5a55d2426014 SHA1 8ecdd768d839f3371692e41d0b60be7c60e597e2 SHA256 7d68230b3a1ef64674a3603de399aab597ae2b0ba34a1bfb2b52a0b6eabb428f
-MD5 41fdc92acd28ab04a7ab7112006b77de xorg-x11-6.9.0-r3.ebuild 61296
-RMD160 136d07112595d00dae23015ea85a5a55d2426014 xorg-x11-6.9.0-r3.ebuild 61296
-SHA256 7d68230b3a1ef64674a3603de399aab597ae2b0ba34a1bfb2b52a0b6eabb428f xorg-x11-6.9.0-r3.ebuild 61296
+EBUILD xorg-x11-6.8.2-r8.ebuild 62778 RMD160 72376134e1b1cffd4694c69069c0364c5b8aeba1 SHA1 b7d6902405845eca977d31ac4651d2471a98cd53 SHA256 5ad475a3b2d89d02f7c418efa7c184921c8d0e67006f4f9a9d3446d35d9d4169
+MD5 8cf86f5a6f0a2ae021584506edfad087 xorg-x11-6.8.2-r8.ebuild 62778
+RMD160 72376134e1b1cffd4694c69069c0364c5b8aeba1 xorg-x11-6.8.2-r8.ebuild 62778
+SHA256 5ad475a3b2d89d02f7c418efa7c184921c8d0e67006f4f9a9d3446d35d9d4169 xorg-x11-6.8.2-r8.ebuild 62778
+EBUILD xorg-x11-6.9.0-r3.ebuild 61218 RMD160 a8a1e32069b972680d17333af3a2ac853192aeaa SHA1 1c5fa54adc9b51e88952f390dc8749abe7aa09b6 SHA256 768968066a6ed8e1110d28610144dbae28f82f4b2262ddf8f6dbed256ad605f9
+MD5 7858f704812383425b0fec24c6e8a041 xorg-x11-6.9.0-r3.ebuild 61218
+RMD160 a8a1e32069b972680d17333af3a2ac853192aeaa xorg-x11-6.9.0-r3.ebuild 61218
+SHA256 768968066a6ed8e1110d28610144dbae28f82f4b2262ddf8f6dbed256ad605f9 xorg-x11-6.9.0-r3.ebuild 61218
 EBUILD xorg-x11-7.0-r1.ebuild 10012 RMD160 d241446b37e451f73892b486b4243555ca936ae2 SHA1 6d5bc023488eb8eaec6718af832e6746c5c76aa6 SHA256 8e73d9ea32db77629084a3131b3a99b638db8fb545b2a3ba2b721e04f4d4c267
 MD5 2f13e1f2772ec52b1805b894fd715a58 xorg-x11-7.0-r1.ebuild 10012
 RMD160 d241446b37e451f73892b486b4243555ca936ae2 xorg-x11-7.0-r1.ebuild 10012
@@ -40,10 +40,10 @@ EBUILD xorg-x11-7.1.ebuild 3977 RMD160 e9002a623ce9048445062a5e6b7959e11d9ee33d
 MD5 9da00a170f48e1daa3a9f424e9c7d0a0 xorg-x11-7.1.ebuild 3977
 RMD160 e9002a623ce9048445062a5e6b7959e11d9ee33d xorg-x11-7.1.ebuild 3977
 SHA256 66d04d2acd3704a63f3108f64f2467f77c9e2c8b8dbc42c189a864ce382264b7 xorg-x11-7.1.ebuild 3977
-MISC ChangeLog 124053 RMD160 1a27f278cbae1e8110a1b15f42f5ba078aeb78a7 SHA1 43d94fe57b8d0ab9b1d8debb49326aaf27160c06 SHA256 cca1264694bc70dca14d78cc70c36e7f95108b4d695b928ba67ff3efa423b8cc
-MD5 b73d987267e78fa4341c647de990f3b8 ChangeLog 124053
-RMD160 1a27f278cbae1e8110a1b15f42f5ba078aeb78a7 ChangeLog 124053
-SHA256 cca1264694bc70dca14d78cc70c36e7f95108b4d695b928ba67ff3efa423b8cc ChangeLog 124053
+MISC ChangeLog 124263 RMD160 87fd35e36d445cf6ad0b7ec64c437a70a58ec1cd SHA1 62fb2af1376a1b3432b6fa58d8b7465a8bc6f2ed SHA256 f4d05710286b5fc8f90a2fe86a7b4db5da03fa7afa97725dfb50d49dd0d9e434
+MD5 5e1af45ab5b5f1fd59606650e49ff614 ChangeLog 124263
+RMD160 87fd35e36d445cf6ad0b7ec64c437a70a58ec1cd ChangeLog 124263
+SHA256 f4d05710286b5fc8f90a2fe86a7b4db5da03fa7afa97725dfb50d49dd0d9e434 ChangeLog 124263
 MISC metadata.xml 230 RMD160 a293db25b0a2b203eb1b788ee62601190618066e SHA1 c54cfbf65124c6abed943e76d0e3e6c976fc4f12 SHA256 92ca18d8e0533e35b2537904c3d02051148894ef05496a26db29fecc0066a6e0
 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
 RMD160 a293db25b0a2b203eb1b788ee62601190618066e metadata.xml 230
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.2-r8.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.2-r8.ebuild
index cd9849cfe050..a11cc9aee440 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.2-r8.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.2-r8.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-r8.ebuild,v 1.12 2006/09/12 20:41:08 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r8.ebuild,v 1.13 2006/09/12 20:47:40 dberkholz Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -403,11 +403,6 @@ PDEPEND="x86? (
 		3dfx? ( >=media-libs/glide-v3-3.10 )
 		x11-terms/xterm"
 
-PROVIDE="virtual/x11
-	opengl? ( virtual/opengl
-		virtual/glu )
-	virtual/xft"
-
 DESCRIPTION="An X11 implementation maintained by the X.Org Foundation"
 
 pkg_setup() {
diff --git a/x11-base/xorg-x11/xorg-x11-6.9.0-r3.ebuild b/x11-base/xorg-x11/xorg-x11-6.9.0-r3.ebuild
index 9398d69bf976..0f5374278c2e 100644
--- a/x11-base/xorg-x11/xorg-x11-6.9.0-r3.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.9.0-r3.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-r3.ebuild,v 1.4 2006/09/12 20:41:08 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.9.0-r3.ebuild,v 1.5 2006/09/12 20:47:40 dberkholz Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -395,11 +395,6 @@ PDEPEND="x86? (
 		3dfx? ( >=media-libs/glide-v3-3.10 )
 		x11-terms/xterm"
 
-PROVIDE="virtual/x11
-	opengl? ( virtual/opengl
-		virtual/glu )
-	virtual/xft"
-
 DESCRIPTION="An X11 implementation maintained by the X.Org Foundation"
 
 pkg_setup() {