Clean up existing modular X depedencies a bit. Add modular X dependencies for

older version (bug #120897).
(Portage version: 2.1_pre4-r1)

3 files changed, 25 insertions, 8 deletions

diff --git a/dev-games/clanlib/ChangeLog b/dev-games/clanlib/ChangeLog
index 6030cc29405d..d6bd75c99027 100644
--- a/dev-games/clanlib/ChangeLog
+++ b/dev-games/clanlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-games/clanlib
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.27 2006/01/14 04:53:16 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.28 2006/02/11 16:57:21 joshuabaergen Exp $
+
+  11 Feb 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  clanlib-0.6.5-r3.ebuild, clanlib-0.7.8-r1.ebuild:
+  Clean up existing modular X depedencies a bit.  Add modular X dependencies for
+  older version (bug #120897).
 
   14 Jan 2006; Mark Loeser <halcy0n@gentoo.org>
   +files/clanlib-0.6.5-gcc41.patch, +files/clanlib-0.7.8-gcc41.patch,
diff --git a/dev-games/clanlib/clanlib-0.6.5-r3.ebuild b/dev-games/clanlib/clanlib-0.6.5-r3.ebuild
index 535345f308c1..56b8b90d387b 100644
--- a/dev-games/clanlib/clanlib-0.6.5-r3.ebuild
+++ b/dev-games/clanlib/clanlib-0.6.5-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/dev-games/clanlib/clanlib-0.6.5-r3.ebuild,v 1.5 2006/01/14 04:53:16 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.6.5-r3.ebuild,v 1.6 2006/02/11 16:57:21 joshuabaergen Exp $
 
 inherit eutils flag-o-matic
 
@@ -14,13 +14,28 @@ KEYWORDS="amd64 x86" #not big endian safe #82779
 IUSE="arts oss esd alsa png opengl truetype X vorbis mikmod jpeg directfb joystick"
 
 DEPEND=">=media-libs/hermes-1.3.2
-	X? ( virtual/x11 )
+	X? (
+		|| (
+			( media-libs/mesa
+			x11-libs/libXt
+			x11-proto/inputproto
+			x11-proto/xf86vidmodeproto )
+			virtual/x11
+		)
+	)
 	png? ( media-libs/libpng )
 	jpeg? ( >=media-libs/jpeg-6b )
 	mikmod? ( >=media-libs/libmikmod-3.1.9 )
 	truetype? ( >=media-libs/freetype-2.0 )
 	directfb? ( dev-libs/DirectFB )
 	vorbis? ( media-libs/libvorbis )"
+RDEPEND="${DEPEND}
+	|| (
+		( media-libs/mesa
+		x11-libs/libXmu
+		x11-libs/libXxf86vm )
+		virtual/x11
+	)"
 
 S=${WORKDIR}/ClanLib-${PV}
 
diff --git a/dev-games/clanlib/clanlib-0.7.8-r1.ebuild b/dev-games/clanlib/clanlib-0.7.8-r1.ebuild
index 3bbdac09afb0..521bbbf876ca 100644
--- a/dev-games/clanlib/clanlib-0.7.8-r1.ebuild
+++ b/dev-games/clanlib/clanlib-0.7.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/dev-games/clanlib/clanlib-0.7.8-r1.ebuild,v 1.8 2006/01/14 04:53:16 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.7.8-r1.ebuild,v 1.9 2006/02/11 16:57:21 joshuabaergen Exp $
 
 inherit flag-o-matic eutils
 
@@ -22,11 +22,9 @@ DEPEND="virtual/libc
 	X? (
 		|| (
 			( media-libs/mesa
-			x11-libs/libX11
 			x11-libs/libXt
 			x11-proto/inputproto
-			x11-proto/xf86vidmodeproto
-			x11-proto/xproto )
+			x11-proto/xf86vidmodeproto )
 			virtual/x11
 		)
 	)
@@ -35,7 +33,6 @@ DEPEND="virtual/libc
 RDEPEND="${DEPEND}
 	|| (
 		( media-libs/mesa
-		x11-libs/libX11
 		x11-libs/libXmu
 		x11-libs/libXxf86vm )
 		virtual/x11