Punt dga stuff as upstream has cut it #147497 by Sascha Geschwandtner.

(Portage version: 2.1.1)

4 files changed, 38 insertions, 34 deletions

diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 39f948ca9c41..92101255c468 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/wine
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.155 2006/09/14 00:49:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.156 2006/09/14 00:55:04 vapier Exp $
+
+  14 Sep 2006; Mike Frysinger <vapier@gentoo.org> wine-0.9.19.ebuild,
+  wine-0.9.20.ebuild, wine-0.9.21.ebuild:
+  Punt dga stuff as upstream has cut it #147497 by Sascha Geschwandtner.
 
 *wine-0.9.21 (14 Sep 2006)
 
diff --git a/app-emulation/wine/wine-0.9.19.ebuild b/app-emulation/wine/wine-0.9.19.ebuild
index a77a1c7393f3..c85fb1bb4600 100644
--- a/app-emulation/wine/wine-0.9.19.ebuild
+++ b/app-emulation/wine/wine-0.9.19.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.19.ebuild,v 1.3 2006/09/06 09:04:09 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.19.ebuild,v 1.4 2006/09/14 00:55:04 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -20,9 +20,12 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	jack? ( media-sound/jack-audio-connection-kit )
 	dbus? ( sys-apps/dbus )
 	hal? ( sys-apps/hal )
-	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
-				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
-		virtual/x11 )
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
@@ -44,13 +47,10 @@ RDEPEND=">=media-libs/freetype-2.0.0
 		>=sys-kernel/linux-headers-2.6
 	)"
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/inputproto
-				x11-proto/xextproto
-				x11-proto/xf86dgaproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
 	)
 	sys-devel/bison
 	sys-devel/flex"
diff --git a/app-emulation/wine/wine-0.9.20.ebuild b/app-emulation/wine/wine-0.9.20.ebuild
index 3832c7496278..e6b1967eaae9 100644
--- a/app-emulation/wine/wine-0.9.20.ebuild
+++ b/app-emulation/wine/wine-0.9.20.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.20.ebuild,v 1.1 2006/08/24 17:50:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.20.ebuild,v 1.2 2006/09/14 00:55:04 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -20,9 +20,12 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	jack? ( media-sound/jack-audio-connection-kit )
 	dbus? ( sys-apps/dbus )
 	hal? ( sys-apps/hal )
-	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
-				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
-		virtual/x11 )
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
@@ -44,13 +47,10 @@ RDEPEND=">=media-libs/freetype-2.0.0
 		>=sys-kernel/linux-headers-2.6
 	)"
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/inputproto
-				x11-proto/xextproto
-				x11-proto/xf86dgaproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
 	)
 	sys-devel/bison
 	sys-devel/flex"
diff --git a/app-emulation/wine/wine-0.9.21.ebuild b/app-emulation/wine/wine-0.9.21.ebuild
index 3a36ae232aee..de88dd61a233 100644
--- a/app-emulation/wine/wine-0.9.21.ebuild
+++ b/app-emulation/wine/wine-0.9.21.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.21.ebuild,v 1.1 2006/09/14 00:49:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.21.ebuild,v 1.2 2006/09/14 00:55:04 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -20,9 +20,12 @@ RDEPEND=">=media-libs/freetype-2.0.0
 	jack? ( media-sound/jack-audio-connection-kit )
 	dbus? ( sys-apps/dbus )
 	hal? ( sys-apps/hal )
-	X? ( || ( ( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu
-				x11-libs/libXxf86dga x11-libs/libXxf86vm x11-apps/xmessage )
-		virtual/x11 )
+	X? (
+		x11-libs/libXrandr
+		x11-libs/libXi
+		x11-libs/libXmu
+		x11-libs/libXxf86vm
+		x11-apps/xmessage
 	)
 	arts? ( kde-base/arts )
 	alsa? ( media-libs/alsa-lib )
@@ -44,13 +47,10 @@ RDEPEND=">=media-libs/freetype-2.0.0
 		>=sys-kernel/linux-headers-2.6
 	)"
 DEPEND="${RDEPEND}
-	X? ( || ( ( x11-proto/inputproto
-				x11-proto/xextproto
-				x11-proto/xf86dgaproto
-				x11-proto/xf86vidmodeproto
-			)
-			virtual/x11
-		)
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
 	)
 	sys-devel/bison
 	sys-devel/flex"