Add modular depends

(Portage version: 2.1_pre3-r1)

8 files changed, 76 insertions, 24 deletions

diff --git a/dev-games/clanlib/ChangeLog b/dev-games/clanlib/ChangeLog
index 41ef6415b79a..9114bab757b5 100644
--- a/dev-games/clanlib/ChangeLog
+++ b/dev-games/clanlib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/clanlib
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.25 2005/03/02 02:33:55 vapier Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.26 2006/01/13 22:00:39 genstef Exp $
+
+  13 Jan 2006; Stefan Schweizer <genstef@gentoo.org>
+  clanlib-0.7.8-r1.ebuild:
+  Add modular depends
 
 *clanlib-0.6.5-r3 (01 Mar 2005)
 
diff --git a/dev-games/clanlib/clanlib-0.7.8-r1.ebuild b/dev-games/clanlib/clanlib-0.7.8-r1.ebuild
index f2d7f0c6ec32..71824d0282ef 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-2005 Gentoo Foundation
+# 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.6 2005/05/28 09:18:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.7.8-r1.ebuild,v 1.7 2006/01/13 22:00:39 genstef Exp $
 
 inherit flag-o-matic eutils
 
@@ -16,11 +16,30 @@ IUSE="opengl X sdl vorbis doc mikmod clanVoice clanJavaScript ipv6"
 DEPEND="virtual/libc
 	media-libs/libpng
 	media-libs/jpeg
+	media-libs/freetype
 	opengl? ( virtual/opengl )
 	sdl? ( media-libs/libsdl )
-	X? ( virtual/x11 )
+	X? (
+		|| (
+			( media-libs/mesa
+			x11-libs/libX11
+			x11-libs/libXt
+			x11-proto/inputproto
+			x11-proto/xf86vidmodeproto
+			x11-proto/xproto )
+			virtual/x11
+		)
+	)
 	mikmod? ( >=media-libs/libmikmod-3.1.9 )
 	vorbis? ( media-libs/libvorbis )"
+RDEPEND="${DEPEND}
+	|| (
+		( media-libs/mesa
+		x11-libs/libX11
+		x11-libs/libXmu
+		x11-libs/libXxf86vm )
+		virtual/x11
+	)"
 
 S="${WORKDIR}/ClanLib-${PV}"
 
diff --git a/games-arcade/supertux/ChangeLog b/games-arcade/supertux/ChangeLog
index 5b93eb99d290..6781652a43c2 100644
--- a/games-arcade/supertux/ChangeLog
+++ b/games-arcade/supertux/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-arcade/supertux
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/supertux/ChangeLog,v 1.22 2005/10/20 16:48:55 mr_bones_ Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/supertux/ChangeLog,v 1.23 2006/01/13 22:02:32 genstef Exp $
+
+  13 Jan 2006; Stefan Schweizer <genstef@gentoo.org> supertux-0.1.3.ebuild:
+  Add modular depends
 
   20 Oct 2005; Michael Sterrett <mr_bones_@gentoo.org>
   -supertux-0.1.2.ebuild, supertux-0.1.3.ebuild:
diff --git a/games-arcade/supertux/supertux-0.1.3.ebuild b/games-arcade/supertux/supertux-0.1.3.ebuild
index 0833778c60d1..563428f391a7 100644
--- a/games-arcade/supertux/supertux-0.1.3.ebuild
+++ b/games-arcade/supertux/supertux-0.1.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-arcade/supertux/supertux-0.1.3.ebuild,v 1.2 2005/10/20 16:48:55 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/supertux/supertux-0.1.3.ebuild,v 1.3 2006/01/13 22:02:32 genstef Exp $
 
 GAMES_USE_SDL="nojoystick" #bug #100372
 inherit eutils games
@@ -14,11 +14,12 @@ SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 IUSE="opengl"
 
-DEPEND="virtual/opengl
-	virtual/x11
-	>=media-libs/libsdl-1.2.4
+RDEPEND=">=media-libs/libsdl-1.2.4
 	>=media-libs/sdl-image-1.2.2
-	>=media-libs/sdl-mixer-1.2.5"
+	>=media-libs/sdl-mixer-1.2.5
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	|| ( x11-libs/libXt virtual/x11 )"
 
 pkg_setup() {
 	if ! built_with_use media-libs/sdl-mixer mikmod ; then
diff --git a/games-arcade/xjump/ChangeLog b/games-arcade/xjump/ChangeLog
index 95dbd9b583e9..978a33ff30b1 100644
--- a/games-arcade/xjump/ChangeLog
+++ b/games-arcade/xjump/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-arcade/xjump
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/xjump/ChangeLog,v 1.4 2005/12/17 15:46:12 metalgod Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/xjump/ChangeLog,v 1.5 2006/01/13 22:01:57 genstef Exp $
+
+  13 Jan 2006; Stefan Schweizer <genstef@gentoo.org> xjump-2.7.5.ebuild:
+  Add modular depends
 
   17 Dec 2005; Luis Medinas <metalgod@gentoo.org> xjump-2.7.5.ebuild:
   Added ~amd64 keyword. Closes bug #115373.
diff --git a/games-arcade/xjump/xjump-2.7.5.ebuild b/games-arcade/xjump/xjump-2.7.5.ebuild
index 8b65025cf752..ca62c9debd52 100644
--- a/games-arcade/xjump/xjump-2.7.5.ebuild
+++ b/games-arcade/xjump/xjump-2.7.5.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-arcade/xjump/xjump-2.7.5.ebuild,v 1.4 2005/12/17 15:46:12 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/xjump/xjump-2.7.5.ebuild,v 1.5 2006/01/13 22:01:57 genstef Exp $
 
 inherit eutils games
 
@@ -15,7 +15,25 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
-DEPEND="virtual/x11"
+DEPEND="|| (
+		( x11-libs/libX11
+		x11-libs/libXaw
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-proto/xproto )
+		virtual/x11
+	)"
+
+RDEPEND="|| ( 
+		( x11-libs/libX11
+		x11-libs/libXaw
+		x11-libs/libXext
+		x11-libs/libXmu
+		x11-libs/libXpm
+		x11-libs/libXt )
+		virtual/x11
+	)"
+
 
 S=${WORKDIR}/${P}.orig
 
diff --git a/games-engines/stratagus/ChangeLog b/games-engines/stratagus/ChangeLog
index 38e872815875..1bd3c29f7519 100644
--- a/games-engines/stratagus/ChangeLog
+++ b/games-engines/stratagus/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-engines/stratagus
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/ChangeLog,v 1.5 2005/09/24 06:34:50 mr_bones_ Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/ChangeLog,v 1.6 2006/01/13 21:59:23 genstef Exp $
+
+  13 Jan 2006; Stefan Schweizer <genstef@gentoo.org> stratagus-2.1.ebuild:
+  Add modular depends
 
   24 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org> stratagus-2.1.ebuild:
   only turn on oggvorbis support if both the ogg and vorbis use flags are set
diff --git a/games-engines/stratagus/stratagus-2.1.ebuild b/games-engines/stratagus/stratagus-2.1.ebuild
index 0f62d5493c0e..4a6ddeaffc6e 100644
--- a/games-engines/stratagus/stratagus-2.1.ebuild
+++ b/games-engines/stratagus/stratagus-2.1.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-engines/stratagus/stratagus-2.1.ebuild,v 1.10 2005/09/24 06:34:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/stratagus-2.1.ebuild,v 1.11 2006/01/13 21:59:23 genstef Exp $
 
 inherit games
 
@@ -14,8 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug doc flac mp3 mikmod ogg opengl vorbis"
 
-RDEPEND="virtual/x11
-	app-arch/bzip2
+RDEPEND="app-arch/bzip2
 	dev-lang/lua
 	media-libs/libpng
 	media-libs/libsdl
@@ -24,7 +23,9 @@ RDEPEND="virtual/x11
 	mp3? ( media-libs/libmad )
 	mikmod? ( media-libs/libmikmod )
 	ogg? ( vorbis? ( media-libs/libogg media-libs/libvorbis ) )"
+
 DEPEND="${RDEPEND}
+	|| ( x11-libs/libXt virtual/x11 )
 	doc? ( app-doc/doxygen )"
 
 S=${WORKDIR}/stratagus-${MY_PV}