fix case where USE="-X sdl"

Package-Manager: portage-2.0.51.22-r2

diff --git a/games-arcade/rocksndiamonds/ChangeLog b/games-arcade/rocksndiamonds/ChangeLog
index c5ae64f0648dfc11993471082d3770b3b9eb880e..7f686f2aaa0f4836087cf86bfb9c95295fc0e0ba 100644 (file)
--- 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/Manifest b/games-arcade/rocksndiamonds/Manifest
index 4b1e41d31042aac3743ae32c6fc6084e3e48c885..949ea8297efddbbd5645f2f71c32865af4433205 100644 (file)
--- a/games-arcade/rocksndiamonds/Manifest
+++ b/games-arcade/rocksndiamonds/Manifest
@@ -1,6 +1,6 @@
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 6a1194d197310b7c78b96fefe218c348 rocksndiamonds-3.1.1.ebuild 2625
-MD5 3de51e1e7e5426b91b4d7c75ceb20597 ChangeLog 2794
+MD5 031c0b9f8a5add3260e73e63eb96d73a rocksndiamonds-3.1.1.ebuild 2623
+MD5 546e2452ce4bf05e9bbcfe5de162e98f ChangeLog 2911
 MD5 969bd9de8eeede0250ae898012d07044 rocksndiamonds-3.1.0.ebuild 2295
 MD5 c6c4112fb9e1975723b628b204dc8124 files/digest-rocksndiamonds-3.1.1 542
 MD5 c3a75fb03914146932611aebcb406266 files/digest-rocksndiamonds-3.1.0 476

diff --git a/games-arcade/rocksndiamonds/rocksndiamonds-3.1.1.ebuild b/games-arcade/rocksndiamonds/rocksndiamonds-3.1.1.ebuild
index dba35e2df3041bfe87c53aab74523355e8d568d4..e5deefa75ae19d31a20615dc09857cd7ada79eae 100644 (file)
--- 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"