diff options
| -rw-r--r-- | games-fps/quake1-data/ChangeLog | 7 | ||||
| -rw-r--r-- | games-fps/quake1-data/files/digest-quake1-data-2.40 | 1 | ||||
| -rw-r--r-- | games-fps/quake1-data/quake1-data-2.40.ebuild | 8 |
3 files changed, 14 insertions, 2 deletions
diff --git a/games-fps/quake1-data/ChangeLog b/games-fps/quake1-data/ChangeLog index 49c7932c7e27..b8a10082566d 100644 --- a/games-fps/quake1-data/ChangeLog +++ b/games-fps/quake1-data/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-fps/quake1-data # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1-data/ChangeLog,v 1.4 2006/04/13 21:05:45 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1-data/ChangeLog,v 1.5 2006/06/27 19:54:48 wolf31o2 Exp $ + + 27 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> + quake1-data-2.40.ebuild: + Added check for quake1-demodata to make sure we don't have a file collision. + Closing bug #137497. 13 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org> quake1-data-2.40.ebuild: diff --git a/games-fps/quake1-data/files/digest-quake1-data-2.40 b/games-fps/quake1-data/files/digest-quake1-data-2.40 index e69de29bb2d1..8b137891791f 100644 --- a/games-fps/quake1-data/files/digest-quake1-data-2.40 +++ b/games-fps/quake1-data/files/digest-quake1-data-2.40 @@ -0,0 +1 @@ + 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 } |