Build with gcc-4.7 Bug #421901

Package-Manager: portage-2.1.11.30/cvs/Linux i686
Manifest-Sign-Key: 0x0145142D

4 files changed, 36 insertions, 19 deletions

diff --git a/games-emulation/gcube/ChangeLog b/games-emulation/gcube/ChangeLog
index 33107cb7c242..a92897f75c61 100644
--- a/games-emulation/gcube/ChangeLog
+++ b/games-emulation/gcube/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/gcube
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/gcube/ChangeLog,v 1.11 2011/06/10 12:27:14 tupone Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/gcube/ChangeLog,v 1.12 2012/10/23 12:22:50 tupone Exp $
+
+  23 Oct 2012; Tupone Alfredo <tupone@gentoo.org> gcube-0.4-r1.ebuild,
+  +files/gcube-0.4-gcc47.patch:
+  Build with gcc-4.7 Bug #421901 by Diego
 
   10 Jun 2011; Tupone Alfredo <tupone@gentoo.org> gcube-0.4-r1.ebuild,
   +files/gcube-0.4-underlink.patch:
diff --git a/games-emulation/gcube/Manifest b/games-emulation/gcube/Manifest
index 22fe9f6debd0..8ae18254dcd1 100644
--- a/games-emulation/gcube/Manifest
+++ b/games-emulation/gcube/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX gcube-0.4-ldflags.patch 911 RMD160 138c33c8b7471b61b5c185b76987888e9b165574 SHA1 17abc2f52bdb8ebb01f7ed3c34a19ef4699c3434 SHA256 a57d1a126f2898d4241e1e3ccd4a2c5283dc6585ca624d43d2170b75c9dcbef5
-AUX gcube-0.4-underlink.patch 443 RMD160 3fb5fb5a5815756a5437e868221bd9522f537750 SHA1 844510a610d4f76c1e67f20d58d7491081d70017 SHA256 6640d32dd364930c204fff627743bce2dc75bda7590cbd22366a946ac445975b
-DIST gcube-0.4-src.tar.bz2 803503 RMD160 9a7c13ed611da22705f960686eea225e30b61dc6 SHA1 dae967f8aedfc2115c3720dfe2c523128fddc8b6 SHA256 e2fe9b198ea627ec6b1be98b06a620d1f32f373c94161ea042319dbf6cb10418
-EBUILD gcube-0.4-r1.ebuild 975 RMD160 c0442f80c6f62895c93c232801f4bd4e2dc08617 SHA1 ef1d444ef80d3a0b4a80b60e285190df57a01c4b SHA256 adb0c5e94258434a591af8cf3c50ef3a514034d3f6d14865bfbd03341668ff12
-MISC ChangeLog 1568 RMD160 ad37f6bae485c65a5cfd22f41d898dd24405a4d5 SHA1 09b8101d010593a2c9dad83207cf42b9d4edb4b0 SHA256 c51107c03990389f10000b12b8e74fa7b4460fa91baed84cf426d6fedb506cc6
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+AUX gcube-0.4-gcc47.patch 425 SHA256 f8c3577d291735e53c660ca6294753d85f71a8b47b35139b8eda9ab56c7b0535 SHA512 efff9f47acb46cb406ef61f7125840200e6692fe94d26ed6f8c86cda9aa15fedae2d7cd673035849724bed1bee7d6116cf3467d66df94b322c746db33ac099ac WHIRLPOOL 51dd12f3e37a9ae8fcba0c24ea6b206bbab67192ede56bc781628b19ea686079fa86a9425f2cb82eb9099ac4addea914833c2c1c0e2808e65e1a93b8c927f1ff
+AUX gcube-0.4-ldflags.patch 911 SHA256 a57d1a126f2898d4241e1e3ccd4a2c5283dc6585ca624d43d2170b75c9dcbef5 SHA512 c0ff07a641b1df088313406feac730dbbee74f4451dc1bf4c0c8e9c6e53206d3a93292bbfc09db70f3d791a654523b1ffdde51057f6d101c3b6e9c8e636c851d WHIRLPOOL 013a914bd737f4e070068f4a2330f198af3e9ed38ab6f0a098fe894ad068bbceeb58a4af77cec9f3ddb9d42bac5438e3d9d2b4b65d47acb7323ce82603b1fbcf
+AUX gcube-0.4-underlink.patch 443 SHA256 6640d32dd364930c204fff627743bce2dc75bda7590cbd22366a946ac445975b SHA512 c372ba4447fca9c4f28aab14da05d15780e45e98b061eace8bf1f5494185809f1466890fa0581e001a2886d6a9d34c2365e36ea94f3bc64fe1bdbecde94676e9 WHIRLPOOL 2dc95356c6b26f317dc9ae696909fc6fbe68bdd3eb11466d851b484018020f90c25b6285286fa4a56a836f18ccf648db8018a58290c015291597f31f756b0773
+DIST gcube-0.4-src.tar.bz2 803503 SHA256 e2fe9b198ea627ec6b1be98b06a620d1f32f373c94161ea042319dbf6cb10418 SHA512 f73665386d547322f20ed5e358f4f394b07d74fd90bddbfe1158a7a5d896bff36dabc9833f2d820a7af7673b8c8af62490f7fa07b06a2bbca4df6356a1e3c91a WHIRLPOOL d36dbe8aff85acfdd8ab7faec11c452fff8a74b8aea2c7dbaa824a8308c89474e30d2b49fef20048ea773c0406550808717eeffba1a3c8b13f01931c0365e63f
+EBUILD gcube-0.4-r1.ebuild 970 SHA256 7ac75f88bddbe6446ed089a003295a61f3a1c38b24b3b1c26ddd838acee708b5 SHA512 60614e5f182a1d84e1aa89fbe42da8e1d6b02b1229cc595a8fd0adfc70b0bfe748510f2a9b5cde2c7c5be2a9302a9de9ab21150b08ea1a54127c61a442449de7 WHIRLPOOL 3dbdf8fc0b34c5431e8ee92417b20139c85ddc52d9e3de4d2c099cdf8386f84fb1376ba10d05ff0945aaa993737dd2b907735211ad314a24570a00126c2bb07f
+MISC ChangeLog 1714 SHA256 c499589447284f161b4a711dfb0c345631c1d3cf676ec9d674db86e78ebc7310 SHA512 6ad774c52fa7adbda98eddae99bc039b16ff66a5b5eacd26a44106724c4c281f823b0127b80892b728a6bedb5ab9de5b8ba08350fc8bbe568951ba8982842b7e WHIRLPOOL 027091846679ceb25b081eea48b5e33eac490698e304f33c5132837d7b374d23aeb79beffff8d66d0834292564d97e0bd7326eea2fa93622c12a7f07db9bbbf1
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk3yDa4ACgkQIY77eQFFFC3QUwCeIcyit2hVa6EKMhi/YXK2LLGr
-97AAoK51rtz/eMwgMbUBNrA/NO7Qr0J6
-=kU1Z
+iEYEAREIAAYFAlCGjCEACgkQIY77eQFFFC35kgCgjs8m0pLpd6ha+jX1onfhqUmd
+8E8AoIXQRMe3ryXoXLEhY/1Vly+7NVbK
+=6sSc
 -----END PGP SIGNATURE-----
diff --git a/games-emulation/gcube/files/gcube-0.4-gcc47.patch b/games-emulation/gcube/files/gcube-0.4-gcc47.patch
new file mode 100644
index 000000000000..b459a4e24034
--- /dev/null
+++ b/games-emulation/gcube/files/gcube-0.4-gcc47.patch
@@ -0,0 +1,10 @@
+--- Makefile.rules.old	2012-10-23 14:06:54.417782365 +0200
++++ Makefile.rules	2012-10-23 14:07:11.516377033 +0200
+@@ -1,6 +1,6 @@
+ 
+ SDL_CONFIG=sdl-config
+-LIBS=`$(SDL_CONFIG) --libs` -mno-windows -mcygwin -lz -l$(OPENGL) -lm
++LIBS=`$(SDL_CONFIG) --libs` -lz -l$(OPENGL) -lm
+ 
+ PROFLAGS=-g -Wall -pg -fprofile-arcs -ftest-coverage
+ OPTFLAGS=-O3 -fno-strict-aliasing -fomit-frame-pointer -ffast-math -march=$(CPU) $(OPTIMIZE)
diff --git a/games-emulation/gcube/gcube-0.4-r1.ebuild b/games-emulation/gcube/gcube-0.4-r1.ebuild
index 6f0e61b86874..649be9a17b51 100644
--- a/games-emulation/gcube/gcube-0.4-r1.ebuild
+++ b/games-emulation/gcube/gcube-0.4-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/gcube/gcube-0.4-r1.ebuild,v 1.7 2011/06/10 12:27:14 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/gcube/gcube-0.4-r1.ebuild,v 1.8 2012/10/23 12:22:50 tupone Exp $
 
-EAPI=2
+EAPI=4
 inherit eutils games
 
 DESCRIPTION="Gamecube emulator"
@@ -19,6 +19,7 @@ DEPEND="virtual/opengl
 	virtual/jpeg
 	sys-libs/ncurses
 	sys-libs/zlib"
+RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${PV}
 
@@ -27,15 +28,16 @@ src_prepare() {
 		-e '/^CFLAGS=-g/d' Makefile.rules \
 		|| die "sed failed"
 	epatch "${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-underlink.patch
+		"${FILESDIR}"/${P}-underlink.patch \
+		"${FILESDIR}"/${P}-gcc47.patch
 }
 
 src_install() {
 	local x
 
-	dogamesbin gcmap gcube || die "dogamesbin failed"
+	dogamesbin gcmap gcube
 	for x in bin2dol isopack thpview tplx ; do
-		newgamesbin ${x} ${PN}-${x} || die "newgamesbin ${x} failed"
+		newgamesbin ${x} ${PN}-${x}
 	done
 	dodoc ChangeLog README
 	prepgamesdirs