Added modular X dependencies and closing bug #120225.

Package-Manager: portage-2.1_pre3-r1

4 files changed, 113 insertions, 17 deletions

diff --git a/app-emulation/vice/ChangeLog b/app-emulation/vice/ChangeLog
index cff90fafbe6e..d8f9adf0f61b 100644
--- a/app-emulation/vice/ChangeLog
+++ b/app-emulation/vice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/vice
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.32 2006/01/17 22:38:32 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.33 2006/01/25 02:50:36 wolf31o2 Exp $
+
+  25 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> vice-1.17.ebuild,
+  vice-1.19.ebuild:
+  Added modular X dependencies and closing bug #120225.
 
 *vice-1.19 (17 Jan 2006)
 
diff --git a/app-emulation/vice/Manifest b/app-emulation/vice/Manifest
index f9dd65ce943b..3c410a38cd59 100644
--- a/app-emulation/vice/Manifest
+++ b/app-emulation/vice/Manifest
@@ -1,6 +1,6 @@
-MD5 f8a6d9d802321f81f966b4b0b31c58ae ChangeLog 4063
+MD5 1ecf9d350a21456c3b0f7d1b9dbc067d ChangeLog 4215
 MD5 feb8195c915d5109dfd6b96df7bf4f91 files/digest-vice-1.17 62
 MD5 a3c398734bf808672ba34c9328f8ef1e files/digest-vice-1.19 62
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 55fb0dcd75db1a9a0e93d53e6daa5549 vice-1.17.ebuild 1368
-MD5 5c1753cc3e669c9f0e61e4c8e82ab39c vice-1.19.ebuild 1369
+MD5 d439df7fa15448340143789bcdb14965 vice-1.17.ebuild 1960
+MD5 2abcbfa97df686aabb1f6c9f428815e7 vice-1.19.ebuild 1962
diff --git a/app-emulation/vice/vice-1.17.ebuild b/app-emulation/vice/vice-1.17.ebuild
index ed698935e2d9..5e09b3596c0a 100644
--- a/app-emulation/vice/vice-1.17.ebuild
+++ b/app-emulation/vice/vice-1.17.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-1.17.ebuild,v 1.4 2005/11/13 20:57:02 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-1.17.ebuild,v 1.5 2006/01/25 02:50:36 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -13,16 +13,62 @@ SLOT="0"
 KEYWORDS="~amd64 ppc x86"
 IUSE="X Xaw3d arts esd ffmpeg gnome nls readline sdl"
 
-DEPEND="esd? ( media-sound/esound )
+XDEPEND="|| ( ( 
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXxf86vm
+			x11-libs/libICE
+			x11-libs/libSM
+			x11-libs/libXv
+			x11-libs/libXxf86dga
+		)
+		virtual/x11
+	)"
+RDEPEND="esd? ( media-sound/esound )
 	media-libs/libpng
 	sys-libs/zlib
 	arts? ( kde-base/arts )
-	gnome? ( gnome-base/gnome-libs )
+	gnome? (
+		${XDEPEND}
+		gnome-base/gnome-libs
+	)
 	readline? ( sys-libs/readline )
-	sdl? ( media-libs/libsdl )
-	X? ( virtual/x11 )
-	Xaw3d? ( x11-libs/Xaw3d )
+	sdl? (
+		${XDPENED}
+		|| ( ( 
+				x11-libs/libXt
+				x11-libs/libXmu
+			)
+			virtual/x11
+		)
+		media-libs/libsdl
+	)
+	X? (
+		${XDEPEND}
+		|| ( (
+				x11-libs/libXt
+				x11-libs/libXmu
+				x11-libs/libXpm
+				x11-libs/libXaw
+			)
+			virtual/x11
+		)
+	)
+	Xaw3d? ( 
+		${XDEPEND}
+		x11-libs/Xaw3d
+	)
 	ffmpeg? ( media-video/ffmpeg )"
+DEPEND="${RDEPEND}
+	|| ( ( 
+			x11-proto/xproto
+			x11-proto/xf86vidmodeproto
+			x11-proto/xextproto
+			x11-proto/xf86dgaproto
+			x11-proto/videoproto
+		)
+		virtual/x11
+	)"
 
 src_compile() {
 	egamesconf \
diff --git a/app-emulation/vice/vice-1.19.ebuild b/app-emulation/vice/vice-1.19.ebuild
index e04601433bc9..574a32f47d59 100644
--- a/app-emulation/vice/vice-1.19.ebuild
+++ b/app-emulation/vice/vice-1.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/vice/vice-1.19.ebuild,v 1.1 2006/01/17 22:38:32 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-1.19.ebuild,v 1.2 2006/01/25 02:50:36 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -13,16 +13,62 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="X Xaw3d arts esd ffmpeg gnome nls readline sdl"
 
-DEPEND="esd? ( media-sound/esound )
+XDEPEND="|| ( ( 
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXxf86vm
+			x11-libs/libICE
+			x11-libs/libSM
+			x11-libs/libXv
+			x11-libs/libXxf86dga
+		)
+		virtual/x11
+	)"
+RDEPEND="esd? ( media-sound/esound )
 	media-libs/libpng
 	sys-libs/zlib
 	arts? ( kde-base/arts )
-	gnome? ( gnome-base/gnome-libs )
+	gnome? (
+		${XDEPEND}
+		gnome-base/gnome-libs
+	)
 	readline? ( sys-libs/readline )
-	sdl? ( media-libs/libsdl )
-	X? ( virtual/x11 )
-	Xaw3d? ( x11-libs/Xaw3d )
+	sdl? (
+		${XDPENED}
+		|| ( ( 
+				x11-libs/libXt
+				x11-libs/libXmu
+			)
+			virtual/x11
+		)
+		media-libs/libsdl
+	)
+	X? (
+		${XDEPEND}
+		|| ( (
+				x11-libs/libXt
+				x11-libs/libXmu
+				x11-libs/libXpm
+				x11-libs/libXaw
+			)
+			virtual/x11
+		)
+	)
+	Xaw3d? ( 
+		${XDEPEND}
+		x11-libs/Xaw3d
+	)
 	ffmpeg? ( media-video/ffmpeg )"
+DEPEND="${RDEPEND}
+	|| ( ( 
+			x11-proto/xproto
+			x11-proto/xf86vidmodeproto
+			x11-proto/xextproto
+			x11-proto/xf86dgaproto
+			x11-proto/videoproto
+		)
+		virtual/x11
+	)"
 
 src_compile() {
 	egamesconf \