Add modular depends

Package-Manager: portage-2.1_pre3-r1

6 files changed, 65 insertions, 17 deletions

diff --git a/games-arcade/ppracer/ChangeLog b/games-arcade/ppracer/ChangeLog
index 3785e09604b3..5bcb8d8aee15 100644
--- a/games-arcade/ppracer/ChangeLog
+++ b/games-arcade/ppracer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-arcade/ppracer
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/ppracer/ChangeLog,v 1.13 2006/01/09 23:14:22 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/ppracer/ChangeLog,v 1.14 2006/01/13 22:07:01 genstef Exp $
+
+  13 Jan 2006; Stefan Schweizer <genstef@gentoo.org> ppracer-0.3.1.ebuild:
+  Add modular depends
+
+  13 Jan 2006; Stefan Schweizer <genstef@gentoo.org> ppracer-0.3.1.ebuild:
+  Add modular depends
 
   09 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> ppracer-0.3.1.ebuild:
   Added eutils to inherit line and moved games to the end of the line.
diff --git a/games-arcade/ppracer/ppracer-0.3.1.ebuild b/games-arcade/ppracer/ppracer-0.3.1.ebuild
index d1f5bf2685cb..fc7e8ec87cd8 100644
--- a/games-arcade/ppracer/ppracer-0.3.1.ebuild
+++ b/games-arcade/ppracer/ppracer-0.3.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/ppracer/ppracer-0.3.1.ebuild,v 1.7 2006/01/09 23:14:22 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/ppracer/ppracer-0.3.1.ebuild,v 1.8 2006/01/13 22:07:01 genstef Exp $
 
-inherit flag-o-matic gnuconfig eutils multilib games
+inherit flag-o-matic gnuconfig games multilib
 
 DESCRIPTION="take on the role of Tux, the Linux Penguin, as he races down steep, snow-covered mountains"
 HOMEPAGE="http://developer.berlios.de/projects/ppracer/"
@@ -15,7 +15,13 @@ IUSE="X"
 
 DEPEND="virtual/opengl
 	virtual/glu
-	X? ( virtual/x11 )
+	X? (
+		|| (
+			( x11-libs/libXt
+			media-libs/mesa )
+			virtual/x11
+		)
+	)
 	>=dev-lang/tcl-8.4
 	media-libs/libsdl
 	media-libs/sdl-mixer
@@ -23,6 +29,17 @@ DEPEND="virtual/opengl
 	>=media-libs/freetype-2
 	sys-libs/zlib"
 
+RDEPEND="${DEPEND}
+	|| (
+		( x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXmu )
+		virtual/x11
+	)"
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
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