diff options
author | 2005-09-22 23:45:23 +0000 | |
---|---|---|
committer | 2005-09-22 23:45:23 +0000 | |
commit | 5bb0325af6d684342576adaffce9628eb6ab809b (patch) | |
tree | 215aab335e52dec4d5d9ac06152cd90d0359893b /games-arcade | |
parent | Added missing ant-core to dependencies. Fixes bug #106929. (diff) | |
download | gentoo-2-5bb0325af6d684342576adaffce9628eb6ab809b.tar.gz gentoo-2-5bb0325af6d684342576adaffce9628eb6ab809b.tar.bz2 gentoo-2-5bb0325af6d684342576adaffce9628eb6ab809b.zip |
fix case where USE="-X sdl"
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'games-arcade')
-rw-r--r-- | games-arcade/rocksndiamonds/ChangeLog | 6 | ||||
-rw-r--r-- | games-arcade/rocksndiamonds/rocksndiamonds-3.1.1.ebuild | 13 |
2 files changed, 11 insertions, 8 deletions
diff --git a/games-arcade/rocksndiamonds/ChangeLog b/games-arcade/rocksndiamonds/ChangeLog index c5ae64f0648d..7f686f2aaa0f 100644 --- a/games-arcade/rocksndiamonds/ChangeLog +++ b/games-arcade/rocksndiamonds/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-arcade/rocksndiamonds # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/ChangeLog,v 1.16 2005/08/24 05:11:21 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/ChangeLog,v 1.17 2005/09/22 23:45:23 mr_bones_ Exp $ + + 22 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org> + rocksndiamonds-3.1.1.ebuild: + fix case where USE="-X sdl" *rocksndiamonds-3.1.1 (24 Aug 2005) diff --git a/games-arcade/rocksndiamonds/rocksndiamonds-3.1.1.ebuild b/games-arcade/rocksndiamonds/rocksndiamonds-3.1.1.ebuild index dba35e2df304..e5deefa75ae1 100644 --- a/games-arcade/rocksndiamonds/rocksndiamonds-3.1.1.ebuild +++ b/games-arcade/rocksndiamonds/rocksndiamonds-3.1.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/rocksndiamonds-3.1.1.ebuild,v 1.1 2005/08/24 05:11:21 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/rocksndiamonds-3.1.1.ebuild,v 1.2 2005/09/22 23:45:23 mr_bones_ Exp $ inherit flag-o-matic eutils games @@ -17,19 +17,16 @@ SRC_URI="http://www.artsoft.org/RELEASES/unix/rocksndiamonds/${P}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="x86 ppc amd64" +KEYWORDS="amd64 ppc x86" IUSE="X sdl" -RDEPEND="virtual/libc - app-arch/unzip +DEPEND="app-arch/unzip X? ( virtual/x11 ) !sdl? ( virtual/x11 ) sdl? ( >=media-libs/libsdl-1.2.3 >=media-libs/sdl-mixer-1.2.4 media-libs/sdl-net >=media-libs/sdl-image-1.2.2 )" -DEPEND="${RDEPEND} - >=sys-apps/sed-4" src_unpack() { unpack ${P}.tar.gz @@ -71,7 +68,9 @@ src_compile() { } src_install() { - dogamesbin rocksndiamonds.x11 || die "dogamesbin failed" + if use X || { ! use X && ! use sdl; } ; then + dogamesbin rocksndiamonds.x11 || die "dogamesbin failed" + fi if use sdl ; then dogamesbin rocksndiamonds.sdl || die "dogamesbin failed" dosym rocksndiamonds.sdl "${GAMES_BINDIR}/rocksndiamonds" |