Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 137497 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/portage/games-fps/quake1-data/quake1-data-2.40.ebuild (-4 / +5 lines)
Lines 1-6 Link Here
1
# Copyright 1999-2006 Gentoo Foundation
1
# Copyright 1999-2006 Gentoo Foundation
2
# Distributed under the terms of the GNU General Public License v2
2
# Distributed under the terms of the GNU General Public License v2
3
# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1-data/quake1-data-2.40.ebuild,v 1.9 2006/07/05 01:18:10 vapier Exp $
4
3
5
inherit eutils games
4
inherit eutils games
6
5
Lines 21-29 Link Here
21
pkg_setup() {
20
pkg_setup() {
22
	games_pkg_setup
21
	games_pkg_setup
23
22
24
	if built_with_use "games-fps/quake1-demodata" symlink ; then
23
	if has_version "games-fps/quake1-demodata" ; then
25
		eerror "The symlink for the demo data conflicts with the cdinstall data"
24
		if built_with_use "games-fps/quake1-demodata" symlink ; then
26
		die "Unmerge games-fps/quake1-demodata to remove the conflict"
25
			eerror "The symlink for the demo data conflicts with the cdinstall data"
26
			die "Unmerge games-fps/quake1-demodata to remove the conflict"
27
		fi
27
	fi
28
	fi
28
29
29
	export CDROM_NAME_SET=("Existing Install" "Quake CD" "Ultimate Quake Collection")
30
	export CDROM_NAME_SET=("Existing Install" "Quake CD" "Ultimate Quake Collection")

Return to bug 137497