summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-emulation/wine/ChangeLog5
-rw-r--r--app-emulation/wine/wine-0.9.3.ebuild20
-rw-r--r--app-emulation/wine/wine-20050930.ebuild20
-rw-r--r--app-emulation/wine/wine-9999.ebuild20
4 files changed, 58 insertions, 7 deletions
diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog
index 906946dbdb94..13e9622a8ccc 100644
--- a/app-emulation/wine/ChangeLog
+++ b/app-emulation/wine/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-emulation/wine
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.113 2005/12/14 05:40:23 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.114 2005/12/14 05:42:52 spyderous Exp $
+
+ 14 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; wine-0.9.3.ebuild:
+ (#115225) Add modular X dependencies.
14 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; wine-9999.ebuild,
wine-20050930.ebuild:
diff --git a/app-emulation/wine/wine-0.9.3.ebuild b/app-emulation/wine/wine-0.9.3.ebuild
index f2d31cef253d..76807826b482 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-2005 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.1 2005/12/11 17:36:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-0.9.3.ebuild,v 1.2 2005/12/14 05:42:52 spyderous Exp $
inherit eutils flag-o-matic multilib
@@ -18,7 +18,15 @@ RDEPEND=">=media-libs/freetype-2.0.0
media-fonts/corefonts
ncurses? ( >=sys-libs/ncurses-5.2 )
jack? ( media-sound/jack-audio-connection-kit )
- X? ( virtual/x11 )
+ X? ( || ( ( x11-libs/libXrandr
+ x11-libs/libXi
+ x11-libs/libXmu
+ x11-libs/libXxf86dga
+ x11-libs/libXxf86vm
+ )
+ virtual/x11
+ )
+ )
arts? ( kde-base/arts )
alsa? ( media-libs/alsa-lib )
esd? ( media-sound/esound )
@@ -39,6 +47,14 @@ 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
+ )
+ )
sys-devel/bison
sys-devel/flex"
diff --git a/app-emulation/wine/wine-20050930.ebuild b/app-emulation/wine/wine-20050930.ebuild
index cd5986663004..0c112c637703 100644
--- a/app-emulation/wine/wine-20050930.ebuild
+++ b/app-emulation/wine/wine-20050930.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 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.5 2005/10/14 01:53:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-20050930.ebuild,v 1.6 2005/12/14 05:40:23 spyderous Exp $
inherit eutils flag-o-matic multilib
@@ -18,7 +18,15 @@ RDEPEND=">=media-libs/freetype-2.0.0
media-fonts/corefonts
ncurses? ( >=sys-libs/ncurses-5.2 )
jack? ( media-sound/jack-audio-connection-kit )
- X? ( virtual/x11 )
+ X? ( || ( ( x11-libs/libXrandr
+ x11-libs/libXi
+ x11-libs/libXmu
+ x11-libs/libXxf86dga
+ x11-libs/libXxf86vm
+ )
+ virtual/x11
+ )
+ )
arts? ( kde-base/arts )
alsa? ( media-libs/alsa-lib )
esd? ( media-sound/esound )
@@ -39,6 +47,14 @@ 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
+ )
+ )
sys-devel/bison
sys-devel/flex"
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index e168b9a3c7c5..feffdc4c7b2a 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 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.1 2005/10/22 07:48:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.2 2005/12/14 05:40:23 spyderous Exp $
ECVS_SERVER="cvs.winehq.org:/home/wine"
ECVS_MODULE="wine"
@@ -23,7 +23,15 @@ RDEPEND=">=media-libs/freetype-2.0.0
media-fonts/corefonts
ncurses? ( >=sys-libs/ncurses-5.2 )
jack? ( media-sound/jack-audio-connection-kit )
- X? ( virtual/x11 )
+ X? ( || ( ( x11-libs/libXrandr
+ x11-libs/libXi
+ x11-libs/libXmu
+ x11-libs/libXxf86dga
+ x11-libs/libXxf86vm
+ )
+ virtual/x11
+ )
+ )
arts? ( kde-base/arts )
alsa? ( media-libs/alsa-lib )
esd? ( media-sound/esound )
@@ -44,6 +52,14 @@ 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
+ )
+ )
sys-devel/bison
sys-devel/flex"