summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-08-05 22:54:25 +0000
committerMike Frysinger <vapier@gentoo.org>2006-08-05 22:54:25 +0000
commit9d514482653816326a619bcd771c5b6067dcca1d (patch)
tree4312ec61f46256c0a3568f5c374fff0e6333b8d4 /games-fps
parentStable on SPARC wrt bug #140718. (diff)
downloadgentoo-2-9d514482653816326a619bcd771c5b6067dcca1d.tar.gz
gentoo-2-9d514482653816326a619bcd771c5b6067dcca1d.tar.bz2
gentoo-2-9d514482653816326a619bcd771c5b6067dcca1d.zip
make sure games-fps/quake2-demodata is installed before checking its USE flags #139693
(Portage version: 2.1.1_pre4)
Diffstat (limited to 'games-fps')
-rw-r--r--games-fps/quake2-data/quake2-data-3.20.ebuild5
1 files changed, 3 insertions, 2 deletions
diff --git a/games-fps/quake2-data/quake2-data-3.20.ebuild b/games-fps/quake2-data/quake2-data-3.20.ebuild
index 93065bbeb4bd..49b4b452b833 100644
--- a/games-fps/quake2-data/quake2-data-3.20.ebuild
+++ b/games-fps/quake2-data/quake2-data-3.20.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/quake2-data/quake2-data-3.20.ebuild,v 1.21 2006/07/05 01:17:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-data/quake2-data-3.20.ebuild,v 1.22 2006/08/05 22:54:25 vapier Exp $
inherit eutils games
@@ -21,7 +21,8 @@ S=${WORKDIR}
pkg_setup() {
games_pkg_setup
- if built_with_use "games-fps/quake2-demodata" symlink ; then
+ if has_version games-fps/quake2-demodata && \
+ built_with_use "games-fps/quake2-demodata" symlink ; then
eerror "The symlink for the demo data conflicts with the cdinstall data"
die "Unmerge games-fps/quake2-demodata to remove the conflict"
fi