Add patch for gcc-4.1, bug #131296

(Portage version: 2.1.2_pre2-r2)

4 files changed, 54 insertions, 7 deletions

diff --git a/games-strategy/netpanzer/ChangeLog b/games-strategy/netpanzer/ChangeLog
index 1bee638a61fc..cdc52ef32590 100644
--- a/games-strategy/netpanzer/ChangeLog
+++ b/games-strategy/netpanzer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/netpanzer
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/netpanzer/ChangeLog,v 1.20 2005/12/22 19:18:32 gustavoz Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/netpanzer/ChangeLog,v 1.21 2006/10/04 00:05:46 nyhm Exp $
+
+  04 Oct 2006; Tristan Heaven <nyhm@gentoo.org>
+  +files/netpanzer-0.8-gcc41.patch, netpanzer-0.8-r1.ebuild:
+  Add patch for gcc-4.1, bug #131296
 
   22 Dec 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   netpanzer-0.8-r1.ebuild:
diff --git a/games-strategy/netpanzer/files/digest-netpanzer-0.8-r1 b/games-strategy/netpanzer/files/digest-netpanzer-0.8-r1
index 1f7f2a2367ef..b799f2f8cf5f 100644
--- a/games-strategy/netpanzer/files/digest-netpanzer-0.8-r1
+++ b/games-strategy/netpanzer/files/digest-netpanzer-0.8-r1
@@ -1,2 +1,6 @@
 MD5 c08c1b703eac533407db02510deca68e netpanzer-0.8.tar.bz2 382007
+RMD160 1be9730ae1ac56765eda87251207b0cf35affbdb netpanzer-0.8.tar.bz2 382007
+SHA256 468e0d7a6d16aeeb9f7f68214a26db7ceb90fc4876a3da2de63b711b83d71233 netpanzer-0.8.tar.bz2 382007
 MD5 d2dbd5a6c38a181fa3b6aa9a68c81d2f netpanzer-data-0.8.tar.bz2 10123751
+RMD160 a2746ba759b61a1ddc31847144e407674dc46900 netpanzer-data-0.8.tar.bz2 10123751
+SHA256 0ed4398f5e0a796422474fcc518934d74ceb056ca7ab624d8d239b749535277b netpanzer-data-0.8.tar.bz2 10123751
diff --git a/games-strategy/netpanzer/files/netpanzer-0.8-gcc41.patch b/games-strategy/netpanzer/files/netpanzer-0.8-gcc41.patch
new file mode 100644
index 000000000000..f81008c45fa3
--- /dev/null
+++ b/games-strategy/netpanzer/files/netpanzer-0.8-gcc41.patch
@@ -0,0 +1,36 @@
+--- src/Lib/Network/Address.hpp
++++ src/Lib/Network/Address.hpp
+@@ -34,7 +34,7 @@
+     /** resolves a hostname or IP-Number together with a port and returns a
+      * new Address object.
+      */
+-    static Address Address::resolve(const std::string& name, uint16_t port);
++    static Address resolve(const std::string& name, uint16_t port);
+ 
+     /** returns the ip address of this Address as string */
+     std::string getIP() const;
+
+--- src/NetPanzer/Classes/PlayerState.hpp
++++ src/NetPanzer/Classes/PlayerState.hpp
+@@ -81,8 +81,8 @@
+ public:
+     PlayerUnitConfig unit_config;
+ 
+-    PlayerState::PlayerState();
+-    PlayerState::PlayerState(const PlayerState& other);
++    PlayerState();
++    PlayerState(const PlayerState& other);
+ 
+     void operator= (const PlayerState& other);
+ 
+--- src/NetPanzer/Interfaces/Console.cpp
++++ src/NetPanzer/Interfaces/Console.cpp
+@@ -46,7 +46,7 @@
+         setp(buf, buf+sizeof(buf));
+     }
+ 
+-    FileStampStreamBuf::~FileStampStreamBuf()
++    ~FileStampStreamBuf()
+     {
+         sync();
+         if(file)
diff --git a/games-strategy/netpanzer/netpanzer-0.8-r1.ebuild b/games-strategy/netpanzer/netpanzer-0.8-r1.ebuild
index 687e64dd524d..fde014bfd7fc 100644
--- a/games-strategy/netpanzer/netpanzer-0.8-r1.ebuild
+++ b/games-strategy/netpanzer/netpanzer-0.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/netpanzer/netpanzer-0.8-r1.ebuild,v 1.2 2005/12/22 19:18:32 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/netpanzer/netpanzer-0.8-r1.ebuild,v 1.3 2006/10/04 00:05:46 nyhm Exp $
 
 inherit eutils games
 
@@ -26,8 +26,10 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-#	epatch "${FILESDIR}"/${P}-min-size-check.patch
-#	epatch "${FILESDIR}"/${P}-robust.patch
+	epatch \
+		"${FILESDIR}"/${P}-min-size-check.patch \
+		"${FILESDIR}"/${P}-robust.patch \
+		"${FILESDIR}"/${P}-gcc41.patch
 }
 
 src_compile() {
@@ -63,6 +65,7 @@ src_install() {
 			"${D}${GAMES_BINDIR}/netpanzer-ded" \
 			|| die "sed failed"
 	fi
-	make_desktop_entry netpanzer NetPanzer netpanzer.png
+	rm -rf "${D}/${GAMES_DATADIR}"/{applications,pixmaps}
+	make_desktop_entry ${PN} NetPanzer
 	prepgamesdirs
 }