summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Gianelloni <wolf31o2@gentoo.org>2006-01-25 03:00:55 +0000
committerChris Gianelloni <wolf31o2@gentoo.org>2006-01-25 03:00:55 +0000
commitacf50371fe88e7d20ea1b83a8c70ac6924fd3843 (patch)
treeab0862603259436510e6477aca0214419c3eaac5 /games-action
parentFix deps, reported by leonardop. (diff)
downloadgentoo-2-acf50371fe88e7d20ea1b83a8c70ac6924fd3843.tar.gz
gentoo-2-acf50371fe88e7d20ea1b83a8c70ac6924fd3843.tar.bz2
gentoo-2-acf50371fe88e7d20ea1b83a8c70ac6924fd3843.zip
Added modular X and closing bug #119986.
(Portage version: 2.1_pre3-r1)
Diffstat (limited to 'games-action')
-rw-r--r--games-action/xpilot-ng/ChangeLog8
-rw-r--r--games-action/xpilot-ng/xpilot-ng-4.6.6.ebuild18
-rw-r--r--games-action/xpilot/ChangeLog7
-rw-r--r--games-action/xpilot/xpilot-4.5.4.ebuild17
4 files changed, 40 insertions, 10 deletions
diff --git a/games-action/xpilot-ng/ChangeLog b/games-action/xpilot-ng/ChangeLog
index 93bb2923778a..42963c013f2a 100644
--- a/games-action/xpilot-ng/ChangeLog
+++ b/games-action/xpilot-ng/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-action/xpilot-ng
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/xpilot-ng/ChangeLog,v 1.3 2004/10/18 12:33:34 dholm Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/xpilot-ng/ChangeLog,v 1.4 2006/01/25 03:00:55 wolf31o2 Exp $
+
+ 25 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+ xpilot-ng-4.6.6.ebuild:
+ Added modular X and closing bug #119986.
18 Oct 2004; David Holm <dholm@gentoo.org> xpilot-ng-4.6.6.ebuild:
Added to ~ppc.
diff --git a/games-action/xpilot-ng/xpilot-ng-4.6.6.ebuild b/games-action/xpilot-ng/xpilot-ng-4.6.6.ebuild
index db1325a34de5..a5f63cf12072 100644
--- a/games-action/xpilot-ng/xpilot-ng-4.6.6.ebuild
+++ b/games-action/xpilot-ng/xpilot-ng-4.6.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/xpilot-ng/xpilot-ng-4.6.6.ebuild,v 1.2 2004/10/18 12:33:34 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/xpilot-ng/xpilot-ng-4.6.6.ebuild,v 1.3 2006/01/25 03:00:55 wolf31o2 Exp $
inherit games
@@ -13,7 +13,12 @@ SLOT="0"
KEYWORDS="~x86 ~amd64 ~ppc"
IUSE="openal sdl"
-DEPEND="virtual/x11
+RDEPEND="|| (
+ (
+ x11-libs/libX11
+ x11-libs/libICE
+ x11-libs/libSM )
+ virtual/x11 )
>=dev-libs/expat-1.1
>=sys-libs/zlib-1.1.3
openal? ( media-libs/openal )
@@ -22,6 +27,13 @@ DEPEND="virtual/x11
>=media-libs/libsdl-1.2.0
>=media-libs/sdl-image-1.0
>=media-libs/sdl-ttf-2.0 )"
+DEPEND="${RDEPEND}
+ || (
+ (
+ x11-proto/xextproto
+ x11-proto/xproto
+ x11-libs/libXt )
+ virtual/x11 )"
src_compile() {
egamesconf \
diff --git a/games-action/xpilot/ChangeLog b/games-action/xpilot/ChangeLog
index b12a08f85282..70a5f4b1308a 100644
--- a/games-action/xpilot/ChangeLog
+++ b/games-action/xpilot/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for games-action/xpilot
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/xpilot/ChangeLog,v 1.8 2005/05/31 09:21:49 cryos Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/xpilot/ChangeLog,v 1.9 2006/01/25 02:59:15 wolf31o2 Exp $
+
+ 25 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> xpilot-4.5.4.ebuild:
+ Added modular X and closing bug #119986.
31 May 2005; Marcus D. Hanwell <marcus@gentoo.org> xpilot-4.5.4.ebuild:
Stable on amd64.
diff --git a/games-action/xpilot/xpilot-4.5.4.ebuild b/games-action/xpilot/xpilot-4.5.4.ebuild
index a4c6b726326a..7f39c24a35c3 100644
--- a/games-action/xpilot/xpilot-4.5.4.ebuild
+++ b/games-action/xpilot/xpilot-4.5.4.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-action/xpilot/xpilot-4.5.4.ebuild,v 1.8 2005/05/31 09:21:49 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/xpilot/xpilot-4.5.4.ebuild,v 1.9 2006/01/25 02:59:15 wolf31o2 Exp $
DESCRIPTION="A multi-player 2D client/server space game"
HOMEPAGE="http://www.xpilot.org/"
@@ -11,7 +11,18 @@ SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE=""
-DEPEND="virtual/x11"
+RDEPEND="|| (
+ (
+ x11-libs/libX11
+ x11-libs/libXext )
+ virtual/x11 )"
+DEPEND="${RDEPEND}
+ || (
+ (
+ x11-proto/xextproto
+ x11-proto/xproto
+ x11-misc/gccmakedep )
+ virtual/x11 )"
src_unpack() {
unpack ${A}