fix DEPEND #46618

3 files changed, 8 insertions, 58 deletions

diff --git a/games-arcade/rocksndiamonds/files/digest-rocksndiamonds-3.0.6 b/games-arcade/rocksndiamonds/files/digest-rocksndiamonds-3.0.6
deleted file mode 100644
index c03d31faa576..000000000000
--- a/games-arcade/rocksndiamonds/files/digest-rocksndiamonds-3.0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f848f40b91a0128b8022c4fb91154a5f rocksndiamonds-3.0.6.tar.gz 6843282
diff --git a/games-arcade/rocksndiamonds/rocksndiamonds-3.0.6.ebuild b/games-arcade/rocksndiamonds/rocksndiamonds-3.0.6.ebuild
deleted file mode 100644
index 55494078f514..000000000000
--- a/games-arcade/rocksndiamonds/rocksndiamonds-3.0.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/rocksndiamonds-3.0.6.ebuild,v 1.8 2004/04/02 22:44:05 mr_bones_ Exp $
-
-inherit flag-o-matic games
-
-DESCRIPTION="A Boulderdash clone"
-HOMEPAGE="http://www.artsoft.org/rocksndiamonds/"
-SRC_URI="http://www.artsoft.org/RELEASES/unix/rocksndiamonds/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc amd64"
-IUSE="X sdl"
-
-DEPEND="virtual/glibc
-		X? ( virtual/x11 )
-	|| (
-		sdl? ( >=media-libs/libsdl-1.2.3
-			>=media-libs/sdl-mixer-1.2.4
-			>=media-libs/sdl-image-1.2.2 )
-		virtual/x11 )"
-
-src_compile() {
-	replace-flags -march=k6 -march=i586
-
-	local makeopts="RO_GAME_DIR=${GAMES_DATADIR}/${PN} RW_GAME_DIR=${GAMES_STATEDIR}/${PN}"
-	if use X || { ! use X && ! use sdl; } ; then
-		make clean || die
-		make ${makeopts} OPTIONS="${CFLAGS}" x11 || die
-		mv rocksndiamonds{,.x11}
-	fi
-	if use sdl ; then
-		make clean || die
-		make ${makeopts} OPTIONS="${CFLAGS}" sdl || die
-		mv rocksndiamonds{,.sdl}
-	fi
-}
-
-src_install() {
-	dogamesbin rocksndiamonds.{sdl,x11} || die
-	dodir ${GAMES_DATADIR}/${PN}
-	cp -R graphics levels music sounds ${D}/${GAMES_DATADIR}/${PN}/
-
-	newman rocksndiamonds.{1,6}
-	dodoc CHANGES CREDITS HARDWARE README TODO docs/elements/*.txt
-
-	prepgamesdirs
-}
diff --git a/games-arcade/rocksndiamonds/rocksndiamonds-3.0.8.ebuild b/games-arcade/rocksndiamonds/rocksndiamonds-3.0.8.ebuild
index de8202d9723b..2fc345044e0c 100644
--- a/games-arcade/rocksndiamonds/rocksndiamonds-3.0.8.ebuild
+++ b/games-arcade/rocksndiamonds/rocksndiamonds-3.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/rocksndiamonds-3.0.8.ebuild,v 1.1 2004/04/02 23:49:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/rocksndiamonds/rocksndiamonds-3.0.8.ebuild,v 1.2 2004/04/05 22:19:11 vapier Exp $
 
 inherit flag-o-matic games
 
@@ -16,12 +16,11 @@ KEYWORDS="x86 ppc amd64"
 IUSE="X sdl"
 
 DEPEND="virtual/glibc
-		X? ( virtual/x11 )
-	|| (
-		sdl? ( >=media-libs/libsdl-1.2.3
-			>=media-libs/sdl-mixer-1.2.4
-			>=media-libs/sdl-image-1.2.2 )
-		virtual/x11 )"
+	X? ( virtual/x11 )
+	!sdl? ( virtual/x11 )
+	sdl? ( >=media-libs/libsdl-1.2.3
+		>=media-libs/sdl-mixer-1.2.4
+		>=media-libs/sdl-image-1.2.2 )"
 
 src_unpack() {
 	unpack ${P}.tar.gz
@@ -29,8 +28,9 @@ src_unpack() {
 	unpack rnd_jue-v5.zip
 	unpack BD2K3-1.0.0.zip
 }
+
 src_compile() {
-	replace-flags -march=k6 -march=i586
+	replace-cpu-flags i586 k6 k6-1 k6-2
 
 	local makeopts="RO_GAME_DIR=${GAMES_DATADIR}/${PN} RW_GAME_DIR=${GAMES_STATEDIR}/${PN}"
 	if use X || { ! use X && ! use sdl; } ; then