fix gcc4 compiling with patch from Stephen Bridges (bug #133203)

(Portage version: 2.1.2_pre2-r3)

5 files changed, 35 insertions, 14 deletions

diff --git a/games-emulation/dgen-sdl/ChangeLog b/games-emulation/dgen-sdl/ChangeLog
index aefdffb313bb..20f1cda10ad8 100644
--- a/games-emulation/dgen-sdl/ChangeLog
+++ b/games-emulation/dgen-sdl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/dgen-sdl
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/dgen-sdl/ChangeLog,v 1.10 2006/02/10 20:43:47 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dgen-sdl/ChangeLog,v 1.11 2006/10/05 04:56:02 mr_bones_ Exp $
+
+  05 Oct 2006; Michael Sterrett <mr_bones_@gentoo.org>
+  files/dgen-sdl-1.23-gcc34.patch, +files/dgen-sdl-1.23-gcc4.patch,
+  dgen-sdl-1.23.ebuild:
+  fix gcc4 compiling with patch from Stephen Bridges (bug #133203)
 
   10 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> dgen-sdl-1.23.ebuild:
   Added RDEPEND to DEPEND so we pull in libsdl for building.
diff --git a/games-emulation/dgen-sdl/dgen-sdl-1.23.ebuild b/games-emulation/dgen-sdl/dgen-sdl-1.23.ebuild
index a884bc85e766..d4c48f8288c9 100644
--- a/games-emulation/dgen-sdl/dgen-sdl-1.23.ebuild
+++ b/games-emulation/dgen-sdl/dgen-sdl-1.23.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/dgen-sdl/dgen-sdl-1.23.ebuild,v 1.11 2006/02/10 20:43:47 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dgen-sdl/dgen-sdl-1.23.ebuild,v 1.12 2006/10/05 04:56:02 mr_bones_ Exp $
 
-inherit eutils gnuconfig games
+inherit eutils games
 
 DESCRIPTION="A Linux/SDL-Port of the famous DGen MegaDrive/Genesis-Emulator"
 HOMEPAGE="http://www.pknet.com/~joe/dgen-sdl.html"
@@ -16,21 +16,20 @@ IUSE="X mmx opengl"
 RDEPEND="media-libs/libsdl
 	opengl? ( virtual/opengl )"
 DEPEND="${RDEPEND}
-	X? (
-		|| (
-			x11-misc/imake
-			virtual/x11 ) )
+	X? ( x11-misc/imake )
 	dev-lang/nasm"
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}/star"
-	epatch "${FILESDIR}/${P}-gcc34.patch" # for bug #116113
+	cd "${S}"
+	# gcc34.patch for bug #116113
+	# gcc4.patch for bug #133203
+	epatch \
+		"${FILESDIR}/${P}-gcc34.patch" \
+		"${FILESDIR}/${P}-gcc4.patch"
 }
 
 src_compile() {
-	gnuconfig_update
-
 	egamesconf \
 		$(use_with opengl) \
 		$(use_with X x) \
@@ -39,7 +38,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog README sample.dgenrc
 	prepgamesdirs
 }
diff --git a/games-emulation/dgen-sdl/files/dgen-sdl-1.23-gcc34.patch b/games-emulation/dgen-sdl/files/dgen-sdl-1.23-gcc34.patch
index a986c09c689e..4c0f1d4b8ce5 100644
--- a/games-emulation/dgen-sdl/files/dgen-sdl-1.23-gcc34.patch
+++ b/games-emulation/dgen-sdl/files/dgen-sdl-1.23-gcc34.patch
@@ -1,5 +1,5 @@
---- star.c.orig	2005-12-24 22:08:06.000000000 -0500
-+++ star.c	2005-12-24 22:08:18.000000000 -0500
+--- star/star.c.orig	2005-12-24 22:08:06.000000000 -0500
++++ star/star.c	2005-12-24 22:08:18.000000000 -0500
 @@ -1931,7 +1931,7 @@
  	case aind: case ainc: case adec:
  	case adsp: case axdp:
diff --git a/games-emulation/dgen-sdl/files/dgen-sdl-1.23-gcc4.patch b/games-emulation/dgen-sdl/files/dgen-sdl-1.23-gcc4.patch
new file mode 100644
index 000000000000..7b3c525f5cf2
--- /dev/null
+++ b/games-emulation/dgen-sdl/files/dgen-sdl-1.23-gcc4.patch
@@ -0,0 +1,15 @@
+--- musa/m68kmake.c.orig	2006-05-13 12:52:38.000000000 +0100
++++ musa/m68kmake.c	2006-05-13 12:53:05.000000000 +0100
+@@ -1029,10 +1029,10 @@
+ 	fprintf(filep, "/* ========================= OPCODE TABLE BUILDER ========================= */\n");
+ 	fprintf(filep, "/* ======================================================================== */\n\n");
+ 
+-	fprintf(filep, "#include \"m68kops.h\"\n");
+-	fprintf(filep, "#include \"m68kcpu.h\"\n");
+ 	fprintf(filep, "#include <stdlib.h>\n\n");
+ 	fprintf(filep, "#include <string.h>\n\n");
++	fprintf(filep, "#include \"m68kops.h\"\n");
++	fprintf(filep, "#include \"m68kcpu.h\"\n");
+ 
+ 	fprintf(filep, "extern void  (*m68k_instruction_jump_table[])(void); /* opcode handler jump table */\n\n");
+ 
diff --git a/games-emulation/dgen-sdl/files/digest-dgen-sdl-1.23 b/games-emulation/dgen-sdl/files/digest-dgen-sdl-1.23
index 9125ce4145f4..7b40283429c9 100644
--- a/games-emulation/dgen-sdl/files/digest-dgen-sdl-1.23
+++ b/games-emulation/dgen-sdl/files/digest-dgen-sdl-1.23
@@ -1 +1,3 @@
 MD5 b1896c1b21ddb152626aec2e8a157a3a dgen-sdl-1.23.tar.gz 340556
+RMD160 ca5ac81b4c8436a63e8d776b182735ad63ffa77a dgen-sdl-1.23.tar.gz 340556
+SHA256 44396b3b324433187cf7082d1059cd9f519f02accddd667e627a57ff8514d436 dgen-sdl-1.23.tar.gz 340556