sse fix #34084

5 files changed, 17 insertions, 103 deletions

diff --git a/games-emulation/mupen64/files/digest-mupen64-0.1 b/games-emulation/mupen64/files/digest-mupen64-0.1
deleted file mode 100644
index 1124e075af68..000000000000
--- a/games-emulation/mupen64/files/digest-mupen64-0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7dd7b836a4630eef07f863a691ec4895 mupen64_0.1_src.tgz 795936
diff --git a/games-emulation/mupen64/files/digest-mupen64-0.2 b/games-emulation/mupen64/files/digest-mupen64-0.2
deleted file mode 100644
index 57ee87a06ab5..000000000000
--- a/games-emulation/mupen64/files/digest-mupen64-0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 82bb8ee15a6c791d23a35dfb616541fa mupen64_src-0.2.tgz 937878
diff --git a/games-emulation/mupen64/mupen64-0.1.ebuild b/games-emulation/mupen64/mupen64-0.1.ebuild
deleted file mode 100644
index 30caea3667aa..000000000000
--- a/games-emulation/mupen64/mupen64-0.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/mupen64-0.1.ebuild,v 1.1 2003/09/09 16:26:50 vapier Exp $
-
-inherit games
-
-DESCRIPTION="A Nintendo 64 (N64) emulator"
-#SRC_URI="http://mupen64.emulation64.com/files/mupen64_${PV}.tgz"
-SRC_URI="mirror://gentoo/mupen64_${PV}_src.tgz"
-HOMEPAGE="http://mupen64.emulation64.com/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 -ppc -sparc"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	>=sys-apps/sed-4
-	media-libs/libsdl
-	virtual/glu
-	virtual/opengl"
-
-S=${WORKDIR}/emu64
-
-src_unpack() {
-	unpack ${A}
-	sed -i -e "/^CC.*/s:$: ${CFLAGS}:" ${S}/Makefile || die "sed failed"
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	local dir=${GAMES_LIBDIR}/${PN}
-	dodir ${dir}
-
-	cp -r mupen64* lang plugins save roms path.cfg ${D}/${dir}/
-	sed -e "s:GENTOO_DIR:${dir}:" \
-		${FILESDIR}/mupen64 > ${T}/mupen64
-	dogamesbin ${T}/mupen64
-
-	dodoc *.txt
-	dohtml index.htm
-
-	prepgamesdirs
-}
diff --git a/games-emulation/mupen64/mupen64-0.2.ebuild b/games-emulation/mupen64/mupen64-0.2.ebuild
deleted file mode 100644
index bbe91467e87d..000000000000
--- a/games-emulation/mupen64/mupen64-0.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/mupen64-0.2.ebuild,v 1.1 2003/09/09 16:26:50 vapier Exp $
-
-inherit games
-
-MY_P="${PN}_src-${PV}"
-S="${WORKDIR}/emu64"
-DESCRIPTION="A Nintendo 64 (N64) emulator"
-SRC_URI="http://mupen64.emulation64.com/files/src/${MY_P}.tgz"
-HOMEPAGE="http://mupen64.emulation64.com/"
-
-KEYWORDS="-* x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	>=sys-apps/sed-4
-	media-libs/libsdl
-	virtual/glu
-	virtual/opengl"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i \
-		-e "/^CC.*/s:$: ${CFLAGS}:" Makefile || \
-			die "sed Makefile failed"
-}
-
-src_install() {
-	local dir=${GAMES_LIBDIR}/${PN}
-	dodir ${dir}
-
-	cp -r mupen64* lang plugins save roms path.cfg ${D}/${dir}/
-	sed -e "s:GENTOO_DIR:${dir}:" \
-		${FILESDIR}/mupen64 > ${T}/mupen64
-	dogamesbin ${T}/mupen64
-
-	dodoc *.txt
-	dohtml index.htm
-
-	prepgamesdirs
-}
diff --git a/games-emulation/mupen64/mupen64-0.3.ebuild b/games-emulation/mupen64/mupen64-0.3.ebuild
index 338b9b572e2b..cac14a917a0e 100644
--- a/games-emulation/mupen64/mupen64-0.3.ebuild
+++ b/games-emulation/mupen64/mupen64-0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/mupen64-0.3.ebuild,v 1.2 2003/09/27 08:06:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/mupen64-0.3.ebuild,v 1.3 2003/11/25 15:58:49 vapier Exp $
 
 inherit games gcc eutils
 
@@ -29,27 +29,33 @@ S=${WORKDIR}
 
 src_unpack() {
 	unpack ${A}
-	# the riceplugin seems to want gcc 3.3 to compile.
+
+	# the riceplugin seems to want gcc 3.3 to compile
 	if [ "`gcc-major-version`" -lt 3 -o "`gcc-version`" = "3.2" ] ; then
 		rm -rf riceplugin
 	else
 		epatch ${FILESDIR}/${PV}-gcc3.patch
 		sed -i \
-			-e "/^CFLAGS/s:-O3.*$:${CFLAGS}:" riceplugin/Makefile || \
-			die "sed riceplugin/Makefile failed"
+			-e "/^CFLAGS/s:-O3.*$:${CFLAGS}:" \
+			riceplugin/Makefile \
+			|| die "sed riceplugin/Makefile failed"
 	fi
+	# the riceplugin requires sse support
+	echo "#include <xmmintrin.h>" > ${T}/test.c
+	$(gcc-getCC) ${CFLAGS} -o ${T}/test.s -S ${T}/test.c >&/dev/null || rm -rf riceplugin
+
 	sed -i \
-		-e "/^CC/s:-O3.*-Wall:${CFLAGS}:" emu64/Makefile \
-			mupen64_input/Makefile || \
-				die "sed mupen64_input/Makefile failed"
+		-e "/^CC/s:-O3.*-Wall:${CFLAGS}:" \
+		emu64/Makefile mupen64_input/Makefile \
+		|| die "sed mupen64_input/Makefile failed"
 	sed -i \
 		-e "/^CFLAGS/s:-O3.*-march=athlon:${CFLAGS}:" \
-		mupen64_sound/Makefile || die "sed mupen64_sound/Makefile failed"
+		mupen64_sound/Makefile \
+		|| die "sed mupen64_sound/Makefile failed"
 	sed -i \
 		-e "/^CFLAGS/s:-O3.*$:${CFLAGS}:" \
-		rsp_hle/Makefile \
-		tr64_oglv078_src/Makefile || \
-			sed "other sed Makefiles failed"
+		rsp_hle/Makefile tr64_oglv078_src/Makefile \
+		|| die "other sed Makefiles failed"
 }
 
 src_compile() {