summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Gianelloni <wolf31o2@gentoo.org>2006-06-27 19:54:48 +0000
committerChris Gianelloni <wolf31o2@gentoo.org>2006-06-27 19:54:48 +0000
commit0c40bf8926c48d0f89234bb0620010370abc2368 (patch)
treea988a5326640c14e481c67cf5b440b57dcd2f52d /games-fps/quake1-data/quake1-data-2.40.ebuild
parentStable on hppa (diff)
downloadgentoo-2-0c40bf8926c48d0f89234bb0620010370abc2368.tar.gz
gentoo-2-0c40bf8926c48d0f89234bb0620010370abc2368.tar.bz2
gentoo-2-0c40bf8926c48d0f89234bb0620010370abc2368.zip
Added check for quake1-demodata to make sure we don't have a file collision. Closing bug #137497.
(Portage version: 2.1.1_pre1-r2)
Diffstat (limited to 'games-fps/quake1-data/quake1-data-2.40.ebuild')
-rw-r--r--games-fps/quake1-data/quake1-data-2.40.ebuild8
1 files changed, 7 insertions, 1 deletions
diff --git a/games-fps/quake1-data/quake1-data-2.40.ebuild b/games-fps/quake1-data/quake1-data-2.40.ebuild
index 800790d58b02..9d641ebaddda 100644
--- a/games-fps/quake1-data/quake1-data-2.40.ebuild
+++ b/games-fps/quake1-data/quake1-data-2.40.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/games-fps/quake1-data/quake1-data-2.40.ebuild,v 1.7 2006/04/13 21:05:47 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1-data/quake1-data-2.40.ebuild,v 1.8 2006/06/27 19:54:48 wolf31o2 Exp $
inherit eutils games
@@ -20,6 +20,12 @@ S=${WORKDIR}
pkg_setup() {
games_pkg_setup
+
+ if built_with_use "games-fps/quake1-demodata" symlink ; then
+ eerror "The symlink for the demo data conflicts with the cdinstall data"
+ die "Unmerge games-fps/quake1-demodata to remove the conflict"
+ fi
+
export CDROM_SET_NAMES=("Existing Install" "Quake CD" "Ultimate Quake Collection")
cdrom_get_cds id1:q101_int.1:Setup/ID1
}