add gcc47 patch from Peter Alfredsen (bug #424669)

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

4 files changed, 31 insertions, 14 deletions

diff --git a/games-strategy/warmux/ChangeLog b/games-strategy/warmux/ChangeLog
index 9733e3981b02..7268a309b7da 100644
--- a/games-strategy/warmux/ChangeLog
+++ b/games-strategy/warmux/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/warmux
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/warmux/ChangeLog,v 1.11 2012/05/04 04:51:08 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/warmux/ChangeLog,v 1.12 2012/07/13 16:05:04 mr_bones_ Exp $
+
+  13 Jul 2012; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/warmux-11.04.1-gcc47.patch, warmux-11.04.1.ebuild:
+  add gcc47 patch from Peter Alfredsen (bug #424669)
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> warmux-11.01.ebuild,
   warmux-11.04.1.ebuild:
diff --git a/games-strategy/warmux/Manifest b/games-strategy/warmux/Manifest
index d2bcbec4af45..e200ef00b246 100644
--- a/games-strategy/warmux/Manifest
+++ b/games-strategy/warmux/Manifest
@@ -1,10 +1,11 @@
-AUX warmux-11.01-gentoo.patch 2357 RMD160 52739232b3e687f6bad7d89d030d131883edc4eb SHA1 de55cb4dc0f1360e64222ea4dfb402a8d8e2cd2e SHA256 3e6c4ede46abc92291a4a51a37334e2c67fba15579a34bb6d4f2044b01966897
-AUX warmux-11.04.1-action.patch 549 RMD160 091ad6d11fef9088b4dfa6d636b383c734a6a72c SHA1 ffa65f54809c89907e9aae16f43f787b19183256 SHA256 a2b7bc4bfd84bc49dea5ef76a3386b414568c5b889f7ecad7d551e1f8f0cdc2e
-AUX warmux-11.04.1-gentoo.patch 1543 RMD160 4d702cb6d36f7cf71b6e64668190fe6715c76f9d SHA1 70a13794d40c1e1b22befc5dfcddf209c9226594 SHA256 ddaf2c688f58cf8fb9d0baddd4016ebbf04c974ab533ebc0c3532ee87799d643
-AUX warmux-11.04.1-zlib.patch 416 RMD160 8bd946de5adfed33b3f3c3613a9f461c2e6c4cec SHA1 9415c23c11f1fed76a4f687935da108da5d3e7fd SHA256 665c4a64e54478491284f6cb6251bd58f96ba81671a7c439cffe175b86462852
+AUX warmux-11.01-gentoo.patch 2357 SHA256 3e6c4ede46abc92291a4a51a37334e2c67fba15579a34bb6d4f2044b01966897 SHA512 c8ca76976845eab8c4d44a3bca545fa19760414f615187d9a07c74b1dfa1d9c8be126ec97f220f873fb723fb06f63adc1e5eb89bfb401bbf4ce3d4901e448acf WHIRLPOOL ac35ad3fcc0a700ecf03c686a35e69834ad7d0d343e727fc01620a8f0797bf9170b86f384c5f343e48629a201f48725770528f8b6fc31cb06d7b1d7f6d2280db
+AUX warmux-11.04.1-action.patch 549 SHA256 a2b7bc4bfd84bc49dea5ef76a3386b414568c5b889f7ecad7d551e1f8f0cdc2e SHA512 c31ac142b43e593f4c7b9fff36a8dd0bb34b371a63935cf55627660d96eda8fe68af721254bd72a2168045a27b32a407df494eb6b216115a0bb0516478187ec9 WHIRLPOOL 91f7ff962204a22b09fb2f10a1b024cdd0ec0cd4739ef826643ca4692decf8808675772a123718993677dc175ed1844cd637e37d2f44428db40999c41be4e2f2
+AUX warmux-11.04.1-gcc47.patch 335 SHA256 e4445d745994ced951a1811d9298d6f864846b8dec04453955362530cbc963db SHA512 33e403ce0dd69ae782ca3696838bfaf8126520b92b3b813ac491559dafd429ae3379131965a49e2c7ca2955a384ce41989f89db611696f999edf41c4abdd1270 WHIRLPOOL 158139353e7efe8517de2bd82183a02395c044870d4bd922d672ba22f4ffaa18f1eb306dd92faea2e3002e4b37d9b52f2c68dd892a0948dd278ef01e9a967844
+AUX warmux-11.04.1-gentoo.patch 1543 SHA256 ddaf2c688f58cf8fb9d0baddd4016ebbf04c974ab533ebc0c3532ee87799d643 SHA512 30e565a3b212a3b54c29267b29a43343d21a3fbadf2bc70552fb074b0f174f08cf66a6565f19de4f0187dbfe68e9124fda42a0cd85d592f1d596f217f5c3c4f9 WHIRLPOOL 29e82ad7e85914a9115b16cbd7a7337e01da5bf2da3eefc38124af56d76627eaccfcfc2684a397d9ab35f6467634db00b6ea35f4aa5fa5ed73a0d3d77feb6e56
+AUX warmux-11.04.1-zlib.patch 416 SHA256 665c4a64e54478491284f6cb6251bd58f96ba81671a7c439cffe175b86462852 SHA512 09ccc426514cf96d07fc3b05b7f248b0b77d2e61991afe530cb61b9c5ebf5c9222d2d4716861beed95607653ca4c617c03f244a957c4c6369925bd531ab73d3c WHIRLPOOL 352c569b75679cbcd881236541d2564fb6487850be2eb0e01a8a6796bec1f52b4156cc5c6f937b29b700aa97632588a5ed1d0debe4c0c7a2deb73061811af0ff
 DIST warmux-11.01.tar.bz2 110379327 RMD160 85a7bbfed5ca2ccbd793a12d7ea548948a747a88 SHA1 18e5d5bf144f069405c75ff8fe51296d9a7871a5 SHA256 f06171958ad26b142b039844789d578168451665a8594820750f81a5941f06b8
-DIST warmux-11.04.1.tar.bz2 110083622 RMD160 badd055d0e10e364cfa140a76f39ec0956c674c0 SHA1 375dbeb43a56a047daa4fcea49a9802f4b308795 SHA256 789c4f353e4c5ce0a2aba2e82861d3fd0e5218bc76d8da1a332f2c7b1b27e4ee
-EBUILD warmux-11.01.ebuild 1495 RMD160 5389e25ec15a3c4acdd02632378562f07dc26ec1 SHA1 547f5b9c6c94a6cb30693865f477c484057018cc SHA256 f1660758ac36250e3f19ebef0cbacea4f943161cc3030433c3ba27be7d87ab56
-EBUILD warmux-11.04.1.ebuild 1608 RMD160 209dd1af670ab83a105385446b22cba9b13eaffd SHA1 f09d53137139e16b2f7c2becee474480bc9e3334 SHA256 91797730d65bf67d763168d1644aff2c3f59c9666c8f124bd55f6f7b9764d8cc
-MISC ChangeLog 8372 RMD160 d746b9b4c4084550eab70a01f2d7d0864c4a04ff SHA1 b374643e0039ee1f6eba1abc8ef74413a06cfe9c SHA256 0a8bcdc014ba42058d0a816f072c0a42faef0f9fc03db1f990527dc5c2751280
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+DIST warmux-11.04.1.tar.bz2 110083622 SHA256 789c4f353e4c5ce0a2aba2e82861d3fd0e5218bc76d8da1a332f2c7b1b27e4ee SHA512 99501ea186e091b55a6e45935de83440be02ae4fc12ee6def5ec24e213c829230b4f6017043be6afbc7188e442b0e1128cfd27c290fbe0e49b6597f927fd1e2d WHIRLPOOL 2cce871fe330452c2f807ec4a9d99ff39de81a9f52c040e48f68a3478ce0a7407003159f9687c4d321c09fbdff7503e92cf47c64a5970666777e8b5d5536b220
+EBUILD warmux-11.01.ebuild 1495 SHA256 f1660758ac36250e3f19ebef0cbacea4f943161cc3030433c3ba27be7d87ab56 SHA512 e737000927be076e3c7323ad37bf374bb5432637dbdf1a0a3bfa7ba297ce8841cf236258c547d4b17c8365a2f5adafc4683fc0e900975987ca3a279573e5f475 WHIRLPOOL a2c792ed1d906f23309b02aa5bdcd282806fdea60def7e5ab3877e1e9eedbaaa75898f7bde1d157999a90f229bef4a03f5acf1dca27c96f6967651cefb302522
+EBUILD warmux-11.04.1.ebuild 1621 SHA256 93cf2aaea2634fe189e649603841ef825d667582ad5d74795d0c85ea72d9d9f8 SHA512 7c79efdfb840fc1f6377290b923ce9484f973c2ab5c3ca8afb09eabb0612392d2aaaeb014759d05602983b0332f536049ce44d52ab4b2f54d176f191c5fc99fa WHIRLPOOL 4817d704d4161c788fc48adb822503b7f0883a89d62bd5b6223b1cd5a346eaec4adcbf09ac63bdc41a8fe2a0568c7ceb510de7f9d683c6a9440914193c6933ba
+MISC ChangeLog 8544 SHA256 672d7336b199ae2f6271e33eb9e2d95b3fc82704268bdb3cf37727c894b50515 SHA512 6b6b43a2941109d4970441fad9944c34c5d6bde353adf83efa163240b4fd6b358330671bcc684cbd9b300fd3f5a9724e54e993bad7ca7f4d0fb1f3babb30f19c WHIRLPOOL 515089a9ed25b1bd4c003d9f086ecbeea087b37b014bf5643c1f24c29470c068c3fab022a1b95bfd7d76458637bf8257a8c471a8adc672d5f3a90c5b7991fb14
+MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/games-strategy/warmux/files/warmux-11.04.1-gcc47.patch b/games-strategy/warmux/files/warmux-11.04.1-gcc47.patch
new file mode 100644
index 000000000000..8460bcbd0b1c
--- /dev/null
+++ b/games-strategy/warmux/files/warmux-11.04.1-gcc47.patch
@@ -0,0 +1,11 @@
+Description: Fix FTBFS with gcc 4.7.
+Author: Felix Geyer <debfx-pkg@fobos.de>
+
+--- warmux-11.04.1+repack.orig/tools/list_games/main.cpp
++++ warmux-11.04.1+repack/tools/list_games/main.cpp
+@@ -1,4 +1,5 @@
+ #include <stdio.h>
++#include <unistd.h>
+ #include <WARMUX_types.h>
+ #include <WARMUX_network.h>
+ #include <WARMUX_index_server.h>
diff --git a/games-strategy/warmux/warmux-11.04.1.ebuild b/games-strategy/warmux/warmux-11.04.1.ebuild
index 95f249b14457..08b29cf485c7 100644
--- a/games-strategy/warmux/warmux-11.04.1.ebuild
+++ b/games-strategy/warmux/warmux-11.04.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/warmux/warmux-11.04.1.ebuild,v 1.5 2012/05/04 04:51:08 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/warmux/warmux-11.04.1.ebuild,v 1.6 2012/07/13 16:05:04 mr_bones_ Exp $
 
 EAPI=2
 inherit autotools eutils games
@@ -30,13 +30,14 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-S="${WORKDIR}"/${PN}-11.04
+S=${WORKDIR}/${PN}-11.04
 
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-gentoo.patch \
 		"${FILESDIR}"/${P}-zlib.patch \
-		"${FILESDIR}"/${P}-action.patch
+		"${FILESDIR}"/${P}-action.patch \
+		"${FILESDIR}"/${P}-gcc47.patch
 	eautoreconf
 }
 
@@ -52,7 +53,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog README TODO
 	rm -f "${D}${GAMES_DATADIR}/${PN}/font/DejaVuSans.ttf"
 	doicon data/icon/warmux.svg || die