diff options
| author |   Chris Gianelloni <wolf31o2@gentoo.org> | 2006-06-27 20:02:06 +0000 |
|---|---|---|
| committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2006-06-27 20:02:06 +0000 |
| commit | b2b784ec83e9b0fffc3f210ded29d83fb5753178 (patch) | |
| tree | b1c23318007861b05761b6ebbdfd8c8c6d7598e4 /games-fps/quake1-demodata | |
| parent | Stable on hppa (diff) | |
| download | gentoo-2-b2b784ec83e9b0fffc3f210ded29d83fb5753178.tar.gz gentoo-2-b2b784ec83e9b0fffc3f210ded29d83fb5753178.tar.bz2 gentoo-2-b2b784ec83e9b0fffc3f210ded29d83fb5753178.zip | |
Added a patch from Paul Bredbury <brebs@sent.com> to make sure we don't conflict with games-fps/quake1-data. Closing bug #137402.
(Portage version: 2.1.1_pre1-r2)
Diffstat (limited to 'games-fps/quake1-demodata')
| -rw-r--r-- | games-fps/quake1-demodata/ChangeLog | 7 | ||||
| -rw-r--r-- | games-fps/quake1-demodata/quake1-demodata-1.06.ebuild | 19 |
2 files changed, 23 insertions, 3 deletions
diff --git a/games-fps/quake1-demodata/ChangeLog b/games-fps/quake1-demodata/ChangeLog index 9bbeb77ba454..e91ba0cbe82a 100644 --- a/games-fps/quake1-demodata/ChangeLog +++ b/games-fps/quake1-demodata/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-fps/quake1-demodata # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1-demodata/ChangeLog,v 1.2 2006/06/19 20:46:07 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1-demodata/ChangeLog,v 1.3 2006/06/27 20:02:06 wolf31o2 Exp $ + + 27 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> + quake1-demodata-1.06.ebuild: + Added a patch from Paul Bredbury <brebs@sent.com> to make sure we don't + conflict with games-fps/quake1-data. Closing bug #137402. 19 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org> quake1-demodata-1.06.ebuild: diff --git a/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild b/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild index a6aee140c429..8ec7ae7d7011 100644 --- a/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild +++ b/games-fps/quake1-demodata/quake1-demodata-1.06.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-demodata/quake1-demodata-1.06.ebuild,v 1.2 2006/06/19 20:46:07 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild,v 1.3 2006/06/27 20:02:06 wolf31o2 Exp $ inherit eutils versionator games @@ -16,13 +16,28 @@ LICENSE="quake1-demodata" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="symlink" -RESTRICT="" DEPEND="app-arch/lha" S=${WORKDIR} dir=${GAMES_DATADIR}/${MY_PN}1 +pkg_setup() { + games_pkg_setup + + if has_version "games-fps/quake1-data" ; then + ewarn "games-fps/quake1-data already includes the demo data," + ewarn "so this installation is not very useful." + echo + if use symlink ; then + eerror "The symlink for the demo data conflicts with the cdinstall data" + die "Remove the 'symlink' USE flag for this package" + fi + ebeep + epause + fi +} + src_unpack() { unpack ${A} |