Fix build with gcc-4.7 Bug #423377

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

4 files changed, 67 insertions, 11 deletions

diff --git a/games-strategy/asc/ChangeLog b/games-strategy/asc/ChangeLog
index fd94e0b46b82..ac80e87d9566 100644
--- a/games-strategy/asc/ChangeLog
+++ b/games-strategy/asc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-strategy/asc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/asc/ChangeLog,v 1.42 2012/07/16 15:44:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/asc/ChangeLog,v 1.43 2012/10/30 15:07:24 tupone Exp $
+
+  30 Oct 2012; Tupone Alfredo <tupone@gentoo.org> asc-2.5.0.0.ebuild,
+  +files/asc-2.5.0.0-gcc47.patch:
+  Fix build with gcc-4.7 Bug #423377 by Diego
+  Migration to EAPI 4
 
   16 Jul 2012; Michael Sterrett <mr_bones_@gentoo.org> -asc-2.4.0.0.ebuild:
   old
diff --git a/games-strategy/asc/Manifest b/games-strategy/asc/Manifest
index 2ac61a2dfc4c..7264babaf19d 100644
--- a/games-strategy/asc/Manifest
+++ b/games-strategy/asc/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX asc-2.5.0.0-gcc47.patch 1088 SHA256 b31b849f843877ff7be8aef227f7fd6e812b9c23f13bfb50c69ac1e395042390 SHA512 2f8f79e231b20ce8d7d5ab1da20ad592b3a0b5b85365e01b0a74077bcf76e1e3f01ff16d276a98291ffb8a21b6badd688680a9ab692238f91e35a9b7e9678510 WHIRLPOOL 0017e8a73bd5288372543be1f11b392d3654091f6bc819d70c60a1eb24326d8837509e283bc6db42ee756ed462b2bd20ddf97e76c6893fda1465854c95b5040d
 DIST asc-2.5.0.0.tar.bz2 42084514 SHA256 ad6edb629049bda615b7c9b3046ab33d35dbc25de39a5ed15b9279fe48f779c6 SHA512 ee1ed1e8fdd0050b016f8cf51d6e3a00a5c3c4d6e5da25fb8ccf136a15ba03ab97a9734e634028cc12330eabd63a275afc825317e2adbe260df23101b4f49881 WHIRLPOOL 48680ddbad7609a460bd083992476b5c4c52d2140c456b9aa567387b7f4431dacdbf619886c1b1ea9ac1f350ce6e248c6a0024e0d9987c6f67b60590a5929380
 DIST frontiers.ogg 4691844 SHA256 eabc9b07d1db07626fa817a30dad23b11aada059e32c08914d2d0cf1d58c7fff SHA512 8c2ce497519b3842fba2d39b5c6de6194584d64c0375d404535628898cb2e7a82433fc6008781381a80a6cbb24ff49162de3634ebcf28b17b0631c30668fd8af WHIRLPOOL a48a6596421a7a5b2d663af14e12c04db2a47c3bde8f1cc54dfe72c69b095613e6479eb408483679979f264d848911b34ee7edb56757734229d1990046bcdd5b
 DIST machine_wars.ogg 3138308 SHA256 bd7f330c06090d98e5ba0dac5a691af1804ba383b783b7b2f960bc2e53400a77 SHA512 2c1bab89b9397f52dcf7eedfc0dbc88d49a586ac0474c76a09a87a880712bf0fa408c03a65a5f5d322dee86e3b12cbc66d53cd6728e8fa34fa8f2ee2bbc06cd8 WHIRLPOOL 7a83910d48414ffe3687374efb661dd169801f244857a4f154d400b76477917bfa2db63dfddfc57544be95e413cf23e810b346f3a39d4f140454237b235a2eee
 DIST time_to_strike.ogg 3830679 SHA256 0334a027b8a45a5df88e1e3e7db9cace2def02396fbcc794d157289e41c9ad05 SHA512 2ed946116cac2ea63d401eb7415d5b3e4e548bc5a5b00b01a6f1c4db6a242895810dfefdf1ace9652f01dc934a70b756aa74d01630cfac97b19ce84a93b772ee WHIRLPOOL d7a280bc4041e449a96e4f79483110c4f86d099be4550fe70edd1882df81d8242fe6bf687079b6b2f608f879462c1a5ca84dae7e11e68ea97d93d0651d48ef4f
-EBUILD asc-2.5.0.0.ebuild 1808 SHA256 2ce1980f49d829ade7689ef4a7ee9de9d3249588bd3aa92f2da531a8fec79b8c SHA512 e0a0e5ce8e5ef2fc5dc866db856b5a27c0e9ea5faedf959a41e8b2943664fce2c95acf31a2f47e5d04328548b6c787b11fa5bd26e9c9b9545304cee673d701b3 WHIRLPOOL 670184e5cab1f57f4494515cc339309efcb32ec00ccd804a2fd52aad637a3a60d8feab23863d5e4e0b3c5db509acb81e1a7b5636469d67c35ac14cf3465814bf
-MISC ChangeLog 6527 SHA256 05c417a50263299793366e4c1447c1957fe534d3adb6f4aa6b761bcfad12aaa5 SHA512 c2cd10ca1f7f0668c8768f83099582ad13b95cb7ec707e39fbba45ed430880233e390f593b5f9997e37d65b22df65da94a2d37eb0bef07217883ba69178411e3 WHIRLPOOL e313fd68540e8a126c4de96d56b2c58b1e81beb8cdd4e5f6f12f93e320dcce76b2af8318ebad5337242d7f704dd7f2a9c9b9dc103bbcfa1199215821f32a77b1
+EBUILD asc-2.5.0.0.ebuild 1702 SHA256 73bad31b1207c32cf52a0ab5efb3ff34d4a3c002e76c8deb41e5e582e3f25b26 SHA512 445fa218f427e1e2c9f8429479be765fcc396d6926de89c926ccd5a8d51a477d8934037becc912fda06a4522f50e4860529e42f577d6da9b3fdc8a0c2d4e9a28 WHIRLPOOL d87754114a1ce8c7db9a5811117b9145ad3a0db74200e6961321693a29d8f1808600754bc4dca1bbee52c53e5c16bcf35c072ef47b7cac372ce6d20d0791c84c
+MISC ChangeLog 6697 SHA256 0df9d1044c0682be2e3885cb8f699fdbbbfef31cb9b4e08552113d894a97b8ed SHA512 6e5ceff4299bd294b1eb0489e688321f259e8dc995bd8e9a22352e540a993b1f2ab53c85c77e0e0469a40c1575c53b010f9258fe2f79277daaf84a403b0e2fb6 WHIRLPOOL aaa16f34cbbd0fdb785c8eaa0625a04a549ff842f0037d61bfd5a6b26ffc98576a27d81cdc19293065ce8fb8c93f873cd77bb1fb3138a2096e97a4fb56a9fde3
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlCP7TIACgkQIY77eQFFFC2wKACeI/SYLw0kkHCrZ4TicLF/NGfq
+HNUAoL31ulnNnkqroaUFc78fq70geLyl
+=UStg
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/asc/asc-2.5.0.0.ebuild b/games-strategy/asc/asc-2.5.0.0.ebuild
index 147b4833b0b5..89225d37e5eb 100644
--- a/games-strategy/asc/asc-2.5.0.0.ebuild
+++ b/games-strategy/asc/asc-2.5.0.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/asc/asc-2.5.0.0.ebuild,v 1.3 2012/06/22 07:45:30 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/asc/asc-2.5.0.0.ebuild,v 1.4 2012/10/30 15:07:24 tupone Exp $
 
-EAPI=2
+EAPI=4
 WX_GTK_VER=2.8
-inherit toolchain-funcs flag-o-matic wxwidgets games
+inherit eutils toolchain-funcs flag-o-matic wxwidgets games
 
 DESCRIPTION="turn based strategy game designed in the tradition of the Battle Isle series"
 HOMEPAGE="http://www.asc-hq.org/"
@@ -19,7 +19,6 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="app-arch/bzip2
-	virtual/jpeg
 	media-libs/libsdl
 	media-libs/libpng
 	media-libs/sdl-image[gif,jpeg,png]
@@ -27,18 +26,20 @@ RDEPEND="app-arch/bzip2
 	media-libs/sdl-sound
 	dev-libs/boost
 	dev-games/physfs
-	media-libs/libvorbis
 	media-libs/xvid
 	dev-libs/expat
 	media-libs/freetype
 	dev-lang/lua
 	x11-libs/wxGTK:2.8[X]
 	dev-libs/libsigc++:1.2"
+
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	virtual/pkgconfig
 	app-arch/zip"
 
+PATCHES=( "${FILESDIR}"/${P}-gcc47.patch )
+
 src_unpack() {
 	local f
 
@@ -61,15 +62,13 @@ src_configure() {
 		replace-flags -O3 -O2
 	fi
 	egamesconf \
-		--disable-dependency-tracking \
 		--disable-paraguitest \
 		--disable-paragui \
 		--datadir="${GAMES_DATADIR_BASE}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README TODO
+	default
 	dohtml -r doc/*
 	prepgamesdirs
 }
diff --git a/games-strategy/asc/files/asc-2.5.0.0-gcc47.patch b/games-strategy/asc/files/asc-2.5.0.0-gcc47.patch
new file mode 100644
index 000000000000..b6541075ea4b
--- /dev/null
+++ b/games-strategy/asc/files/asc-2.5.0.0-gcc47.patch
@@ -0,0 +1,41 @@
+--- source/graphics/drawing.h.old	2012-10-30 10:33:47.617844756 +0100
++++ source/graphics/drawing.h	2012-10-30 10:46:23.444784874 +0100
+@@ -169,7 +169,7 @@
+          PixelType* pix = (PixelType*)( surf.pixels() );
+          pix += pos.y * surf.pitch()/pixelsize + pos.x;
+ 
+-         assign ( src, pix );
++         this->assign ( src, pix );
+       };
+ };
+ 
+--- source/graphics/blitter.h.old	2012-10-30 12:21:14.767021349 +0100
++++ source/graphics/blitter.h	2012-10-30 12:22:18.492472029 +0100
+@@ -928,6 +928,7 @@
+       ;
+ };
+ 
++#include "drawing.h"
+ 
+ 
+ extern const int ColorMerger_Alpha_XLAT_Table_shadings[8]; 
+--- source/itemrepository.cpp.old	2012-10-30 10:32:06.771697823 +0100
++++ source/itemrepository.cpp	2012-10-30 12:23:42.973448933 +0100
+@@ -88,7 +88,7 @@
+    t->filename = fileName;
+    t->location = location;
+    t->archive = prc.getArchive();
+-   add ( t );
++   this->add ( t );
+ }
+ 
+ 
+@@ -110,7 +110,7 @@
+       t->archive = stream.readString();
+       dataLoaderTicker();
+ 
+-      add ( t );
++      this->add ( t );
+       // add ( T::newFromStream(stream ));
+    }
+ }