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

Package-Manager: portage-2.1.2_pre2-r3

6 files changed, 56 insertions, 26 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/Manifest b/games-emulation/dgen-sdl/Manifest
index 395359c6cbf4..873de43d28d4 100644
--- a/games-emulation/dgen-sdl/Manifest
+++ b/games-emulation/dgen-sdl/Manifest
@@ -1,15 +1,24 @@
-MD5 fb1efa3dc2df18608afc0a529bddc9ae ChangeLog 1604
-RMD160 faf34de2ffe3e8e7f7786afedd153ca1473f8c23 ChangeLog 1604
-SHA256 9091e2bd4b9dc92d754918411f7237d2ed3dc8f9bfc74d7c87cdcda19fcb79c7 ChangeLog 1604
-MD5 d8cd5bd752bb8358090c8e74847ffb32 dgen-sdl-1.23.ebuild 1036
-RMD160 fa038a910d9fade9f84f6645dfead5d76527e1ea dgen-sdl-1.23.ebuild 1036
-SHA256 034e17135bb7d58a028ae844eb7494c21b4ff4d797327f1130141c2cf98e4e7b dgen-sdl-1.23.ebuild 1036
-MD5 e7822b762b24b5fb0c98c2332817cde6 files/dgen-sdl-1.23-gcc34.patch 225
-RMD160 69f51679e040bb137a5b2618a9b987730c26ee21 files/dgen-sdl-1.23-gcc34.patch 225
-SHA256 e98c44a7eec1ca6ef6aab32f34cf893e599a2bed40f897a3f9bc7ef452f9b73b files/dgen-sdl-1.23-gcc34.patch 225
-MD5 b62a7d15563b05b01fa3b382d6eb26d5 files/digest-dgen-sdl-1.23 65
-RMD160 7595f2f96985fb382793d74a293437539ac0fd68 files/digest-dgen-sdl-1.23 65
-SHA256 ca31dc4ed8474ed77713414409185963c01c6a6350309f2bf2443cb47a015233 files/digest-dgen-sdl-1.23 65
+AUX dgen-sdl-1.23-gcc34.patch 235 RMD160 850948e590db34b2fb380368ea8bdf4fb1aa0f92 SHA1 46751208f465d3d1a0deb75da3f34aa82eb6f909 SHA256 30f9411fb7e088787cfbd3e265b8176ab7d7d6fd5786f487875cdb0b0c184d99
+MD5 dc8cc4b0ccc7ea8ca0344e93941e8e1f files/dgen-sdl-1.23-gcc34.patch 235
+RMD160 850948e590db34b2fb380368ea8bdf4fb1aa0f92 files/dgen-sdl-1.23-gcc34.patch 235
+SHA256 30f9411fb7e088787cfbd3e265b8176ab7d7d6fd5786f487875cdb0b0c184d99 files/dgen-sdl-1.23-gcc34.patch 235
+AUX dgen-sdl-1.23-gcc4.patch 737 RMD160 f0dd8940f6675c58592ca0f35ce57833c9f3e5cf SHA1 ab942826a7c2f3684e3f80adf2714c7f72b2e3ea SHA256 4672abe262033c8bc3e50a0679cf17e15ace3df265ec6aef7fc67f8ef141334a
+MD5 8c0bf5e7d7185e0889374c1d4e7fd6e5 files/dgen-sdl-1.23-gcc4.patch 737
+RMD160 f0dd8940f6675c58592ca0f35ce57833c9f3e5cf files/dgen-sdl-1.23-gcc4.patch 737
+SHA256 4672abe262033c8bc3e50a0679cf17e15ace3df265ec6aef7fc67f8ef141334a files/dgen-sdl-1.23-gcc4.patch 737
+DIST dgen-sdl-1.23.tar.gz 340556 RMD160 ca5ac81b4c8436a63e8d776b182735ad63ffa77a SHA1 c37096e5dd7c9f2c2c75496769d6d2b610a3a488 SHA256 44396b3b324433187cf7082d1059cd9f519f02accddd667e627a57ff8514d436
+EBUILD dgen-sdl-1.23.ebuild 1059 RMD160 e6b187ba67c68082aebff7e2b583fbf0c3409ceb SHA1 39037958d7abc4ec5dd8271b76c2da262e9eb20b SHA256 cd0d8b64d1419e05f664ca60e4703bde908e5b3f32e692beb0eea376b3b79f00
+MD5 f6051d0e38ea821bbb83fa07ff0dacff dgen-sdl-1.23.ebuild 1059
+RMD160 e6b187ba67c68082aebff7e2b583fbf0c3409ceb dgen-sdl-1.23.ebuild 1059
+SHA256 cd0d8b64d1419e05f664ca60e4703bde908e5b3f32e692beb0eea376b3b79f00 dgen-sdl-1.23.ebuild 1059
+MISC ChangeLog 1820 RMD160 03b49991b4c613a984b521e89570424e5a4fe99f SHA1 77d1960e8b39292acd5d1800b6b7c921ad1a07a8 SHA256 1c3bc77f48f85d62c71a8921e30b237b8ec860352703e1037ee7731544cd25b6
+MD5 dcf67ecb355610e23eec837313e4e087 ChangeLog 1820
+RMD160 03b49991b4c613a984b521e89570424e5a4fe99f ChangeLog 1820
+SHA256 1c3bc77f48f85d62c71a8921e30b237b8ec860352703e1037ee7731544cd25b6 ChangeLog 1820
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 3dff39fbf994f4b123a6d17f22eb5bfc files/digest-dgen-sdl-1.23 241
+RMD160 09e496f4934dc8d8f97f1e6143f9968316f1813b files/digest-dgen-sdl-1.23 241
+SHA256 bbef31a5ca097e4d1dc8ae49a51f4322ab65d08fb9ce20270b3d8ef80a98480b files/digest-dgen-sdl-1.23 241
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