Added modular X dependencies and closing bug #121527.

Package-Manager: portage-2.1_pre4-r1

4 files changed, 44 insertions, 13 deletions

diff --git a/games-emulation/darcnes/Manifest b/games-emulation/darcnes/Manifest
index 8f28d6139a2a..da8fa43c8a12 100644
--- a/games-emulation/darcnes/Manifest
+++ b/games-emulation/darcnes/Manifest
@@ -1,5 +1,15 @@
-MD5 76f781cc726246480c44bfaeb62fe5f5 ChangeLog 2284
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 4bd4615a6e140aab2a03e059561c48fe darcnes-0401-r2.ebuild 1556
-MD5 97092964e106d48cc1b417ed92a14ed7 files/digest-darcnes-0401-r2 57
+MD5 7effe9c59c3d72bc0d352f171de345a3 ChangeLog 2420
+RMD160 38c7b6592e76980ff1d8d2986fe28892b6bff387 ChangeLog 2420
+SHA256 bc1b83a2ced5504c7f105db225193d497e2874ba3f034959c1a59dcc00d52e60 ChangeLog 2420
+MD5 cf6a93c3181966dedd17153c0075b638 darcnes-0401-r2.ebuild 1744
+RMD160 fa76e41cf0a1179347cbe8dbd3ad11cc819172f1 darcnes-0401-r2.ebuild 1744
+SHA256 1103ec22295361c8ef9cd1bc389504750797d7e8a4d726a054dd9e2168df7931 darcnes-0401-r2.ebuild 1744
 MD5 335dea4e38703d1353b5cca128ec34b9 files/darcnes-0401-gcc34.patch 213
+RMD160 520a1cdfc48b2303b38a5bbe0b5aa278f9585ef7 files/darcnes-0401-gcc34.patch 213
+SHA256 6e60eb91f9b49139a793ec32751c58c60667be07e7dcdec626cfe3fbc5f51a07 files/darcnes-0401-gcc34.patch 213
+MD5 97092964e106d48cc1b417ed92a14ed7 files/digest-darcnes-0401-r2 57
+RMD160 666ae24577959e7fd16076f6b8dcef57ba11fcdd files/digest-darcnes-0401-r2 57
+SHA256 aece3d1b117e0eb75b27a3f34afb04b272482260652a27fa265a8c5cb1a02b7b files/digest-darcnes-0401-r2 57
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
diff --git a/games-emulation/gnuboy/ChangeLog b/games-emulation/gnuboy/ChangeLog
index 4b1760af6ce0..046bbaf856b0 100644
--- a/games-emulation/gnuboy/ChangeLog
+++ b/games-emulation/gnuboy/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-emulation/gnuboy
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/gnuboy/ChangeLog,v 1.8 2005/08/29 04:19:01 mr_bones_ Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/gnuboy/ChangeLog,v 1.9 2006/02/10 19:39:07 wolf31o2 Exp $
+
+  10 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> gnuboy-1.0.3.ebuild:
+  Added modular X dependencies and closing bug #121527.
 
   29 Aug 2005; Michael Sterrett <mr_bones_@gentoo.org> gnuboy-1.0.3.ebuild:
   more choices for gui - patch from James Rowe via bug #99983
diff --git a/games-emulation/gnuboy/Manifest b/games-emulation/gnuboy/Manifest
index f2df0181176a..fda6c83ca5b3 100644
--- a/games-emulation/gnuboy/Manifest
+++ b/games-emulation/gnuboy/Manifest
@@ -1,4 +1,12 @@
-MD5 e057006ad1af4aa5299d94c09d65c1fa ChangeLog 823
+MD5 04dec64abd413c1c1088ae581f422a4d ChangeLog 954
+RMD160 3808a25af6ec5d79bacf698a5ecdd14f8a26cf9c ChangeLog 954
+SHA256 6843ac5579c3b68cacacc3a6f38d70d61f7be3da7f128a85467b3499718236dd ChangeLog 954
 MD5 aaa1c3b3b75fac31451803f7290c595a files/digest-gnuboy-1.0.3 64
-MD5 bc19f4e6e4395bcf555a6210d3119505 gnuboy-1.0.3.ebuild 1153
+RMD160 982af0ecbadf1ef3c1e788228e14664476dfae04 files/digest-gnuboy-1.0.3 64
+SHA256 2f477295387b5b353502692f9a022ab3706be95983e43d92ee29716fdb12d96f files/digest-gnuboy-1.0.3 64
+MD5 796d67d13661581f65532552eda6f82a gnuboy-1.0.3.ebuild 1305
+RMD160 e55386f7660be9a84ffdfedf1e0c3a6dc43fd815 gnuboy-1.0.3.ebuild 1305
+SHA256 879eb0eab7755d1b56f450ba152472f0f5323657d9dc81d682224cc7b7acd9f2 gnuboy-1.0.3.ebuild 1305
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
diff --git a/games-emulation/gnuboy/gnuboy-1.0.3.ebuild b/games-emulation/gnuboy/gnuboy-1.0.3.ebuild
index 6c8b7d14b4bc..064f66fbfb1f 100644
--- a/games-emulation/gnuboy/gnuboy-1.0.3.ebuild
+++ b/games-emulation/gnuboy/gnuboy-1.0.3.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/games-emulation/gnuboy/gnuboy-1.0.3.ebuild,v 1.10 2006/01/09 23:28:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/gnuboy/gnuboy-1.0.3.ebuild,v 1.11 2006/02/10 19:39:07 wolf31o2 Exp $
 
 inherit games
 
@@ -13,10 +13,20 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="X fbcon sdl svga"
 
-DEPEND="X? ( virtual/x11 )
-	sdl? ( media-libs/libsdl )
+RDEPEND="sdl? ( media-libs/libsdl )
+	     !X? ( !svga? ( !fbcon? ( media-libs/libsdl ) ) )
+		 X? (
+		 	|| (
+				x11-libs/libXext
+				virtual/x11 ) )"
+DEPEND="${RDEPEND}
 	svga? ( media-libs/svgalib )
-	!X? ( !svga? ( !fbcon? ( media-libs/libsdl ) ) )"
+	X? (
+		|| (
+			(
+				x11-proto/xextproto
+		      	x11-proto/xproto )
+			virtual/x11 ) )"
 
 src_compile() {
 	local myconf