diff options
| author |   Tristan Heaven <nyhm@gentoo.org> | 2007-06-10 14:58:56 +0000 |
|---|---|---|
| committer | Tristan Heaven <nyhm@gentoo.org> | 2007-06-10 14:58:56 +0000 |
| commit | 9c4a68b8c8a81a3a5613389102dd5cd4bf52e1d5 (patch) | |
| tree | 1d5aa8b5e35a7fed038585965fd629c7632f4752 /games-board/ace | |
| parent | Block games-board/ace because they collide on /usr/games/bin/canfield (diff) | |
| download | gentoo-2-9c4a68b8c8a81a3a5613389102dd5cd4bf52e1d5.tar.gz gentoo-2-9c4a68b8c8a81a3a5613389102dd5cd4bf52e1d5.tar.bz2 gentoo-2-9c4a68b8c8a81a3a5613389102dd5cd4bf52e1d5.zip | |
Block games-misc/bsd-games because they collide on /usr/games/bin/canfield
(Portage version: 2.1.2.9)
Diffstat (limited to 'games-board/ace')
| -rw-r--r-- | games-board/ace/ChangeLog | 7 | ||||
| -rw-r--r-- | games-board/ace/ace-1.2-r1.ebuild | 8 |
2 files changed, 9 insertions, 6 deletions
diff --git a/games-board/ace/ChangeLog b/games-board/ace/ChangeLog index 570a7866c635..ee0c2078a9e7 100644 --- a/games-board/ace/ChangeLog +++ b/games-board/ace/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for games-board/ace -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ChangeLog,v 1.14 2006/12/01 20:51:58 wolf31o2 Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ChangeLog,v 1.15 2007/06/10 14:58:56 nyhm Exp $ + + 10 Jun 2007; Tristan Heaven <nyhm@gentoo.org> ace-1.2-r1.ebuild: + Block games-misc/bsd-games because they collide on /usr/games/bin/canfield 01 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> ace-1.2-r1.ebuild: Removing old virtual/x11 dependency. diff --git a/games-board/ace/ace-1.2-r1.ebuild b/games-board/ace/ace-1.2-r1.ebuild index 6139151bc48e..e928bce0dea3 100644 --- a/games-board/ace/ace-1.2-r1.ebuild +++ b/games-board/ace/ace-1.2-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ace-1.2-r1.ebuild,v 1.17 2006/12/01 20:51:58 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ace-1.2-r1.ebuild,v 1.18 2007/06/10 14:58:56 nyhm Exp $ inherit eutils games @@ -15,7 +15,7 @@ IUSE="" DEPEND="x11-libs/libXpm media-libs/libpng - sys-libs/zlib" + !games-misc/bsd-games" src_unpack() { unpack ${A} @@ -28,7 +28,7 @@ src_unpack() { } src_install() { - make DESTDIR="${D}" install || die "make install failed" + emake DESTDIR="${D}" install || die "emake install failed" dodoc AUTHORS ChangeLog NEWS README dohtml docs/* prepgamesdirs |