pull in xmessage #137065 by Fabrice Delliaux

(Portage version: 2.1.1_pre1-r1)

27 files changed, 108 insertions, 243 deletions

diff --git a/app-emulation/wine/wine-0.9.1.ebuild b/app-emulation/wine/wine-0.9.1.ebuild
index 0e09b99bf93a..f23863d5cee7 100644
--- a/app-emulation/wine/wine-0.9.1.ebuild
+++ b/app-emulation/wine/wine-0.9.1.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/app-emulation/wine/wine-0.9.1.ebuild,v 1.10 2006/04/02 20:11:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.1.ebuild,v 1.11 2006/06/24 07:46:36 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,14 +18,9 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr
-				x11-libs/libXi
-				x11-libs/libXmu
-				x11-libs/libXxf86dga
-				x11-libs/libXxf86vm
-			)
-			virtual/x11
-		)
+	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
+				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
+		virtual/x11 )
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
diff --git a/app-emulation/wine/wine-0.9.10.ebuild b/app-emulation/wine/wine-0.9.10.ebuild
index 12c038823245..7939f19f4a80 100644
--- a/app-emulation/wine/wine-0.9.10.ebuild
+++ b/app-emulation/wine/wine-0.9.10.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/app-emulation/wine/wine-0.9.10.ebuild,v 1.6 2006/06/24 07:41:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.10.ebuild,v 1.7 2006/06/24 07:46:36 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,14 +18,9 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr
-				x11-libs/libXi
-				x11-libs/libXmu
-				x11-libs/libXxf86dga
-				x11-libs/libXxf86vm
-			)
-			virtual/x11
-		)
+	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
+				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
+		virtual/x11 )
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
diff --git a/app-emulation/wine/wine-0.9.11.ebuild b/app-emulation/wine/wine-0.9.11.ebuild
index 371acdb06ca1..089e4ccd6e3e 100644
--- a/app-emulation/wine/wine-0.9.11.ebuild
+++ b/app-emulation/wine/wine-0.9.11.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/app-emulation/wine/wine-0.9.11.ebuild,v 1.7 2006/06/24 07:41:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.11.ebuild,v 1.8 2006/06/24 07:46:36 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,14 +18,9 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr
-				x11-libs/libXi
-				x11-libs/libXmu
-				x11-libs/libXxf86dga
-				x11-libs/libXxf86vm
-			)
-			virtual/x11
-		)
+	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
+				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
+		virtual/x11 )
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
diff --git a/app-emulation/wine/wine-0.9.12.ebuild b/app-emulation/wine/wine-0.9.12.ebuild
index 8ab74772942e..6d52aca7c18e 100644
--- a/app-emulation/wine/wine-0.9.12.ebuild
+++ b/app-emulation/wine/wine-0.9.12.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/app-emulation/wine/wine-0.9.12.ebuild,v 1.2 2006/06/24 07:41:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.12.ebuild,v 1.3 2006/06/24 07:46:36 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,14 +18,9 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr
-				x11-libs/libXi
-				x11-libs/libXmu
-				x11-libs/libXxf86dga
-				x11-libs/libXxf86vm
-			)
-			virtual/x11
-		)
+	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
+				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
+		virtual/x11 )
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
diff --git a/app-emulation/wine/wine-0.9.13.ebuild b/app-emulation/wine/wine-0.9.13.ebuild
index 7dfb231db9e3..d5e168fe6ca9 100644
--- a/app-emulation/wine/wine-0.9.13.ebuild
+++ b/app-emulation/wine/wine-0.9.13.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/app-emulation/wine/wine-0.9.13.ebuild,v 1.2 2006/06/24 07:41:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.13.ebuild,v 1.3 2006/06/24 07:46:36 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,14 +18,9 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr
-				x11-libs/libXi
-				x11-libs/libXmu
-				x11-libs/libXxf86dga
-				x11-libs/libXxf86vm
-			)
-			virtual/x11
-		)
+	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
+				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
+		virtual/x11 )
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
diff --git a/app-emulation/wine/wine-0.9.14.ebuild b/app-emulation/wine/wine-0.9.14.ebuild
index d4c14a78c1a5..d2ea0316ddf9 100644
--- a/app-emulation/wine/wine-0.9.14.ebuild
+++ b/app-emulation/wine/wine-0.9.14.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/app-emulation/wine/wine-0.9.14.ebuild,v 1.2 2006/06/24 07:41:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.14.ebuild,v 1.3 2006/06/24 07:46:36 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,14 +18,9 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr
-				x11-libs/libXi
-				x11-libs/libXmu
-				x11-libs/libXxf86dga
-				x11-libs/libXxf86vm
-			)
-			virtual/x11
-		)
+	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
+				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
+		virtual/x11 )
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
diff --git a/app-emulation/wine/wine-0.9.15.ebuild b/app-emulation/wine/wine-0.9.15.ebuild
index 7f8e4b748147..c28c62349d24 100644
--- a/app-emulation/wine/wine-0.9.15.ebuild
+++ b/app-emulation/wine/wine-0.9.15.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/app-emulation/wine/wine-0.9.15.ebuild,v 1.8 2006/06/24 07:41:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.15.ebuild,v 1.9 2006/06/24 07:46:36 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,14 +18,9 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr
-				x11-libs/libXi
-				x11-libs/libXmu
-				x11-libs/libXxf86dga
-				x11-libs/libXxf86vm
-			)
-			virtual/x11
-		)
+	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
+				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
+		virtual/x11 )
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
diff --git a/app-emulation/wine/wine-0.9.2.ebuild b/app-emulation/wine/wine-0.9.2.ebuild
index cd83869b75e0..4898113eb721 100644
--- a/app-emulation/wine/wine-0.9.2.ebuild
+++ b/app-emulation/wine/wine-0.9.2.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/app-emulation/wine/wine-0.9.2.ebuild,v 1.10 2006/04/02 20:11:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.2.ebuild,v 1.11 2006/06/24 07:46:36 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,14 +18,9 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr
-				x11-libs/libXi
-				x11-libs/libXmu
-				x11-libs/libXxf86dga
-				x11-libs/libXxf86vm
-			)
-			virtual/x11
-		)
+	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
+				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
+		virtual/x11 )
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
diff --git a/app-emulation/wine/wine-0.9.3.ebuild b/app-emulation/wine/wine-0.9.3.ebuild
index 906af5b64d98..e7246f37d7db 100644
--- a/app-emulation/wine/wine-0.9.3.ebuild
+++ b/app-emulation/wine/wine-0.9.3.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/app-emulation/wine/wine-0.9.3.ebuild,v 1.11 2006/04/02 20:11:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.3.ebuild,v 1.12 2006/06/24 07:46:36 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,14 +18,9 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr
-				x11-libs/libXi
-				x11-libs/libXmu
-				x11-libs/libXxf86dga
-				x11-libs/libXxf86vm
-			)
-			virtual/x11
-		)
+	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
+				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
+		virtual/x11 )
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
diff --git a/app-emulation/wine/wine-0.9.4.ebuild b/app-emulation/wine/wine-0.9.4.ebuild
index 48f56e39f760..629e4fa63819 100644
--- a/app-emulation/wine/wine-0.9.4.ebuild
+++ b/app-emulation/wine/wine-0.9.4.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/app-emulation/wine/wine-0.9.4.ebuild,v 1.11 2006/04/02 20:11:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.4.ebuild,v 1.12 2006/06/24 07:46:36 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,14 +18,9 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr
-				x11-libs/libXi
-				x11-libs/libXmu
-				x11-libs/libXxf86dga
-				x11-libs/libXxf86vm
-			)
-			virtual/x11
-		)
+	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
+				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
+		virtual/x11 )
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
diff --git a/app-emulation/wine/wine-0.9.5-r1.ebuild b/app-emulation/wine/wine-0.9.5-r1.ebuild
index eb598cac8cca..c3a767427f29 100644
--- a/app-emulation/wine/wine-0.9.5-r1.ebuild
+++ b/app-emulation/wine/wine-0.9.5-r1.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/app-emulation/wine/wine-0.9.5-r1.ebuild,v 1.8 2006/04/02 20:11:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.5-r1.ebuild,v 1.9 2006/06/24 07:46:36 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,14 +18,9 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr
-				x11-libs/libXi
-				x11-libs/libXmu
-				x11-libs/libXxf86dga
-				x11-libs/libXxf86vm
-			)
-			virtual/x11
-		)
+	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
+				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
+		virtual/x11 )
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
diff --git a/app-emulation/wine/wine-0.9.6.ebuild b/app-emulation/wine/wine-0.9.6.ebuild
index 5ce4f6e32fa1..3301982f9ae2 100644
--- a/app-emulation/wine/wine-0.9.6.ebuild
+++ b/app-emulation/wine/wine-0.9.6.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/app-emulation/wine/wine-0.9.6.ebuild,v 1.11 2006/06/24 07:41:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.6.ebuild,v 1.12 2006/06/24 07:46:36 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,14 +18,9 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr
-				x11-libs/libXi
-				x11-libs/libXmu
-				x11-libs/libXxf86dga
-				x11-libs/libXxf86vm
-			)
-			virtual/x11
-		)
+	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
+				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
+		virtual/x11 )
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
diff --git a/app-emulation/wine/wine-0.9.7.ebuild b/app-emulation/wine/wine-0.9.7.ebuild
index 7ad551f22654..148237d8902d 100644
--- a/app-emulation/wine/wine-0.9.7.ebuild
+++ b/app-emulation/wine/wine-0.9.7.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/app-emulation/wine/wine-0.9.7.ebuild,v 1.8 2006/06/24 07:41:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.7.ebuild,v 1.9 2006/06/24 07:46:36 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,14 +18,9 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr
-				x11-libs/libXi
-				x11-libs/libXmu
-				x11-libs/libXxf86dga
-				x11-libs/libXxf86vm
-			)
-			virtual/x11
-		)
+	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
+				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
+		virtual/x11 )
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
diff --git a/app-emulation/wine/wine-0.9.8-r1.ebuild b/app-emulation/wine/wine-0.9.8-r1.ebuild
index 5d2cc763d43f..d86195463511 100644
--- a/app-emulation/wine/wine-0.9.8-r1.ebuild
+++ b/app-emulation/wine/wine-0.9.8-r1.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/app-emulation/wine/wine-0.9.8-r1.ebuild,v 1.8 2006/06/24 07:41:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.8-r1.ebuild,v 1.9 2006/06/24 07:46:36 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,14 +18,9 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr
-				x11-libs/libXi
-				x11-libs/libXmu
-				x11-libs/libXxf86dga
-				x11-libs/libXxf86vm
-			)
-			virtual/x11
-		)
+	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
+				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
+		virtual/x11 )
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
diff --git a/app-emulation/wine/wine-0.9.9.ebuild b/app-emulation/wine/wine-0.9.9.ebuild
index f0734ff335ba..7921f35376d5 100644
--- a/app-emulation/wine/wine-0.9.9.ebuild
+++ b/app-emulation/wine/wine-0.9.9.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/app-emulation/wine/wine-0.9.9.ebuild,v 1.6 2006/06/24 07:41:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.9.ebuild,v 1.7 2006/06/24 07:46:36 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,14 +18,9 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr
-				x11-libs/libXi
-				x11-libs/libXmu
-				x11-libs/libXxf86dga
-				x11-libs/libXxf86vm
-			)
-			virtual/x11
-		)
+	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
+				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
+		virtual/x11 )
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
diff --git a/app-emulation/wine/wine-0.9.ebuild b/app-emulation/wine/wine-0.9.ebuild
index c692e38ba8dc..da25e6f42bbc 100644
--- a/app-emulation/wine/wine-0.9.ebuild
+++ b/app-emulation/wine/wine-0.9.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/app-emulation/wine/wine-0.9.ebuild,v 1.10 2006/04/02 20:11:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.ebuild,v 1.11 2006/06/24 07:46:36 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,14 +18,9 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr
-				x11-libs/libXi
-				x11-libs/libXmu
-				x11-libs/libXxf86dga
-				x11-libs/libXxf86vm
-			)
-			virtual/x11
-		)
+	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
+				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
+		virtual/x11 )
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
diff --git a/app-emulation/wine/wine-20041019-r3.ebuild b/app-emulation/wine/wine-20041019-r3.ebuild
index 812b0b062630..56f4ff1ea083 100644
--- a/app-emulation/wine/wine-20041019-r3.ebuild
+++ b/app-emulation/wine/wine-20041019-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/app-emulation/wine/wine-20041019-r3.ebuild,v 1.26 2006/03/09 23:45:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20041019-r3.ebuild,v 1.27 2006/06/24 07:46:36 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -19,14 +19,9 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr
-				x11-libs/libXi
-				x11-libs/libXmu
-				x11-libs/libXxf86dga
-				x11-libs/libXxf86vm
-			)
-			virtual/x11
-		)
+	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
+				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
+		virtual/x11 )
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
diff --git a/app-emulation/wine/wine-20050111-r2.ebuild b/app-emulation/wine/wine-20050111-r2.ebuild
index e23474f3ecd2..480a9722fd68 100644
--- a/app-emulation/wine/wine-20050111-r2.ebuild
+++ b/app-emulation/wine/wine-20050111-r2.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/app-emulation/wine/wine-20050111-r2.ebuild,v 1.11 2006/03/09 23:45:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050111-r2.ebuild,v 1.12 2006/06/24 07:46:36 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -20,14 +20,9 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr
-				x11-libs/libXi
-				x11-libs/libXmu
-				x11-libs/libXxf86dga
-				x11-libs/libXxf86vm
-			)
-			virtual/x11
-		)
+	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
+				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
+		virtual/x11 )
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
diff --git a/app-emulation/wine/wine-20050211.ebuild b/app-emulation/wine/wine-20050211.ebuild
index 3226d5868877..128127d84a44 100644
--- a/app-emulation/wine/wine-20050211.ebuild
+++ b/app-emulation/wine/wine-20050211.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/app-emulation/wine/wine-20050211.ebuild,v 1.24 2006/03/09 23:45:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050211.ebuild,v 1.25 2006/06/24 07:46:36 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -19,14 +19,9 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr
-				x11-libs/libXi
-				x11-libs/libXmu
-				x11-libs/libXxf86dga
-				x11-libs/libXxf86vm
-			)
-			virtual/x11
-		)
+	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
+				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
+		virtual/x11 )
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
diff --git a/app-emulation/wine/wine-20050310-r1.ebuild b/app-emulation/wine/wine-20050310-r1.ebuild
index 16ab462c9dcd..e31889b00385 100644
--- a/app-emulation/wine/wine-20050310-r1.ebuild
+++ b/app-emulation/wine/wine-20050310-r1.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/app-emulation/wine/wine-20050310-r1.ebuild,v 1.17 2006/03/09 23:45:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050310-r1.ebuild,v 1.18 2006/06/24 07:46:36 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -19,14 +19,9 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr
-				x11-libs/libXi
-				x11-libs/libXmu
-				x11-libs/libXxf86dga
-				x11-libs/libXxf86vm
-			)
-			virtual/x11
-		)
+	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
+				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
+		virtual/x11 )
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
diff --git a/app-emulation/wine/wine-20050419.ebuild b/app-emulation/wine/wine-20050419.ebuild
index 0016b152d9b7..cf9abda04e4f 100644
--- a/app-emulation/wine/wine-20050419.ebuild
+++ b/app-emulation/wine/wine-20050419.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/app-emulation/wine/wine-20050419.ebuild,v 1.19 2006/03/09 23:45:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050419.ebuild,v 1.20 2006/06/24 07:46:36 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -19,14 +19,9 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr
-				x11-libs/libXi
-				x11-libs/libXmu
-				x11-libs/libXxf86dga
-				x11-libs/libXxf86vm
-			)
-			virtual/x11
-		)
+	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
+				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
+		virtual/x11 )
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
diff --git a/app-emulation/wine/wine-20050524.ebuild b/app-emulation/wine/wine-20050524.ebuild
index a75747322a47..12f4ab987236 100644
--- a/app-emulation/wine/wine-20050524.ebuild
+++ b/app-emulation/wine/wine-20050524.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/app-emulation/wine/wine-20050524.ebuild,v 1.17 2006/03/09 23:45:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050524.ebuild,v 1.18 2006/06/24 07:46:36 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -19,14 +19,9 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr
-				x11-libs/libXi
-				x11-libs/libXmu
-				x11-libs/libXxf86dga
-				x11-libs/libXxf86vm
-			)
-			virtual/x11
-		)
+	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
+				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
+		virtual/x11 )
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
diff --git a/app-emulation/wine/wine-20050628.ebuild b/app-emulation/wine/wine-20050628.ebuild
index 189a085ff3fd..6575671e53d4 100644
--- a/app-emulation/wine/wine-20050628.ebuild
+++ b/app-emulation/wine/wine-20050628.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/app-emulation/wine/wine-20050628.ebuild,v 1.12 2006/03/09 23:45:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050628.ebuild,v 1.13 2006/06/24 07:46:36 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -19,14 +19,9 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr
-				x11-libs/libXi
-				x11-libs/libXmu
-				x11-libs/libXxf86dga
-				x11-libs/libXxf86vm
-			)
-			virtual/x11
-		)
+	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
+				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
+		virtual/x11 )
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
diff --git a/app-emulation/wine/wine-20050725-r1.ebuild b/app-emulation/wine/wine-20050725-r1.ebuild
index 2fc690ea7061..743e2eb4ca69 100644
--- a/app-emulation/wine/wine-20050725-r1.ebuild
+++ b/app-emulation/wine/wine-20050725-r1.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/app-emulation/wine/wine-20050725-r1.ebuild,v 1.10 2006/03/09 23:45:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050725-r1.ebuild,v 1.11 2006/06/24 07:46:36 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -19,14 +19,9 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr
-				x11-libs/libXi
-				x11-libs/libXmu
-				x11-libs/libXxf86dga
-				x11-libs/libXxf86vm
-			)
-			virtual/x11
-		)
+	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
+				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
+		virtual/x11 )
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
diff --git a/app-emulation/wine/wine-20050830.ebuild b/app-emulation/wine/wine-20050830.ebuild
index 3d4785c6b2e1..8796312bc597 100644
--- a/app-emulation/wine/wine-20050830.ebuild
+++ b/app-emulation/wine/wine-20050830.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/app-emulation/wine/wine-20050830.ebuild,v 1.9 2006/03/09 23:45:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050830.ebuild,v 1.10 2006/06/24 07:46:36 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -19,14 +19,9 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr
-				x11-libs/libXi
-				x11-libs/libXmu
-				x11-libs/libXxf86dga
-				x11-libs/libXxf86vm
-			)
-			virtual/x11
-		)
+	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
+				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
+		virtual/x11 )
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
diff --git a/app-emulation/wine/wine-20050930.ebuild b/app-emulation/wine/wine-20050930.ebuild
index 0c4784bd2162..6c7cb5eafc2a 100644
--- a/app-emulation/wine/wine-20050930.ebuild
+++ b/app-emulation/wine/wine-20050930.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/app-emulation/wine/wine-20050930.ebuild,v 1.15 2006/04/02 20:11:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050930.ebuild,v 1.16 2006/06/24 07:46:36 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -18,14 +18,9 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr
-				x11-libs/libXi
-				x11-libs/libXmu
-				x11-libs/libXxf86dga
-				x11-libs/libXxf86vm
-			)
-			virtual/x11
-		)
+	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
+				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
+		virtual/x11 )
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index a5ed1fcbf0fe..71cda0cffbe0 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.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/app-emulation/wine/wine-9999.ebuild,v 1.11 2006/04/02 20:11:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.12 2006/06/24 07:46:36 vapier Exp $
 
 ECVS_SERVER="cvs.winehq.org:/home/wine"
 ECVS_MODULE="wine"
@@ -23,14 +23,9 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	media-fonts/corefonts
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	jack? ( media-sound/jack-audio-connection-kit )
-	X? ( || ( ( x11-libs/libXrandr
-				x11-libs/libXi
-				x11-libs/libXmu
-				x11-libs/libXxf86dga
-				x11-libs/libXxf86vm
-			)
-			virtual/x11
-		)
+	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
+				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
+		virtual/x11 )
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )