Fix gcc-4.3 build bug #251127

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.27-gentoo-r7 x86_64

4 files changed, 25 insertions, 6 deletions

diff --git a/games-emulation/daphne/ChangeLog b/games-emulation/daphne/ChangeLog
index 69ad764388ec..887bbd3de0c9 100644
--- a/games-emulation/daphne/ChangeLog
+++ b/games-emulation/daphne/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/daphne
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/daphne/ChangeLog,v 1.13 2008/12/09 10:17:30 joker Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/daphne/ChangeLog,v 1.14 2009/01/19 15:42:43 tupone Exp $
+
+  19 Jan 2009; Alfredo Tupone <tupone@gentoo.org>
+  +files/daphne-1.0-gcc43.patch, daphne-1.0.ebuild:
+  Fix gcc-4.3 build bug #251127 by flameeyes@gentoo.org
 
   09 Dec 2008; Christian Birchinger <joker@gentoo.org> daphne-1.0.ebuild:
   Changed MMX defines and exports for x86
diff --git a/games-emulation/daphne/Manifest b/games-emulation/daphne/Manifest
index 4121a1272a6a..bcaf2d0498ad 100644
--- a/games-emulation/daphne/Manifest
+++ b/games-emulation/daphne/Manifest
@@ -1,10 +1,11 @@
 AUX daphne-0.99.7-exec-stack.patch 360 RMD160 20f49ba81bc5b9fb5e8f2ad01a828ea36920d0dd SHA1 7904d24f3a97798bb69d3ec323f2b6f12a30faf5 SHA256 ad2b25a651fbe5a37646fed02173957a495c027b99372ca492207908aa68ea0a
 AUX daphne-0.99.7-gcc41.patch 522 RMD160 b3b7f1a126648b4088780a29daa5b1835a41a1d9 SHA1 81a2cadeaee6ae9d49ef120e25e7e62718b683e9 SHA256 d3677fe46478c34532fbe0d089dbca4f4ff4d40d9de0eed6e20effe21bc8fed7
+AUX daphne-1.0-gcc43.patch 482 RMD160 232e35f3b8fedb792129d782aa14deb278895095 SHA1 00cfe7cd467008f4a29355ee96f70a1c70b56480 SHA256 a13e0f8490bd099dd70874ff7a8c3906fe7673f7921042f928acb0e258cac929
 AUX daphne-1.0-typefix.patch 1959 RMD160 3973c9964d7588158a78926eaafcbee4e60b1dd9 SHA1 1520ea3dddee2a651634ae43d957461c81f88947 SHA256 116cd49bbf8558bc082b784388269d1095d50acc4139cd01e9f1c075fbfaba9b
 AUX daphne-1.0-vorbisfilefix.patch 467 RMD160 ee994068c9e767798a663428945d6b4a06057536 SHA1 6c63b3e0689b778a781ba7de2ef58cf5722710d6 SHA256 357a909c253af836f0628ea02f211fbacf9ddb48b82b6bec0d049b5afabbc120
 DIST daphne-0.99.7-src.tar.gz 3499980 RMD160 0607bf6a275f3ada240d8ee4b5ffca44e7ceb246 SHA1 04f402463d94d68814e48d19cbc541a0d5b83bef SHA256 6b40f2028cac01803318bc2d62ad3a3c7d98b3d49d846312e30d2b52fadfce51
 DIST daphne-1.0-src.tar.gz 4316387 RMD160 23c03ccd7bcddc2bf4616f17da9bd012f9f36858 SHA1 36f40b4d7ac9b9f502c659346a17aea81fe9ab9c SHA256 b3df3cbb49b3b0d1c2d9f8ab9ae22ef39b1627db09b67a4d10122d754443a588
 EBUILD daphne-0.99.7.ebuild 1642 RMD160 d94164445ff9b1c040e2ab005f66c7e4f8582998 SHA1 734c7d4b69c95a6688c0ba7457f8aad38cff1cff SHA256 f7a6c338e1b9b0ce2fd132d2fdb11c03668d4079808204f25918dadda1dec2c4
-EBUILD daphne-1.0.ebuild 2149 RMD160 7ebbff6fb8091a74ce26acfe76a866376aeef765 SHA1 9fa3936bce439f81c2addc74fef1f9f63473ef75 SHA256 bd5e0fe18999b3bd4076e83f753b970a4de1be65d089775417cce751a88bcbbf
-MISC ChangeLog 1924 RMD160 d0cabe69a543d1fba5cbf9fb233fe37f57384160 SHA1 a7de803f010742a5fd4ef9c1b793384564efe387 SHA256 f1f5c1085daddb0dc2e5fa807441c33c5e81f67f4662dde2b119fa0b6572b3f0
+EBUILD daphne-1.0.ebuild 2190 RMD160 98cacdc763ceeef4d292824363c7befd3e6814a7 SHA1 a3b8af505231cb66483811705174cb5c145294be SHA256 7abf6b01a6daf7de15f6e72b6daf57ee43b941a0f7f7943540919c32c9938df8
+MISC ChangeLog 2084 RMD160 0bf06fc26c7a29125052b7210f0412b10f97db7c SHA1 80b5f5c7a07e0a15a78e3ed41cd4517953437e75 SHA256 57b1447a79cd971d08dc06e39da688c84d5ae468643b695c7fffd3f3b5734fb8
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-emulation/daphne/daphne-1.0.ebuild b/games-emulation/daphne/daphne-1.0.ebuild
index e462a36531b6..169f264137ca 100644
--- a/games-emulation/daphne/daphne-1.0.ebuild
+++ b/games-emulation/daphne/daphne-1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/daphne/daphne-1.0.ebuild,v 1.2 2008/12/09 10:17:30 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/daphne/daphne-1.0.ebuild,v 1.3 2009/01/19 15:42:43 tupone Exp $
 
 inherit eutils toolchain-funcs games
 
@@ -31,6 +31,8 @@ src_unpack() {
 	# amd64 does not like int pointers
 	epatch "${FILESDIR}/${P}"-typefix.patch
 
+	epatch "${FILESDIR}/${P}"-gcc43.patch
+
 	sed -i "/m_appdir =/s:\.:${GAMES_DATADIR}/${PN}:" \
 		io/homedir.cpp \
 		|| die "sed homedir.cpp failed"
diff --git a/games-emulation/daphne/files/daphne-1.0-gcc43.patch b/games-emulation/daphne/files/daphne-1.0-gcc43.patch
new file mode 100644
index 000000000000..289757d4a50c
--- /dev/null
+++ b/games-emulation/daphne/files/daphne-1.0-gcc43.patch
@@ -0,0 +1,12 @@
+--- Makefile.old        2009-01-19 16:22:07.000000000 +0100
++++ Makefile    2009-01-19 16:22:17.000000000 +0100
+@@ -33,7 +33,7 @@
+ endif
+
+ # Platform specific cflags defined in the Makefile.vars file
+-export CFLAGS = ${PFLAGS} ${DEFINE_STATIC_VLDP} -Wall -Winline -Werror
++export CFLAGS = ${PFLAGS} ${DEFINE_STATIC_VLDP} -Wall -Winline
+
+ OBJS = ldp-out/*.o cpu/*.o game/*.o io/*.o timer/*.o ldp-in/*.o video/*.o \
+        sound/*.o daphne.o cpu/x86/*.o scoreboard/*.o ${VLDP_OBJS}
+