Drop virtual/x11 references.

Package-Manager: portage-2.1.3_rc8

6 files changed, 61 insertions, 71 deletions

diff --git a/www-client/opera/ChangeLog b/www-client/opera/ChangeLog
index fdd9c2fee8df..7e800d14795e 100644
--- a/www-client/opera/ChangeLog
+++ b/www-client/opera/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/opera
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.112 2007/07/21 14:21:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/ChangeLog,v 1.113 2007/07/22 06:17:43 dberkholz Exp $
+
+  22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>; opera-9.21.ebuild,
+  opera-9.21-r1.ebuild, opera-9.22_rc651.ebuild, opera-9.22_rc652.ebuild,
+  opera-9.22.ebuild:
+  Drop virtual/x11 references.
 
   21 Jul 2007; Raúl Porcel <armin76@gentoo.org> opera-9.22.ebuild:
   x86 stable wrt security #185497
diff --git a/www-client/opera/opera-9.21-r1.ebuild b/www-client/opera/opera-9.21-r1.ebuild
index c81f49028e82..c02245232886 100644
--- a/www-client/opera/opera-9.21-r1.ebuild
+++ b/www-client/opera/opera-9.21-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.21-r1.ebuild,v 1.4 2007/07/15 04:26:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.21-r1.ebuild,v 1.5 2007/07/22 06:17:43 dberkholz Exp $
 
 GCONF_DEBUG="no"
 
@@ -34,19 +34,16 @@ SRC_URI="
 
 DEPEND=">=sys-apps/sed-4"
 
-RDEPEND="|| ( ( x11-libs/libXrandr
-				x11-libs/libXp
-				x11-libs/libXmu
-				x11-libs/libXi
-				x11-libs/libXft
-				x11-libs/libXext
-				x11-libs/libXcursor
-				x11-libs/libX11
-				x11-libs/libSM
-				x11-libs/libICE
-			  )
-			  virtual/x11
-			)
+RDEPEND="x11-libs/libXrandr
+	x11-libs/libXp
+	x11-libs/libXmu
+	x11-libs/libXi
+	x11-libs/libXft
+	x11-libs/libXext
+	x11-libs/libXcursor
+	x11-libs/libX11
+	x11-libs/libSM
+	x11-libs/libICE
 	>=media-libs/fontconfig-2.1.94-r1
 	amd64? ( qt-static? ( app-emulation/emul-linux-x86-xlibs )
 			 !qt-static? ( app-emulation/emul-linux-x86-qtlibs ) )
diff --git a/www-client/opera/opera-9.21.ebuild b/www-client/opera/opera-9.21.ebuild
index 3ae27780a65e..c543e03cd00a 100644
--- a/www-client/opera/opera-9.21.ebuild
+++ b/www-client/opera/opera-9.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.21.ebuild,v 1.8 2007/07/15 04:26:42 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.21.ebuild,v 1.9 2007/07/22 06:17:43 dberkholz Exp $
 
 GCONF_DEBUG="no"
 
@@ -34,19 +34,16 @@ SRC_URI="
 
 DEPEND=">=sys-apps/sed-4"
 
-RDEPEND="|| ( ( x11-libs/libXrandr
-				x11-libs/libXp
-				x11-libs/libXmu
-				x11-libs/libXi
-				x11-libs/libXft
-				x11-libs/libXext
-				x11-libs/libXcursor
-				x11-libs/libX11
-				x11-libs/libSM
-				x11-libs/libICE
-			  )
-			  virtual/x11
-			)
+RDEPEND="x11-libs/libXrandr
+	x11-libs/libXp
+	x11-libs/libXmu
+	x11-libs/libXi
+	x11-libs/libXft
+	x11-libs/libXext
+	x11-libs/libXcursor
+	x11-libs/libX11
+	x11-libs/libSM
+	x11-libs/libICE
 	>=media-libs/fontconfig-2.1.94-r1
 	amd64? ( qt-static? ( app-emulation/emul-linux-x86-xlibs )
 			 !qt-static? ( app-emulation/emul-linux-x86-qtlibs ) )
diff --git a/www-client/opera/opera-9.22.ebuild b/www-client/opera/opera-9.22.ebuild
index c1f58ac74cde..1afa4143390d 100644
--- a/www-client/opera/opera-9.22.ebuild
+++ b/www-client/opera/opera-9.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.22.ebuild,v 1.5 2007/07/21 14:21:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.22.ebuild,v 1.6 2007/07/22 06:17:43 dberkholz Exp $
 
 GCONF_DEBUG="no"
 
@@ -34,19 +34,16 @@ SRC_URI="
 
 DEPEND=">=sys-apps/sed-4"
 
-RDEPEND="|| ( ( x11-libs/libXrandr
-				x11-libs/libXp
-				x11-libs/libXmu
-				x11-libs/libXi
-				x11-libs/libXft
-				x11-libs/libXext
-				x11-libs/libXcursor
-				x11-libs/libX11
-				x11-libs/libSM
-				x11-libs/libICE
-			  )
-			  virtual/x11
-			)
+RDEPEND="x11-libs/libXrandr
+	x11-libs/libXp
+	x11-libs/libXmu
+	x11-libs/libXi
+	x11-libs/libXft
+	x11-libs/libXext
+	x11-libs/libXcursor
+	x11-libs/libX11
+	x11-libs/libSM
+	x11-libs/libICE
 	>=media-libs/fontconfig-2.1.94-r1
 	amd64? ( qt-static? ( app-emulation/emul-linux-x86-xlibs )
 			 !qt-static? ( app-emulation/emul-linux-x86-qtlibs ) )
diff --git a/www-client/opera/opera-9.22_rc651.ebuild b/www-client/opera/opera-9.22_rc651.ebuild
index 24de3aaa6b2e..ec7c33eb89f9 100644
--- a/www-client/opera/opera-9.22_rc651.ebuild
+++ b/www-client/opera/opera-9.22_rc651.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.22_rc651.ebuild,v 1.1 2007/07/19 11:10:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.22_rc651.ebuild,v 1.2 2007/07/22 06:17:43 dberkholz Exp $
 
 GCONF_DEBUG="no"
 
@@ -34,19 +34,16 @@ SRC_URI="
 
 DEPEND=">=sys-apps/sed-4"
 
-RDEPEND="|| ( ( x11-libs/libXrandr
-				x11-libs/libXp
-				x11-libs/libXmu
-				x11-libs/libXi
-				x11-libs/libXft
-				x11-libs/libXext
-				x11-libs/libXcursor
-				x11-libs/libX11
-				x11-libs/libSM
-				x11-libs/libICE
-			  )
-			  virtual/x11
-			)
+RDEPEND="x11-libs/libXrandr
+	x11-libs/libXp
+	x11-libs/libXmu
+	x11-libs/libXi
+	x11-libs/libXft
+	x11-libs/libXext
+	x11-libs/libXcursor
+	x11-libs/libX11
+	x11-libs/libSM
+	x11-libs/libICE
 	>=media-libs/fontconfig-2.1.94-r1
 	amd64? ( qt-static? ( app-emulation/emul-linux-x86-xlibs )
 			 !qt-static? ( app-emulation/emul-linux-x86-qtlibs ) )
diff --git a/www-client/opera/opera-9.22_rc652.ebuild b/www-client/opera/opera-9.22_rc652.ebuild
index 0fac34c7eab3..de3637b21bc1 100644
--- a/www-client/opera/opera-9.22_rc652.ebuild
+++ b/www-client/opera/opera-9.22_rc652.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.22_rc652.ebuild,v 1.1 2007/07/19 11:10:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera/opera-9.22_rc652.ebuild,v 1.2 2007/07/22 06:17:43 dberkholz Exp $
 
 GCONF_DEBUG="no"
 
@@ -32,19 +32,16 @@ SRC_URI="
 
 DEPEND=">=sys-apps/sed-4"
 
-RDEPEND="|| ( ( x11-libs/libXrandr
-				x11-libs/libXp
-				x11-libs/libXmu
-				x11-libs/libXi
-				x11-libs/libXft
-				x11-libs/libXext
-				x11-libs/libXcursor
-				x11-libs/libX11
-				x11-libs/libSM
-				x11-libs/libICE
-			  )
-			  virtual/x11
-			)
+RDEPEND="x11-libs/libXrandr
+	x11-libs/libXp
+	x11-libs/libXmu
+	x11-libs/libXi
+	x11-libs/libXft
+	x11-libs/libXext
+	x11-libs/libXcursor
+	x11-libs/libX11
+	x11-libs/libSM
+	x11-libs/libICE
 	>=media-libs/fontconfig-2.1.94-r1
 	amd64? ( qt-static? ( app-emulation/emul-linux-x86-xlibs )
 			 !qt-static? ( app-emulation/emul-linux-x86-qtlibs ) )