Drop virtual/x11 references.

Package-Manager: portage-2.1.3_rc8

4 files changed, 54 insertions, 66 deletions

diff --git a/rox-base/oroborox/ChangeLog b/rox-base/oroborox/ChangeLog
index 32d766702477..6c475ba2a19e 100644
--- a/rox-base/oroborox/ChangeLog
+++ b/rox-base/oroborox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for rox-base/oroborox
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/oroborox/ChangeLog,v 1.11 2006/11/17 14:39:51 lack Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/rox-base/oroborox/ChangeLog,v 1.12 2007/07/22 07:39:31 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
+  oroborox-0.9.7.9.ebuild, oroborox-0.9.8.ebuild:
+  Drop virtual/x11 references.
 
   17 Nov 2006; Jim Ramsay <lack@gentoo.org> oroborox-0.9.7.9.ebuild:
   Bug 155429 - Fixed inherit order
diff --git a/rox-base/oroborox/Manifest b/rox-base/oroborox/Manifest
index d7a6404c2625..a21a1705f5b4 100644
--- a/rox-base/oroborox/Manifest
+++ b/rox-base/oroborox/Manifest
@@ -1,17 +1,17 @@
 DIST OroboROX-0.9.7.9.tar.bz2 464642 RMD160 4ed9fab12c555c18bc3611845d69ad596e967b67 SHA1 952fdab316cd158e82a78d44791d7fafc7bac8f1 SHA256 e550d3a35c20f916f57d8930860d793192c6cd4ddbba1674b46394f33058a8d6
 DIST OroboROX-0.9.8.tar.bz2 463443 RMD160 e1175bbbe20275be4f3440077832eaca470b7afa SHA1 73b4565fce7c178a0a458cd432fcd6d4e65fec6e SHA256 b9ca46928c48eca7659191ce213fe346e48baae44878146cdcb6a236910b817b
-EBUILD oroborox-0.9.7.9.ebuild 1449 RMD160 8af494aff42729e8fdd23289255deeb284ddaeca SHA1 d58c61cfecf7f0ce74123dd39248c08b66f3cb18 SHA256 c14ef19975eb58b26242bd61422a73ba56ab8d27aaa46f753f52bd147ac87700
-MD5 b1f6f21af8522434c55cfdc1e2a6e9c8 oroborox-0.9.7.9.ebuild 1449
-RMD160 8af494aff42729e8fdd23289255deeb284ddaeca oroborox-0.9.7.9.ebuild 1449
-SHA256 c14ef19975eb58b26242bd61422a73ba56ab8d27aaa46f753f52bd147ac87700 oroborox-0.9.7.9.ebuild 1449
-EBUILD oroborox-0.9.8.ebuild 1793 RMD160 3e2fea6259bd7e2880beb5f718190dea9e35d4bf SHA1 4157ac67b38ff40201558f5807843f40c650d27e SHA256 5c4af656eed07507179146cd0af78e568aebed65a7d71cfcc102edb61f6bdf39
-MD5 3e139a7e25f987e5931191930c861358 oroborox-0.9.8.ebuild 1793
-RMD160 3e2fea6259bd7e2880beb5f718190dea9e35d4bf oroborox-0.9.8.ebuild 1793
-SHA256 5c4af656eed07507179146cd0af78e568aebed65a7d71cfcc102edb61f6bdf39 oroborox-0.9.8.ebuild 1793
-MISC ChangeLog 1700 RMD160 04d7465ee9215192590ef51a21a72da2239027c0 SHA1 f1a2fea6307e3fb48b025c50b7e1a3719f0a9198 SHA256 632bfce2f8a863a9e3d1a8052b75e41ae79d1e697d63a9fb1e4531c50c77c90c
-MD5 7a844bd6b778a2b8be943cc987271014 ChangeLog 1700
-RMD160 04d7465ee9215192590ef51a21a72da2239027c0 ChangeLog 1700
-SHA256 632bfce2f8a863a9e3d1a8052b75e41ae79d1e697d63a9fb1e4531c50c77c90c ChangeLog 1700
+EBUILD oroborox-0.9.7.9.ebuild 1377 RMD160 e68f58b4cb38a4fb2d7350c2acd886572e1863c2 SHA1 f0be79201efd55bcf412b9c24f62fc993f4da384 SHA256 635f5f918cad65ccf085b791c07f516ecccf6e54f0466ade623c0e9f07fa9693
+MD5 668e0125299b8b540074101ef1ec4009 oroborox-0.9.7.9.ebuild 1377
+RMD160 e68f58b4cb38a4fb2d7350c2acd886572e1863c2 oroborox-0.9.7.9.ebuild 1377
+SHA256 635f5f918cad65ccf085b791c07f516ecccf6e54f0466ade623c0e9f07fa9693 oroborox-0.9.7.9.ebuild 1377
+EBUILD oroborox-0.9.8.ebuild 1726 RMD160 fafb9d9fd02aa69be52f6b05c11254dbdb7ae4bf SHA1 3d191508a9f26969f3f49845a801b406a14b1f65 SHA256 230f34eda12e8c0f1695833907e839dbc4aa738f7b76917b0b5ce11ba45b4eb2
+MD5 965b4e4880a8f7b916ddd94233060cf7 oroborox-0.9.8.ebuild 1726
+RMD160 fafb9d9fd02aa69be52f6b05c11254dbdb7ae4bf oroborox-0.9.8.ebuild 1726
+SHA256 230f34eda12e8c0f1695833907e839dbc4aa738f7b76917b0b5ce11ba45b4eb2 oroborox-0.9.8.ebuild 1726
+MISC ChangeLog 1842 RMD160 4ba669b15ab054ff3930b78694f17223e7545d0f SHA1 b1d4a2f3c35d542936ae0269e8701672f099bdb0 SHA256 1803352a31a81cd4f0a48f23dd22d4e79f98881f44efba75e3cc23ec4bd68798
+MD5 e65faf44dfff8e5613bd2fe7966da09e ChangeLog 1842
+RMD160 4ba669b15ab054ff3930b78694f17223e7545d0f ChangeLog 1842
+SHA256 1803352a31a81cd4f0a48f23dd22d4e79f98881f44efba75e3cc23ec4bd68798 ChangeLog 1842
 MISC metadata.xml 157 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f SHA1 54ccd31d923f052c9111f04c1a7d8b8f04f0a7b2 SHA256 941fe96a972d5a4f49555c01cbfab71d51e81ade3a53322fee549061aa17012c
 MD5 94ae74afbf5ec6b3f8cdcb4ea7c917bb metadata.xml 157
 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f metadata.xml 157
diff --git a/rox-base/oroborox/oroborox-0.9.7.9.ebuild b/rox-base/oroborox/oroborox-0.9.7.9.ebuild
index 14f4ca492109..e67d15921170 100644
--- a/rox-base/oroborox/oroborox-0.9.7.9.ebuild
+++ b/rox-base/oroborox/oroborox-0.9.7.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/oroborox/oroborox-0.9.7.9.ebuild,v 1.6 2007/07/13 06:15:04 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/oroborox/oroborox-0.9.7.9.ebuild,v 1.7 2007/07/22 07:39:31 dberkholz Exp $
 
 ROX_LIB_VER=1.9.14
 inherit rox
@@ -19,35 +19,27 @@ IUSE="xinerama"
 DEPEND="
 	>=media-libs/freetype-2.0
 	virtual/xft
-	|| ( (
-		x11-proto/xproto
-		x11-proto/xextproto
-		x11-proto/xf86vidmodeproto
-		x11-libs/libXpm
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		xinerama? ( x11-proto/xineramaproto )
-	)
-		virtual/x11
-	)
+	x11-proto/xproto
+	x11-proto/xextproto
+	x11-proto/xf86vidmodeproto
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	xinerama? ( x11-proto/xineramaproto )
 	"
 
 RDEPEND="
 	>=media-libs/freetype-2.0
 	virtual/xft
-	|| ( (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXpm
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXxf86vm
-		xinerama? ( x11-libs/libXinerama )
-	)
-		virtual/x11
-	)
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXxf86vm
+	xinerama? ( x11-libs/libXinerama )
 	"
 
 S=${WORKDIR}
diff --git a/rox-base/oroborox/oroborox-0.9.8.ebuild b/rox-base/oroborox/oroborox-0.9.8.ebuild
index e51b5cf074cd..b6a6943987f5 100644
--- a/rox-base/oroborox/oroborox-0.9.8.ebuild
+++ b/rox-base/oroborox/oroborox-0.9.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/oroborox/oroborox-0.9.8.ebuild,v 1.3 2006/10/04 14:09:53 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/oroborox/oroborox-0.9.8.ebuild,v 1.4 2007/07/22 07:39:31 dberkholz Exp $
 
 ROX_LIB_VER=1.9.14
 inherit rox
@@ -23,36 +23,28 @@ IUSE="xinerama" #startup-notification
 DEPEND="
 	>=media-libs/freetype-2.0
 	virtual/xft
-	|| ( (
-		x11-proto/xproto
-		x11-proto/xextproto
-		x11-proto/xf86vidmodeproto
-		x11-libs/libXpm
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		xinerama? ( x11-proto/xineramaproto )
-	)
-		virtual/x11
-	)
+	x11-proto/xproto
+	x11-proto/xextproto
+	x11-proto/xf86vidmodeproto
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	xinerama? ( x11-proto/xineramaproto )
 	"
 	#startup-notification? ( x11-libs/startup-notification )
 
 RDEPEND="
 	>=media-libs/freetype-2.0
 	virtual/xft
-	|| ( (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXpm
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		x11-libs/libXxf86vm
-		xinerama? ( x11-libs/libXinerama )
-	)
-		virtual/x11
-	)
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXpm
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXxf86vm
+	xinerama? ( x11-libs/libXinerama )
 	"
 	#startup-notification? ( x11-libs/startup-notification )