summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2009-08-24 06:53:20 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2009-08-24 06:53:20 +0000
commit8badc3fbd9be75a74a627554678f916f6ed223f6 (patch)
treeb465d678550b0ea2cea2ffbd21c378a6ecfebdf9 /games-action
parentversion bump (bug #167339) (diff)
downloadgentoo-2-8badc3fbd9be75a74a627554678f916f6ed223f6.tar.gz
gentoo-2-8badc3fbd9be75a74a627554678f916f6ed223f6.tar.bz2
gentoo-2-8badc3fbd9be75a74a627554678f916f6ed223f6.zip
avoid collision with descent1-demodata
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'games-action')
-rw-r--r--games-action/d1x-rebirth/d1x-rebirth-0.55.1.ebuild5
1 files changed, 3 insertions, 2 deletions
diff --git a/games-action/d1x-rebirth/d1x-rebirth-0.55.1.ebuild b/games-action/d1x-rebirth/d1x-rebirth-0.55.1.ebuild
index 6be60b443a22..917147f1ecad 100644
--- a/games-action/d1x-rebirth/d1x-rebirth-0.55.1.ebuild
+++ b/games-action/d1x-rebirth/d1x-rebirth-0.55.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/d1x-rebirth/d1x-rebirth-0.55.1.ebuild,v 1.1 2009/08/24 06:46:41 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/d1x-rebirth/d1x-rebirth-0.55.1.ebuild,v 1.2 2009/08/24 06:53:20 mr_bones_ Exp $
EAPI=2
inherit eutils games
@@ -24,7 +24,8 @@ RDEPEND="virtual/opengl
virtual/glu
dev-games/physfs[hog,zip]
media-libs/libsdl
- media-libs/sdl-mixer[timidity?]"
+ media-libs/sdl-mixer[timidity?]
+ cdinstall? ( !games-action/descent1-demodata )"
DEPEND="${RDEPEND}
app-arch/unzip
dev-util/scons"