Remove virtual/x11 option from modular X deps.

Package-Manager: portage-2.1.2_pre1-r1

4 files changed, 26 insertions, 28 deletions

diff --git a/media-libs/glide-v3/ChangeLog b/media-libs/glide-v3/ChangeLog
index 24195f2f82b4..937e65ed0eb2 100644
--- a/media-libs/glide-v3/ChangeLog
+++ b/media-libs/glide-v3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/glide-v3
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glide-v3/ChangeLog,v 1.28 2006/08/13 17:49:10 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glide-v3/ChangeLog,v 1.29 2006/09/24 08:34:13 dberkholz Exp $
+
+  24 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>;
+  glide-v3-3.10-r4.ebuild, glide-v3-20060203.ebuild:
+  Remove virtual/x11 option from modular X deps.
 
   13 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>;
   glide-v3-20060203.ebuild:
diff --git a/media-libs/glide-v3/Manifest b/media-libs/glide-v3/Manifest
index 270ce016d18e..d8c080baccf6 100644
--- a/media-libs/glide-v3/Manifest
+++ b/media-libs/glide-v3/Manifest
@@ -10,18 +10,18 @@ DIST Glide3-20060203.tar.bz2 3658502 RMD160 a9be1f1359c397af1ed850f85e4657c3f39c
 DIST glide-v3-3.10-fixes.patch.bz2 7511
 DIST glide3x-3.10.tar.gz 3055109
 DIST swlibs-3.10.tar.gz 596883
-EBUILD glide-v3-20060203.ebuild 2844 RMD160 198f20acb539791f2594267c9f08dcb22f486258 SHA1 ec3ceca1ca89f0098453fc460f9176721879ed54 SHA256 e68709bb987b389c9009d701c2fdb21a462e563c9a3ec29ef2f8e948efcceced
-MD5 5db2dfe762e276caec497ed0f52227d5 glide-v3-20060203.ebuild 2844
-RMD160 198f20acb539791f2594267c9f08dcb22f486258 glide-v3-20060203.ebuild 2844
-SHA256 e68709bb987b389c9009d701c2fdb21a462e563c9a3ec29ef2f8e948efcceced glide-v3-20060203.ebuild 2844
-EBUILD glide-v3-3.10-r4.ebuild 2420 RMD160 57b6d44851726235ff710a19a4bd4371e0d39153 SHA1 ec827932dfdcaea43e887485fa2ae148ce69a2c5 SHA256 2f9120fd60d82f3dee61ad0c7d755c938b5ef8872a6a47fb7df3fad0d21cbb45
-MD5 eaac8c0a4369b688774ccbb662354285 glide-v3-3.10-r4.ebuild 2420
-RMD160 57b6d44851726235ff710a19a4bd4371e0d39153 glide-v3-3.10-r4.ebuild 2420
-SHA256 2f9120fd60d82f3dee61ad0c7d755c938b5ef8872a6a47fb7df3fad0d21cbb45 glide-v3-3.10-r4.ebuild 2420
-MISC ChangeLog 4430 RMD160 6c63aa45224c84e6c7f6dd7e131e4fc2d7f5d527 SHA1 e70e8d6ba5db704168105be72dd168dbbde2f5f0 SHA256 fe07490b4ca98ec374ecc4b67f71cd165483d834cdf2589881b3d6f680d2eaa6
-MD5 d4286ac39fc93754b3e5e2a7a6570184 ChangeLog 4430
-RMD160 6c63aa45224c84e6c7f6dd7e131e4fc2d7f5d527 ChangeLog 4430
-SHA256 fe07490b4ca98ec374ecc4b67f71cd165483d834cdf2589881b3d6f680d2eaa6 ChangeLog 4430
+EBUILD glide-v3-20060203.ebuild 2806 RMD160 af56fa3ed00a2e3b4ad2b4d79b4ed3f5d52cfb25 SHA1 ee8cf2ae9c21437ecc2cb30bf795c344538a662e SHA256 2767e823939c86515e2af48d5eb64779fc5f45986b7b6aecde79fd0eeac102ae
+MD5 c4b81019f43fd1a11a83155dc7894d11 glide-v3-20060203.ebuild 2806
+RMD160 af56fa3ed00a2e3b4ad2b4d79b4ed3f5d52cfb25 glide-v3-20060203.ebuild 2806
+SHA256 2767e823939c86515e2af48d5eb64779fc5f45986b7b6aecde79fd0eeac102ae glide-v3-20060203.ebuild 2806
+EBUILD glide-v3-3.10-r4.ebuild 2358 RMD160 b4f24226d884b65a95c5c858565de1e4be2d86eb SHA1 cc3b1b4168f52d9b22682b7625eec04831d510cf SHA256 6406c3fd5d5f36ae20c87781e44663fd9ac2c2ff0674aff8eed55d4f4783696d
+MD5 00b210bef604156add947cf3cb1154c2 glide-v3-3.10-r4.ebuild 2358
+RMD160 b4f24226d884b65a95c5c858565de1e4be2d86eb glide-v3-3.10-r4.ebuild 2358
+SHA256 6406c3fd5d5f36ae20c87781e44663fd9ac2c2ff0674aff8eed55d4f4783696d glide-v3-3.10-r4.ebuild 2358
+MISC ChangeLog 4588 RMD160 3593c6b4b7efc64b418f4e86cf22191f5c61eaa5 SHA1 e3dc6ea44ca105cdc855c5e0ea3d60ef66f8f897 SHA256 a455568c5bd4fc8a8ee918a54f72f8e5cd82f4172ff0208a9bbb38bfe2a094f3
+MD5 929d11cf9b928b792d1f4e70fe0a9b65 ChangeLog 4588
+RMD160 3593c6b4b7efc64b418f4e86cf22191f5c61eaa5 ChangeLog 4588
+SHA256 a455568c5bd4fc8a8ee918a54f72f8e5cd82f4172ff0208a9bbb38bfe2a094f3 ChangeLog 4588
 MISC metadata.xml 164 RMD160 063e280135023e17863dd0b1154787fbb13d98d1 SHA1 6b624c0de1c67e3014f357344afe6dbb818f64bd SHA256 8bb377723c4bb750b364a747cc43f6438cd13731e361728f416ab6f4928bcb58
 MD5 1f4a7b552c4631b5e826df2324e7f45e metadata.xml 164
 RMD160 063e280135023e17863dd0b1154787fbb13d98d1 metadata.xml 164
diff --git a/media-libs/glide-v3/glide-v3-20060203.ebuild b/media-libs/glide-v3/glide-v3-20060203.ebuild
index 114114212d92..f876f82dfb9d 100644
--- a/media-libs/glide-v3/glide-v3-20060203.ebuild
+++ b/media-libs/glide-v3/glide-v3-20060203.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/media-libs/glide-v3/glide-v3-20060203.ebuild,v 1.5 2006/08/13 17:49:10 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glide-v3/glide-v3-20060203.ebuild,v 1.6 2006/09/24 08:34:13 dberkholz Exp $
 
 inherit multilib eutils
 
@@ -19,10 +19,10 @@ SLOT="0"
 KEYWORDS="-sparc x86"
 IUSE="voodoo5 voodoo3 voodoo2 voodoo1"
 
-RDEPEND="|| ( x11-libs/libX11 virtual/x11 )"
+RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
 	dev-lang/nasm
-	|| ( x11-libs/libXt virtual/x11 )"
+	x11-libs/libXt"
 
 src_compile() {
 	local compilefor glide_flags
diff --git a/media-libs/glide-v3/glide-v3-3.10-r4.ebuild b/media-libs/glide-v3/glide-v3-3.10-r4.ebuild
index e793b30664cb..d21ce4f4e082 100644
--- a/media-libs/glide-v3/glide-v3-3.10-r4.ebuild
+++ b/media-libs/glide-v3/glide-v3-3.10-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/media-libs/glide-v3/glide-v3-3.10-r4.ebuild,v 1.12 2006/01/28 10:10:15 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glide-v3/glide-v3-3.10-r4.ebuild,v 1.13 2006/09/24 08:34:13 dberkholz Exp $
 
 # NOTE:  Do NOT build this with optimizations, as it will make this package
 #        unstable!!!!
@@ -21,18 +21,12 @@ SLOT="0"
 KEYWORDS="x86 -sparc alpha"
 IUSE="voodoo3"
 
-RDEPEND="|| ( ( x11-libs/libXxf86dga
-			x11-libs/libXxf86vm
-		)
-		virtual/x11
-	)"
+RDEPEND="x11-libs/libXxf86dga
+	x11-libs/libXxf86vm"
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xf86dgaproto
-			x11-proto/xf86vidmodeproto
-			x11-libs/libXt
-		)
-		virtual/x11
-	)
+	x11-proto/xf86dgaproto
+	x11-proto/xf86vidmodeproto
+	x11-libs/libXt
 	>=sys-devel/automake-1.4
 	>=sys-devel/autoconf-2.57
 	>=sys-devel/libtool-1.3.3